Merge branch 'fix-bug'

Particle-Network · Aug 15, 2024 · 8df67fc · 8df67fc
2 parents 35b1501 + f5a248d
commit 8df67fc
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 211 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/ParticleNetwork/Mobile/Demo/Connect/Prefab/ConnectV2Demo.prefab b/Assets/ParticleNetwork/Mobile/Demo/Connect/Prefab/ConnectV2Demo.prefab
@@ -1813,7 +1813,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 881400243648001868}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 6423216982995982147}
+        m_TargetAssemblyTypeName: 
+        m_MethodName: 
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4600950711937636186
 GameObject:
   m_ObjectHideFlags: 0
@@ -6476,7 +6488,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 4763737183337437189}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: 
+        m_MethodName: 
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &4763737183337437189
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/ParticleNetwork/Mobile/Modules/Connect/ParticleConnectInteraction.cs b/Assets/ParticleNetwork/Mobile/Modules/Connect/ParticleConnectInteraction.cs
@@ -159,10 +159,8 @@ public static List<Account> GetAccounts(WalletType walletType)
             ParticleNetwork.GetUnityConnectBridgeClass().CallStatic<string>("getAccounts",walletType.ToString());
             return JsonConvert.DeserializeObject<List<Account>>(jsonString);
 #elif UNITY_IOS && !UNITY_EDITOR
-//todo:iOS
- var jsonString =
-            ParticleNetworkIOSBridge.adapterGetAccounts(walletType.ToString());
-            return JsonConvert.DeserializeObject<List<Account>>(jsonString);
+            var jsonString = ParticleNetworkIOSBridge.adapterGetAccounts(walletType.ToString());
+             return JsonConvert.DeserializeObject<List<Account>>(jsonString);
 #else
             return new List<Account>();
 #endif

diff --git a/Assets/Plugins/iOS/.Swift/UnityManager.swift b/Assets/Plugins/iOS/.Swift/UnityManager.swift
@@ -651,14 +651,14 @@ extension UnityManager {
 
     func adapterGetAccounts(_ json: String) -> String {
         let walletTypeString = json
-        guard let walletType = map2WalletType(from: walletTypeString) else {
-            return ""
-        }
-        guard let adapter = map2ConnectAdapter(from: walletType) else {
-            return ""
+        var accounts: [Account] = []
+
+        if let walletType = map2WalletType(from: walletTypeString), let adapter = map2ConnectAdapter(from: walletType) {
+            accounts = adapter.getAccounts()
+        } else {
+            accounts = []
         }
 
-        let accounts = adapter.getAccounts()
         let data = try! JSONEncoder().encode(accounts)
         let json = String(data: data, encoding: .utf8) ?? ""
 

diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -6,10 +6,10 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedSceneGuid-0:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 0503555503055a095d58087240775e14144e197a29297e67752a1832b1b1326a
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0503555503055a095d58087240775e14144e197a29297e67752a1832b1b1326a
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedScenePath-0:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

diff --git a/particle-unity-github.sln b/particle-unity-github.sln
@@ -5,30 +5,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.UI", "UnityEngi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.TestRunner", "UnityEngine.TestRunner.csproj", "{c5df9f86-3e35-0f6e-0780-12c348a8f8b9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline", "Unity.Timeline.csproj", "{75938cc8-f2a3-116f-17cf-96b867241c41}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro", "Unity.TextMeshPro.csproj", "{1e9d8133-b3c0-17bd-0e56-d1d2e01d3482}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{1ab14fdb-60c7-f132-d25e-208624437cc6}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.TestRunner", "UnityEditor.TestRunner.csproj", "{dc10e17c-24dc-35bd-a8db-a688248033af}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.UI", "UnityEditor.UI.csproj", "{40bef3b2-29b8-ac71-3915-c13baaf77135}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{1ab14fdb-60c7-f132-d25e-208624437cc6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VisualStudio.Editor", "Unity.VisualStudio.Editor.csproj", "{8643a316-aa09-b962-622b-b4547b9ef234}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor", "Unity.TextMeshPro.Editor.csproj", "{a488b018-47ab-0d4a-57db-ae71fc1ffc22}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{0ba6f64d-cd0e-cd39-bf03-c711232cae16}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Rider.Editor", "Unity.Rider.Editor.csproj", "{d7d2fb5a-e54f-260f-35b8-1d3c97282b93}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Sprite.Editor", "Unity.2D.Sprite.Editor.csproj", "{48541e89-8dce-b7cf-6c07-af8269495d1c}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{e4dec26b-e93c-15bf-eee8-f9adcfbd04ee}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{0ba6f64d-cd0e-cd39-bf03-c711232cae16}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Sprite.Package.EditorTests", "Unity.2D.Sprite.Package.EditorTests.csproj", "{b66baa94-4f5d-fe7b-dad2-bde4b5f1e7eb}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor.Tests", "Unity.TextMeshPro.Editor.Tests.csproj", "{6bdbdb39-5a80-4492-acd3-8b700a755b9d}"
@@ -52,30 +50,28 @@ Global
 		{8c128bad-74c4-c0bb-b048-a5cf73a38375}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{c5df9f86-3e35-0f6e-0780-12c348a8f8b9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{c5df9f86-3e35-0f6e-0780-12c348a8f8b9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75938cc8-f2a3-116f-17cf-96b867241c41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75938cc8-f2a3-116f-17cf-96b867241c41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1e9d8133-b3c0-17bd-0e56-d1d2e01d3482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1e9d8133-b3c0-17bd-0e56-d1d2e01d3482}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{dc10e17c-24dc-35bd-a8db-a688248033af}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{dc10e17c-24dc-35bd-a8db-a688248033af}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40bef3b2-29b8-ac71-3915-c13baaf77135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40bef3b2-29b8-ac71-3915-c13baaf77135}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8643a316-aa09-b962-622b-b4547b9ef234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8643a316-aa09-b962-622b-b4547b9ef234}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{a488b018-47ab-0d4a-57db-ae71fc1ffc22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{a488b018-47ab-0d4a-57db-ae71fc1ffc22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{d7d2fb5a-e54f-260f-35b8-1d3c97282b93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{d7d2fb5a-e54f-260f-35b8-1d3c97282b93}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{48541e89-8dce-b7cf-6c07-af8269495d1c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{48541e89-8dce-b7cf-6c07-af8269495d1c}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{e4dec26b-e93c-15bf-eee8-f9adcfbd04ee}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{e4dec26b-e93c-15bf-eee8-f9adcfbd04ee}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{b66baa94-4f5d-fe7b-dad2-bde4b5f1e7eb}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{b66baa94-4f5d-fe7b-dad2-bde4b5f1e7eb}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6bdbdb39-5a80-4492-acd3-8b700a755b9d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU