Merge pull request #1158 from EOS-Contrib/EOS-Disable-Fix

v4.0.2

Author: EpicCliffHudson

Assets/Plugins/Source/Editor/EditorWindows/EncryptionKeyWindow.cs

@@ -48,12 +48,16 @@ public EncryptionKeyWindow() : base("Client Credential Encryption Key", 600f, 50
         /// </param>
         public static void Show(string input, Action<string> onSubmitCallback)
         {
-            ScheduleShow<EncryptionKeyWindow>(
-                input,
-                onSubmitCallback,
-                EOSClientCredentials.IsEncryptionKeyValid,
-                "Enter the encryption key for these client credentials here:",
-                "Invalid encryption key. Encryption key must be 64 characters long and contain only alphanumeric characters.");
+#if !EOS_DISABLE
+    ScheduleShow<EncryptionKeyWindow>(
+        input,
+        onSubmitCallback,
+        EOSClientCredentials.IsEncryptionKeyValid,
+        "Enter the encryption key for these client credentials here:",
+        "Invalid encryption key. Encryption key must be 64 characters long and contain only alphanumeric characters.");
+#else
+            Debug.LogWarning("EOS SDK is disabled. Encryption key window is not available.");
+#endif
         }
 
         /// <summary>
@@ -63,16 +67,25 @@ protected override void RenderModalContents()
         {
             GUILayout.BeginHorizontal();
 
-            _input = GUILayout.TextField(_input, GUILayout.Width(GUIEditorUtility.MeasureLabelWidth(64)), GUILayout.Height(20));
+            _input = GUILayout.TextField(
+                _input,
+                GUILayout.Width(EditorStyles.label.CalcSize(new GUIContent("Encryption Key")).x),
+                GUILayout.Height(20));
 
             GUILayout.Space(5f);
 
-            if (GUILayout.Button(
-                new GUIContent(EditorGUIUtility.IconContent("Refresh").image,
-                "Click here to generate a new encryption key."), GUILayout.Height(20), GUILayout.Width(50)))
-            {
-                _input = EOSClientCredentials.GenerateEncryptionKey();
-            }
+#if !EOS_DISABLE
+    if (GUILayout.Button(
+        new GUIContent(EditorGUIUtility.IconContent("Refresh").image,
+        "Click here to generate a new encryption key."),
+        GUILayout.Height(20), GUILayout.Width(50)))
+    {
+        _input = EOSClientCredentials.GenerateEncryptionKey();
+    }
+#else
+            GUILayout.Label("EOS SDK is disabled.");
+#endif
+
             GUILayout.EndHorizontal();
         }
     }

Assets/Plugins/Source/Editor/EditorWindows/ModalEOSEditorWindow.cs

@@ -189,9 +189,7 @@ protected override void RenderWindow()
             bool shouldClose = false;
 
             // Render the prompt text
-            EditorGUILayout.LabelField(_inputPrompt, GUILayout.Width(
-                GUIEditorUtility.MeasureLabelWidth(_inputPrompt))
-            );
+            EditorGUILayout.LabelField(_inputPrompt, GUILayout.Width(EditorStyles.label.CalcSize(new GUIContent(_inputPrompt)).x));
 
             // Display error if it needs to be displayed.
             if (_showError)

com.playeveryware.eos/CHANGELOG.md

@@ -1,13 +1,18 @@
 # Changelog
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [4.0.2] - 2025-06-17
+
+### Changed
+- EOS Disable fix
+- Config.cs fix for console support
 
 ## [4.0.1] - 2025-02-14
 
 ### Changed
 - update to EOS SDK 1.17.0- HF
 
-## [3.3.6] - 2025-02-03
+
 ## [4.0.0] - 2025-02-14
 
 ### Changed

com.playeveryware.eos/Runtime/Core/EOSManager.cs

@@ -184,17 +184,7 @@ enum EOSState
         static private bool s_isConstrained = true;
         static public bool ApplicationIsConstrained { get => s_isConstrained; }
 
-        /// <summary>
-        /// Actions that need to be executed on the main thread.
-        /// Lazy allocated in <see cref="DispatchAsync"/>.
-        /// </summary>
-        private static List<Action> s_enqueuedTasks;
 
-        /// <summary>
-        /// Locak object used for <see cref="s_enqueuedTasks"/>, such that it can
-        /// be executed thread-safe way.
-        /// </summary>
-        private static System.Object s_enqueuedTasksLock = new System.Object();
         //private static List
 
         //-------------------------------------------------------------------------
@@ -1844,6 +1834,18 @@ static public EOSSingleton Instance
             }
         }
 
+        /// <summary>
+        /// Actions that need to be executed on the main thread.
+        /// Lazy allocated in <see cref="DispatchAsync"/>.
+        /// </summary>
+        private static List<Action> s_enqueuedTasks;
+
+        /// <summary>
+        /// Locak object used for <see cref="s_enqueuedTasks"/>, such that it can
+        /// be executed thread-safe way.
+        /// </summary>
+        private static System.Object s_enqueuedTasksLock = new System.Object();
+
 #if !EOS_DISABLE
         //-------------------------------------------------------------------------
         /// <summary>Unity [Awake](https://docs.unity3d.com/ScriptReference/MonoBehaviour.Awake.html) is called when script instance is being loaded.

com.playeveryware.eos/Runtime/EOS_SDK/Core/Config.cs

@@ -8,16 +8,16 @@
 	#define EOS_EDITOR
 #endif
 
-#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID
-	#define EOS_UNITY
+#if UNITY_EDITOR || UNITY_STANDALONE || UNITY_PS4 || UNITY_PS5 || UNITY_XBOXONE || UNITY_SWITCH || UNITY_IOS || UNITY_ANDROID || UNITY_WSA
+#define EOS_UNITY
 #endif
 
-#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS
-	#if UNITY_EDITOR_WIN || UNITY_64 || PLATFORM_64BITS
-		#define EOS_PLATFORM_WINDOWS_64
-	#else
-		#define EOS_PLATFORM_WINDOWS_32
-	#endif
+#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || PLATFORM_64BITS || PLATFORM_32BITS || UNITY_WSA
+#if UNITY_EDITOR_WIN || UNITY_64 || UNITY_EDITOR_64 || PLATFORM_64BITS || UNITY_WSA
+#define EOS_PLATFORM_WINDOWS_64
+#else
+#define EOS_PLATFORM_WINDOWS_32
+#endif
 
 #elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
 	#define EOS_PLATFORM_OSX
@@ -28,6 +28,14 @@
 #elif UNITY_PS4
 	#define EOS_PLATFORM_PS4
 
+#elif UNITY_PS5
+    #define EOS_PLATFORM_PS5
+
+#elif UNITY_GAMECORE_XBOXONE
+    #define EOS_PLATFORM_XBOXONE_GDK
+
+#elif UNITY_GAMECORE_SCARLETT
+   #define EOS_PLATFORM_XSX
 #elif UNITY_XBOXONE
 	#define EOS_PLATFORM_XBOXONE
 
@@ -46,8 +54,11 @@
 
 namespace Epic.OnlineServices
 {
-	public static class Config
+	
+	public static partial class Config
 	{
+
+	#if EOS_PLATFORM_WINDOWS_32 || EOS_PLATFORM_WINDOWS_64 || EOS_PLATFORM_OSX || EOS_PLATFORM_LINUX || EOS_PLATFORM_IOS || EOS_PLATFORM_ANDROID
 		public const string LibraryName =
 		#if EOS_PLATFORM_WINDOWS_32 && EOS_UNITY
 			"EOSSDK-Win32-Shipping"
@@ -77,13 +88,35 @@ public static class Config
 		#elif EOS_PLATFORM_ANDROID
 			"EOSSDK"
 
-		#else
-			#error Unable to determine the name of the EOSSDK library. Ensure you have set the correct EOS compilation symbol for the current platform, such as EOS_PLATFORM_WINDOWS_32 or EOS_PLATFORM_WINDOWS_64, so that the correct EOSSDK library can be targeted.
+		#elif EOS_PLATFORM_PS4
+        #if EOS_PLATFORM_PS4_CROSSGEN
+            "EOSSDKCrossgen-PS4-Shipping.prx"
+        #else
+			"EOSSDK-PS4-Shipping.prx"
+        #endif
+		#elif EOS_PLATFORM_PS5
+			"EOSSDK-PS5-Shipping.prx"
+
+		#elif EOS_PLATFORM_SWITCH
+			"EOSSDK-Switch-Shipping"
+
+		#elif EOS_PLATFORM_XBOXONE_GDK
+			"EOSSDK-XboxOneGDK-Shipping"
+
+		#elif EOS_PLATFORM_XSX
+			"EOSSDK-XSX-Shipping"
+
+#elif EOS_DISABLE
+#warning Disabling EOS
+
+#else
+#error Unable to determine the name of the EOSSDK library. Ensure you have set the correct EOS compilation symbol for the current platform, such as EOS_PLATFORM_WINDOWS_32 or EOS_PLATFORM_WINDOWS_64, so that the correct EOSSDK library can be targeted.
 			"EOSSDK-UnknownPlatform-Shipping"
 
 		#endif
 		;
-		
+	#endif
+	// PEW: End modify
 		public const CallingConvention LibraryCallingConvention =
 		#if EOS_PLATFORM_WINDOWS_32
 			CallingConvention.StdCall

com.playeveryware.eos/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.playeveryware.eos",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "unity": "2021.3",
     "unityRelease": "16f1",
     "author": {