fixed config issues

eomene · eomene · commit 08a542446baa · 2021-05-06T18:19:19.000+02:00
diff --git a/Runtime/Client/LootLockerEndPoints.cs b/Runtime/Client/LootLockerEndPoints.cs
@@ -144,7 +144,7 @@ public class LootLockerEndPoints
 
         //Drop Tables
         [Header("Drop Tables")]
-        public static EndPointClass ComputeAndLockDropTable = new EndPointClass("v1/player/droptables/{0}/compute", LootLockerHTTPMethod.POST);
+        public static EndPointClass ComputeAndLockDropTable = new EndPointClass("v1/player/droptables/{0}/compute?asset_details={1}", LootLockerHTTPMethod.POST);
         public static EndPointClass PickDropsFromDropTable = new EndPointClass("v1/player/droptables/{0}/pick", LootLockerHTTPMethod.POST);
     }
 }
diff --git a/Runtime/Editor/ProjectSettings.cs b/Runtime/Editor/ProjectSettings.cs
@@ -2,18 +2,34 @@
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.UIElements;
 
 namespace LootLocker.Admin
 {
     public class ProjectSettings : SettingsProvider
     {
-        private LootLockerConfig gameSettings;
+        private static LootLockerConfig gameSettings;
+        private SerializedObject m_CustomSettings;
+        internal static SerializedObject GetSerializedSettings()
+        {
+            return new SerializedObject(gameSettings);
+        }
         public ProjectSettings(string path, SettingsScope scopes, IEnumerable<string> keywords = null) : base(path, scopes, keywords)
         {
         }
-
+        public override void OnActivate(string searchContext, VisualElement rootElement)
+        {
+            if (gameSettings == null)
+            {
+                gameSettings = LootLockerConfig.Get();
+            }
+            // This function is called when the user clicks on the MyCustom element in the Settings window.
+            m_CustomSettings = GetSerializedSettings();
+        }
         public override void OnGUI(string searchContext)
         {
+            m_CustomSettings.Update();
+
             if (gameSettings == null)
             {
                 gameSettings = LootLockerConfig.Get();
@@ -27,56 +43,54 @@ public override void OnGUI(string searchContext)
                     DrawGameSettings();
                 }
             }
+            m_CustomSettings.ApplyModifiedProperties();
         }
 
         private void DrawGameSettings()
         {
-            string apiKey = gameSettings.apiKey;
             EditorGUI.BeginChangeCheck();
-            apiKey = EditorGUILayout.TextField("API Key", apiKey);
+            EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("apiKey"));
             if (EditorGUI.EndChangeCheck())
             {
-                gameSettings.apiKey = apiKey;
+                gameSettings.apiKey = m_CustomSettings.FindProperty("apiKey").stringValue;
             }
 
-            string gameVersion = gameSettings.game_version;
             EditorGUI.BeginChangeCheck();
-            gameVersion = EditorGUILayout.TextField("Game Version", gameVersion);
+            EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("game_version"));
             if (EditorGUI.EndChangeCheck())
             {
-                gameSettings.game_version = gameVersion;
+                gameSettings.game_version = m_CustomSettings.FindProperty("game_version").stringValue;
             }
 
-            LootLockerConfig.platformType platform = gameSettings.platform;
             EditorGUI.BeginChangeCheck();
-            platform = (LootLockerConfig.platformType)EditorGUILayout.EnumPopup("Platform", platform);
+            EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("platform"));
             if (EditorGUI.EndChangeCheck())
             {
-                gameSettings.platform = platform;
+                gameSettings.platform = (LootLockerConfig.platformType)m_CustomSettings.FindProperty("platform").enumValueIndex;
             }
 
-            bool onDevelopmentMode = gameSettings.developmentMode;
             EditorGUI.BeginChangeCheck();
-            onDevelopmentMode = EditorGUILayout.Toggle("On Development Mode", onDevelopmentMode);
+            EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("developmentMode"));
+
             if (EditorGUI.EndChangeCheck())
             {
-                gameSettings.developmentMode = onDevelopmentMode;
+                gameSettings.developmentMode = m_CustomSettings.FindProperty("developmentMode").boolValue;
             }
 
-            LootLockerConfig.DebugLevel debugLevel = gameSettings.currentDebugLevel;
             EditorGUI.BeginChangeCheck();
-            debugLevel = (LootLockerConfig.DebugLevel)EditorGUILayout.EnumPopup("Current Debug Level", debugLevel);
+            EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("currentDebugLevel"));
+
             if (EditorGUI.EndChangeCheck())
             {
-                gameSettings.currentDebugLevel = debugLevel;
+                gameSettings.currentDebugLevel = (LootLockerConfig.DebugLevel)m_CustomSettings.FindProperty("currentDebugLevel").enumValueIndex;
             }
 
-            bool allowTokenRefresh = gameSettings.allowTokenRefresh;
             EditorGUI.BeginChangeCheck();
-            allowTokenRefresh = EditorGUILayout.Toggle("Allow Token Refresh", allowTokenRefresh);
+            EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("allowTokenRefresh"));
+
             if (EditorGUI.EndChangeCheck())
             {
-                gameSettings.allowTokenRefresh = allowTokenRefresh;
+                gameSettings.allowTokenRefresh = m_CustomSettings.FindProperty("allowTokenRefresh").boolValue; 
             }
         }
 
diff --git a/Runtime/Game/LootLockerSDKManager.cs b/Runtime/Game/LootLockerSDKManager.cs
@@ -1310,82 +1310,6 @@ public static void RemovingFilesFromAssetCandidates(int assetId, int fileId, Act
         }
         #endregion
 
-        #region Events
-        public static void GettingAllEvents(Action<LootLockerEventResponse> onComplete)
-        {
-            if (!CheckInitialized())
-            {
-                LootLockerEventResponse response = new LootLockerEventResponse();
-                response.success = false;
-                response.status = false;
-                response.hasError = true;
-                response.Error = "SDk not initialised";
-                response.text = "SDk not initialised";
-                onComplete?.Invoke(response);
-                return;
-            }
-            LootLockerAPIManager.GettingAllEvents(onComplete);
-        }
-
-        public static void GettingASingleEvent(int missionId, Action<LootLockerSingleEventResponse> onComplete)
-        {
-            if (!CheckInitialized())
-            {
-                LootLockerSingleEventResponse response = new LootLockerSingleEventResponse();
-                response.success = false;
-                response.status = false;
-                response.hasError = true;
-                response.Error = "SDk not initialised";
-                response.text = "SDk not initialised";
-                onComplete?.Invoke(response);
-                return;
-            }
-            LootLockerGetRequest data = new LootLockerGetRequest();
-            data.getRequests.Add(missionId.ToString());
-            LootLockerAPIManager.GettingASingleEvent(data, onComplete);
-        }
-
-        public static void StartingEvent(int missionId, Action<LootLockerStartinEventResponse> onComplete)
-        {
-            if (!CheckInitialized())
-            {
-                LootLockerStartinEventResponse response = new LootLockerStartinEventResponse();
-                response.success = false;
-                response.status = false;
-                response.hasError = true;
-                response.Error = "SDk not initialised";
-                response.text = "SDk not initialised";
-                onComplete?.Invoke(response);
-                return;
-            }
-            LootLockerGetRequest data = new LootLockerGetRequest();
-            data.getRequests.Add(missionId.ToString());
-            LootLockerAPIManager.StartingEvent(data, onComplete);
-        }
-
-        public static void FinishingEvent(int missionId, string signature, string finishTime, string finishScore, LootLockerCheckpointTimes[] checkpointsScores, Action<LootLockerFinishEventResponse> onComplete)
-        {
-            if (!CheckInitialized())
-            {
-                LootLockerFinishEventResponse response = new LootLockerFinishEventResponse();
-                response.success = false;
-                response.status = false;
-                response.hasError = true;
-                response.Error = "SDk not initialised";
-                response.text = "SDk not initialised";
-                onComplete?.Invoke(response);
-                return;
-            }
-            LootLockerEventPayload payload = new LootLockerEventPayload { finish_score = finishScore, finish_time = finishTime };
-            payload.checkpoint_times = checkpointsScores;
-            FinishEventRequest data = new FinishEventRequest { signature = signature, payload = payload };
-            LootLockerGetRequest lootLockerGetRequest = new LootLockerGetRequest();
-            lootLockerGetRequest.getRequests.Add(missionId.ToString());
-            LootLockerAPIManager.FinishingEvent(lootLockerGetRequest, data, onComplete);
-        }
-
-        #endregion
-
         #region Missions
         public static void GettingAllMissions(Action<LootLockerGettingAllMissionsResponse> onComplete)
         {
@@ -1657,7 +1581,7 @@ public static void GetMessages(Action<LootLockerGetMessagesResponse> onComplete)
 
         #endregion
 
-        #region Events
+        #region TriggerEvents
         public static void TriggeringAnEvent(string eventName, Action<LootLockerTriggerAnEventResponse> onComplete)
         {
             if (!CheckInitialized())
@@ -1815,7 +1739,8 @@ public static void SubmitScore(string member_id, int score, int id, Action<LootL
 
             LootLockerAPIManager.SubmitScore(request, id.ToString(), onComplete);
         }
-        public static void ComputeAndLockDropTable(int tableId, Action<LootLockerComputeAndLockDropTableResponse> onComplete)
+
+        public static void ComputeAndLockDropTable(int tableInstanceId, Action<LootLockerComputeAndLockDropTableResponse> onComplete)
         {
             if (!CheckInitialized())
             {
@@ -1827,10 +1752,10 @@ public static void ComputeAndLockDropTable(int tableId, Action<LootLockerCompute
                 onComplete?.Invoke(response);
                 return;
             }
-            LootLockerAPIManager.ComputeAndLockDropTable(tableId, onComplete);
+            LootLockerAPIManager.ComputeAndLockDropTable(tableInstanceId, onComplete);
         }
 
-        public static void PickDropsFromDropTable(int[] picks, int tableId, Action<LootLockerPickDropsFromDropTableResponse> onComplete)
+        public static void PickDropsFromDropTable(int[] picks, int tableInstanceId, Action<LootLockerPickDropsFromDropTableResponse> onComplete)
         {
             if (!CheckInitialized())
             {
@@ -1845,7 +1770,7 @@ public static void PickDropsFromDropTable(int[] picks, int tableId, Action<LootL
             PickDropsFromDropTableRequest data = new PickDropsFromDropTableRequest();
             data.picks = picks;
 
-            LootLockerAPIManager.PickDropsFromDropTable(data, tableId, onComplete);
+            LootLockerAPIManager.PickDropsFromDropTable(data, tableInstanceId, onComplete);
         }
         #endregion
     }
diff --git a/Runtime/Game/Requests/DropTableRequest.cs b/Runtime/Game/Requests/DropTableRequest.cs
@@ -47,11 +47,17 @@ namespace LootLocker
 {
     public partial class LootLockerAPIManager
     {
-        public static void ComputeAndLockDropTable(int tableId, Action<LootLockerComputeAndLockDropTableResponse> onComplete)
+        public static void ComputeAndLockDropTable(int tableInstanceId, Action<LootLockerComputeAndLockDropTableResponse> onComplete, bool AddAssetDetails = false, string tag = "")
         {
             EndPointClass requestEndPoint = LootLockerEndPoints.PickDropsFromDropTable;
-    
-            string endPoint = string.Format(requestEndPoint.endPoint, tableId);
+
+            string endPoint = string.Format(requestEndPoint.endPoint, tableInstanceId, AddAssetDetails.ToString().ToLower());
+
+            if (!string.IsNullOrEmpty(tag))
+            {
+                string tempEndpoint = $"&tag={tag}";
+                endPoint += tempEndpoint;
+            }
 
             LootLockerServerRequest.CallAPI(endPoint, requestEndPoint.httpMethod, null, onComplete: (serverResponse) =>
             {
@@ -67,14 +73,14 @@ public static void ComputeAndLockDropTable(int tableId, Action<LootLockerCompute
             }, useAuthToken: true, callerRole: LootLocker.LootLockerEnums.LootLockerCallerRole.User);
         }
 
-        public static void PickDropsFromDropTable(PickDropsFromDropTableRequest data, int tableId, Action<LootLockerPickDropsFromDropTableResponse> onComplete)
+        public static void PickDropsFromDropTable(PickDropsFromDropTableRequest data, int tableInstanceId, Action<LootLockerPickDropsFromDropTableResponse> onComplete)
         {
             EndPointClass requestEndPoint = LootLockerEndPoints.PickDropsFromDropTable;
             string json = "";
             if (data == null) return;
             else json = JsonConvert.SerializeObject(data);
 
-            string endPoint = string.Format(requestEndPoint.endPoint, tableId);
+            string endPoint = string.Format(requestEndPoint.endPoint, tableInstanceId);
 
             LootLockerServerRequest.CallAPI(endPoint, requestEndPoint.httpMethod, json, onComplete: (serverResponse) =>
             {
diff --git a/Runtime/Game/Resources/Config/LootLockerConfig.asset b/Runtime/Game/Resources/Config/LootLockerConfig.asset
@@ -12,12 +12,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 229899d0a9432e949bee860825252188, type: 3}
   m_Name: LootLockerConfig
   m_EditorClassIdentifier: 
-  apiKey: 1f42799da6f88f1b3effe02c83f3777149392436
-  token: 
+  apiKey: d68e80882e497af07338bdff0aa9822c9e609a68
+  token: 64e5f6d949cfc75ab8470444c91648d8bf6475ef
   gameID: 0
-  game_version: 1.0.0.
+  game_version: 1.0.0.4
   deviceID: defaultPlayerId
-  platform: 0
+  platform: 2
   developmentMode: 1
   url: https://api.lootlocker.io/game/v1
   adminUrl: https://api.lootlocker.io/admin

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public class LootLockerEndPoints`
`144`	`144`
`145`	`145`	`//Drop Tables`
`146`	`146`	`[Header("Drop Tables")]`
`147`		`- public static EndPointClass ComputeAndLockDropTable = new EndPointClass("v1/player/droptables/{0}/compute", LootLockerHTTPMethod.POST);`
	`147`	`+ public static EndPointClass ComputeAndLockDropTable = new EndPointClass("v1/player/droptables/{0}/compute?asset_details={1}", LootLockerHTTPMethod.POST);`
`148`	`148`	`public static EndPointClass PickDropsFromDropTable = new EndPointClass("v1/player/droptables/{0}/pick", LootLockerHTTPMethod.POST);`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,34 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using UnityEditor;`
`4`	`4`	`using UnityEngine;`
	`5`	`+using UnityEngine.UIElements;`
`5`	`6`
`6`	`7`	`namespace LootLocker.Admin`
`7`	`8`	`{`
`8`	`9`	`public class ProjectSettings : SettingsProvider`
`9`	`10`	`{`
`10`		`- private LootLockerConfig gameSettings;`
	`11`	`+ private static LootLockerConfig gameSettings;`
	`12`	`+ private SerializedObject m_CustomSettings;`
	`13`	`+ internal static SerializedObject GetSerializedSettings()`
	`14`	`+ {`
	`15`	`+ return new SerializedObject(gameSettings);`
	`16`	`+ }`
`11`	`17`	`public ProjectSettings(string path, SettingsScope scopes, IEnumerable<string> keywords = null) : base(path, scopes, keywords)`
`12`	`18`	`{`
`13`	`19`	`}`
`14`		`-`
	`20`	`+ public override void OnActivate(string searchContext, VisualElement rootElement)`
	`21`	`+ {`
	`22`	`+ if (gameSettings == null)`
	`23`	`+ {`
	`24`	`+ gameSettings = LootLockerConfig.Get();`
	`25`	`+ }`
	`26`	`+ // This function is called when the user clicks on the MyCustom element in the Settings window.`
	`27`	`+ m_CustomSettings = GetSerializedSettings();`
	`28`	`+ }`
`15`	`29`	`public override void OnGUI(string searchContext)`
`16`	`30`	`{`
	`31`	`+ m_CustomSettings.Update();`
	`32`	`+`
`17`	`33`	`if (gameSettings == null)`
`18`	`34`	`{`
`19`	`35`	`gameSettings = LootLockerConfig.Get();`
`@@ -27,56 +43,54 @@ public override void OnGUI(string searchContext)`
`27`	`43`	`DrawGameSettings();`
`28`	`44`	`}`
`29`	`45`	`}`
	`46`	`+ m_CustomSettings.ApplyModifiedProperties();`
`30`	`47`	`}`
`31`	`48`
`32`	`49`	`private void DrawGameSettings()`
`33`	`50`	`{`
`34`		`- string apiKey = gameSettings.apiKey;`
`35`	`51`	`EditorGUI.BeginChangeCheck();`
`36`		`- apiKey = EditorGUILayout.TextField("API Key", apiKey);`
	`52`	`+ EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("apiKey"));`
`37`	`53`	`if (EditorGUI.EndChangeCheck())`
`38`	`54`	`{`
`39`		`- gameSettings.apiKey = apiKey;`
	`55`	`+ gameSettings.apiKey = m_CustomSettings.FindProperty("apiKey").stringValue;`
`40`	`56`	`}`
`41`	`57`
`42`		`- string gameVersion = gameSettings.game_version;`
`43`	`58`	`EditorGUI.BeginChangeCheck();`
`44`		`- gameVersion = EditorGUILayout.TextField("Game Version", gameVersion);`
	`59`	`+ EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("game_version"));`
`45`	`60`	`if (EditorGUI.EndChangeCheck())`
`46`	`61`	`{`
`47`		`- gameSettings.game_version = gameVersion;`
	`62`	`+ gameSettings.game_version = m_CustomSettings.FindProperty("game_version").stringValue;`
`48`	`63`	`}`
`49`	`64`
`50`		`- LootLockerConfig.platformType platform = gameSettings.platform;`
`51`	`65`	`EditorGUI.BeginChangeCheck();`
`52`		`- platform = (LootLockerConfig.platformType)EditorGUILayout.EnumPopup("Platform", platform);`
	`66`	`+ EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("platform"));`
`53`	`67`	`if (EditorGUI.EndChangeCheck())`
`54`	`68`	`{`
`55`		`- gameSettings.platform = platform;`
	`69`	`+ gameSettings.platform = (LootLockerConfig.platformType)m_CustomSettings.FindProperty("platform").enumValueIndex;`
`56`	`70`	`}`
`57`	`71`
`58`		`- bool onDevelopmentMode = gameSettings.developmentMode;`
`59`	`72`	`EditorGUI.BeginChangeCheck();`
`60`		`- onDevelopmentMode = EditorGUILayout.Toggle("On Development Mode", onDevelopmentMode);`
	`73`	`+ EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("developmentMode"));`
	`74`	`+`
`61`	`75`	`if (EditorGUI.EndChangeCheck())`
`62`	`76`	`{`
`63`		`- gameSettings.developmentMode = onDevelopmentMode;`
	`77`	`+ gameSettings.developmentMode = m_CustomSettings.FindProperty("developmentMode").boolValue;`
`64`	`78`	`}`
`65`	`79`
`66`		`- LootLockerConfig.DebugLevel debugLevel = gameSettings.currentDebugLevel;`
`67`	`80`	`EditorGUI.BeginChangeCheck();`
`68`		`- debugLevel = (LootLockerConfig.DebugLevel)EditorGUILayout.EnumPopup("Current Debug Level", debugLevel);`
	`81`	`+ EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("currentDebugLevel"));`
	`82`	`+`
`69`	`83`	`if (EditorGUI.EndChangeCheck())`
`70`	`84`	`{`
`71`		`- gameSettings.currentDebugLevel = debugLevel;`
	`85`	`+ gameSettings.currentDebugLevel = (LootLockerConfig.DebugLevel)m_CustomSettings.FindProperty("currentDebugLevel").enumValueIndex;`
`72`	`86`	`}`
`73`	`87`
`74`		`- bool allowTokenRefresh = gameSettings.allowTokenRefresh;`
`75`	`88`	`EditorGUI.BeginChangeCheck();`
`76`		`- allowTokenRefresh = EditorGUILayout.Toggle("Allow Token Refresh", allowTokenRefresh);`
	`89`	`+ EditorGUILayout.PropertyField(m_CustomSettings.FindProperty("allowTokenRefresh"));`
	`90`	`+`
`77`	`91`	`if (EditorGUI.EndChangeCheck())`
`78`	`92`	`{`
`79`		`- gameSettings.allowTokenRefresh = allowTokenRefresh;`
	`93`	`+ gameSettings.allowTokenRefresh = m_CustomSettings.FindProperty("allowTokenRefresh").boolValue;`
`80`	`94`	`}`
`81`	`95`	`}`
`82`	`96`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,17 @@ namespace LootLocker`
`47`	`47`	`{`
`48`	`48`	`public partial class LootLockerAPIManager`
`49`	`49`	`{`
`50`		`- public static void ComputeAndLockDropTable(int tableId, Action<LootLockerComputeAndLockDropTableResponse> onComplete)`
	`50`	`+ public static void ComputeAndLockDropTable(int tableInstanceId, Action<LootLockerComputeAndLockDropTableResponse> onComplete, bool AddAssetDetails = false, string tag = "")`
`51`	`51`	`{`
`52`	`52`	`EndPointClass requestEndPoint = LootLockerEndPoints.PickDropsFromDropTable;`
`53`		`-`
`54`		`- string endPoint = string.Format(requestEndPoint.endPoint, tableId);`
	`53`	`+`
	`54`	`+ string endPoint = string.Format(requestEndPoint.endPoint, tableInstanceId, AddAssetDetails.ToString().ToLower());`
	`55`	`+`
	`56`	`+ if (!string.IsNullOrEmpty(tag))`
	`57`	`+ {`
	`58`	`+ string tempEndpoint = $"&tag={tag}";`
	`59`	`+ endPoint += tempEndpoint;`
	`60`	`+ }`
`55`	`61`
`56`	`62`	`LootLockerServerRequest.CallAPI(endPoint, requestEndPoint.httpMethod, null, onComplete: (serverResponse) =>`
`57`	`63`	`{`
`@@ -67,14 +73,14 @@ public static void ComputeAndLockDropTable(int tableId, Action<LootLockerCompute`
`67`	`73`	`}, useAuthToken: true, callerRole: LootLocker.LootLockerEnums.LootLockerCallerRole.User);`
`68`	`74`	`}`
`69`	`75`
`70`		`- public static void PickDropsFromDropTable(PickDropsFromDropTableRequest data, int tableId, Action<LootLockerPickDropsFromDropTableResponse> onComplete)`
	`76`	`+ public static void PickDropsFromDropTable(PickDropsFromDropTableRequest data, int tableInstanceId, Action<LootLockerPickDropsFromDropTableResponse> onComplete)`
`71`	`77`	`{`
`72`	`78`	`EndPointClass requestEndPoint = LootLockerEndPoints.PickDropsFromDropTable;`
`73`	`79`	`string json = "";`
`74`	`80`	`if (data == null) return;`
`75`	`81`	`else json = JsonConvert.SerializeObject(data);`
`76`	`82`
`77`		`- string endPoint = string.Format(requestEndPoint.endPoint, tableId);`
	`83`	`+ string endPoint = string.Format(requestEndPoint.endPoint, tableInstanceId);`
`78`	`84`
`79`	`85`	`LootLockerServerRequest.CallAPI(endPoint, requestEndPoint.httpMethod, json, onComplete: (serverResponse) =>`
`80`	`86`	`{`