Merge pull request #164 from TaloDev/develop

Release 0.49.0

Author: tudddorrr

Assets/Talo Game Services/Talo/Runtime/APIs/BaseAPI.cs

@@ -9,7 +9,7 @@ namespace TaloGameServices
     public class BaseAPI
     {
         // automatically updated with a pre-commit hook
-        private const string ClientVersion = "0.48.0";
+        private const string ClientVersion = "0.49.0";
 
         protected string baseUrl;
 

Assets/Talo Game Services/Talo/Runtime/APIs/PlayersAPI.cs

@@ -5,6 +5,11 @@
 
 namespace TaloGameServices
 {
+    public class MergeOptions
+    {
+        public string postMergeIdentityService = "";
+    }
+
     public class PlayersAPI : BaseAPI
     {
         public event Action<Player> OnIdentified;
@@ -113,14 +118,27 @@ public async Task<Player> Update()
             return Talo.CurrentPlayer;
         }
 
-        public async Task<Player> Merge(string playerId1, string playerId2)
+        public async Task<Player> Merge(string playerId1, string playerId2, MergeOptions options = null)
         {
+            options ??= new MergeOptions();
+
             var uri = new Uri($"{baseUrl}/merge");
             string content = JsonUtility.ToJson(new PlayersMergeRequest(playerId1, playerId2));
             var json = await Call(uri, "POST", content);
 
             var res = JsonUtility.FromJson<PlayersUpdateResponse>(json);
-            return res.player;
+            var player = res.player;
+
+            if (!string.IsNullOrEmpty(options.postMergeIdentityService))
+            {
+                var alias = player.GetAlias(options.postMergeIdentityService);
+                if (alias != null)
+                {
+                    await Identify(alias.service, alias.identifier);
+                }
+            }
+
+            return player;
         }
 
         public async Task<Player> Find(string playerId)

Assets/Talo Game Services/Talo/Runtime/APIs/SavesAPI.cs

@@ -241,7 +241,7 @@ public void UnloadCurrentSave()
             savesManager.UnloadCurrentSave();
         }
 
-        public async Task DeleteSave(int saveId)
+        public async Task DeleteSave(int saveId, bool unloadIfCurrentSave = false)
         {
             var _ = savesManager.FindSaveByID(saveId);
 
@@ -252,7 +252,7 @@ public async Task DeleteSave(int saveId)
                 await Call(uri, "DELETE");
             }
 
-            savesManager.DeleteSave(saveId);
+            savesManager.DeleteSave(saveId, unloadIfCurrentSave);
         }
     }
 }

Assets/Talo Game Services/Talo/Runtime/Utils/SavesManager.cs

@@ -140,12 +140,12 @@ public void DeleteOfflineSaves(int[] saveIds)
             WriteOfflineSavesContent(offlineContent);
         }
 
-        public void DeleteSave(int saveId)
+        public void DeleteSave(int saveId, bool unloadIfCurrentSave)
         {
             _allSaves = _allSaves.Where((existingSave) => existingSave.id != saveId).ToList();
             DeleteOfflineSave(saveId);
 
-            if (_currentSave?.id == saveId)
+            if (unloadIfCurrentSave && _currentSave?.id == saveId)
             {
                 UnloadCurrentSave();
             }

Assets/Talo Game Services/Talo/Runtime/Utils/SessionManager.cs

@@ -10,9 +10,9 @@ public class SessionManager
         public void HandleSessionCreated(PlayerAuthSessionResponse res)
         {
             Talo.CurrentAlias = res.alias;
-            Talo.Socket.SetSocketToken(res.socketToken);
-            Talo.Players.InvokeIdentifiedEvent();
             SaveSession(res.sessionToken);
+            Talo.Players.InvokeIdentifiedEvent();
+            Talo.Socket.SetSocketToken(res.socketToken);
         }
 
         private void SaveSession(string sessionToken)

Assets/Talo Game Services/Talo/VERSION

@@ -1 +1 @@
-0.48.0
+0.49.0

Packages/manifest.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.ide.visualstudio": "2.0.23",
     "com.unity.test-framework": "1.6.0",
-    "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4",
+    "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.5",
     "com.unity.ugui": "2.0.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

@@ -57,7 +57,7 @@
       }
     },
     "com.unity.toolchain.macos-arm64-linux-x86_64": {
-      "version": "2.0.4",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {