Skip to content

Commit 8df67fc

Browse files
author
Zhichao Link
committed
Merge branch 'fix-bug'
2 parents 35b1501 + f5a248d commit 8df67fc

File tree

6 files changed

+101
-211
lines changed

6 files changed

+101
-211
lines changed

‎Assembly-CSharp.csproj‎

Lines changed: 53 additions & 181 deletions
Large diffs are not rendered by default.

‎Assets/ParticleNetwork/Mobile/Demo/Connect/Prefab/ConnectV2Demo.prefab‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,7 +1813,19 @@ MonoBehaviour:
18131813
m_TargetGraphic: {fileID: 881400243648001868}
18141814
m_OnClick:
18151815
m_PersistentCalls:
1816-
m_Calls: []
1816+
m_Calls:
1817+
- m_Target: {fileID: 6423216982995982147}
1818+
m_TargetAssemblyTypeName:
1819+
m_MethodName:
1820+
m_Mode: 1
1821+
m_Arguments:
1822+
m_ObjectArgument: {fileID: 0}
1823+
m_ObjectArgumentAssemblyTypeName:
1824+
m_IntArgument: 0
1825+
m_FloatArgument: 0
1826+
m_StringArgument:
1827+
m_BoolArgument: 0
1828+
m_CallState: 2
18171829
--- !u!1 &4600950711937636186
18181830
GameObject:
18191831
m_ObjectHideFlags: 0
@@ -6476,7 +6488,19 @@ MonoBehaviour:
64766488
m_TargetGraphic: {fileID: 4763737183337437189}
64776489
m_OnClick:
64786490
m_PersistentCalls:
6479-
m_Calls: []
6491+
m_Calls:
6492+
- m_Target: {fileID: 0}
6493+
m_TargetAssemblyTypeName:
6494+
m_MethodName:
6495+
m_Mode: 1
6496+
m_Arguments:
6497+
m_ObjectArgument: {fileID: 0}
6498+
m_ObjectArgumentAssemblyTypeName:
6499+
m_IntArgument: 0
6500+
m_FloatArgument: 0
6501+
m_StringArgument:
6502+
m_BoolArgument: 0
6503+
m_CallState: 2
64806504
--- !u!114 &4763737183337437189
64816505
MonoBehaviour:
64826506
m_ObjectHideFlags: 0

‎Assets/ParticleNetwork/Mobile/Modules/Connect/ParticleConnectInteraction.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,8 @@ public static List<Account> GetAccounts(WalletType walletType)
159159
ParticleNetwork.GetUnityConnectBridgeClass().CallStatic<string>("getAccounts",walletType.ToString());
160160
return JsonConvert.DeserializeObject<List<Account>>(jsonString);
161161
#elif UNITY_IOS && !UNITY_EDITOR
162-
//todo:iOS
163-
var jsonString =
164-
ParticleNetworkIOSBridge.adapterGetAccounts(walletType.ToString());
165-
return JsonConvert.DeserializeObject<List<Account>>(jsonString);
162+
var jsonString = ParticleNetworkIOSBridge.adapterGetAccounts(walletType.ToString());
163+
return JsonConvert.DeserializeObject<List<Account>>(jsonString);
166164
#else
167165
return new List<Account>();
168166
#endif

‎Assets/Plugins/iOS/.Swift/UnityManager.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -651,14 +651,14 @@ extension UnityManager {
651651

652652
func adapterGetAccounts(_ json: String) -> String {
653653
let walletTypeString = json
654-
guard let walletType = map2WalletType(from: walletTypeString) else {
655-
return ""
656-
}
657-
guard let adapter = map2ConnectAdapter(from: walletType) else {
658-
return ""
654+
var accounts: [Account] = []
655+
656+
if let walletType = map2WalletType(from: walletTypeString), let adapter = map2ConnectAdapter(from: walletType) {
657+
accounts = adapter.getAccounts()
658+
} else {
659+
accounts = []
659660
}
660661

661-
let accounts = adapter.getAccounts()
662662
let data = try! JSONEncoder().encode(accounts)
663663
let json = String(data: data, encoding: .utf8) ?? ""
664664

‎UserSettings/EditorUserSettings.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ EditorUserSettings:
66
serializedVersion: 4
77
m_ConfigSettings:
88
RecentlyUsedSceneGuid-0:
9-
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
9+
value: 0503555503055a095d58087240775e14144e197a29297e67752a1832b1b1326a
1010
flags: 0
1111
RecentlyUsedSceneGuid-1:
12-
value: 0503555503055a095d58087240775e14144e197a29297e67752a1832b1b1326a
12+
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
1313
flags: 0
1414
RecentlyUsedScenePath-0:
1515
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d

‎particle-unity-github.sln‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.UI", "UnityEngi
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEngine.TestRunner", "UnityEngine.TestRunner.csproj", "{c5df9f86-3e35-0f6e-0780-12c348a8f8b9}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}"
9-
EndProject
108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline", "Unity.Timeline.csproj", "{75938cc8-f2a3-116f-17cf-96b867241c41}"
119
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}"
11+
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro", "Unity.TextMeshPro.csproj", "{1e9d8133-b3c0-17bd-0e56-d1d2e01d3482}"
1313
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{1ab14fdb-60c7-f132-d25e-208624437cc6}"
15+
EndProject
1416
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.TestRunner", "UnityEditor.TestRunner.csproj", "{dc10e17c-24dc-35bd-a8db-a688248033af}"
1517
EndProject
1618
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityEditor.UI", "UnityEditor.UI.csproj", "{40bef3b2-29b8-ac71-3915-c13baaf77135}"
1719
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Timeline.Editor", "Unity.Timeline.Editor.csproj", "{1ab14fdb-60c7-f132-d25e-208624437cc6}"
19-
EndProject
2020
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VisualStudio.Editor", "Unity.VisualStudio.Editor.csproj", "{8643a316-aa09-b962-622b-b4547b9ef234}"
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.TextMeshPro.Editor", "Unity.TextMeshPro.Editor.csproj", "{a488b018-47ab-0d4a-57db-ae71fc1ffc22}"
2323
EndProject
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{0ba6f64d-cd0e-cd39-bf03-c711232cae16}"
25+
EndProject
2426
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Rider.Editor", "Unity.Rider.Editor.csproj", "{d7d2fb5a-e54f-260f-35b8-1d3c97282b93}"
2527
EndProject
2628
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Sprite.Editor", "Unity.2D.Sprite.Editor.csproj", "{48541e89-8dce-b7cf-6c07-af8269495d1c}"
2729
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{e4dec26b-e93c-15bf-eee8-f9adcfbd04ee}"
29-
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.VSCode.Editor", "Unity.VSCode.Editor.csproj", "{0ba6f64d-cd0e-cd39-bf03-c711232cae16}"
31-
EndProject
3230
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.2D.Sprite.Package.EditorTests", "Unity.2D.Sprite.Package.EditorTests.csproj", "{b66baa94-4f5d-fe7b-dad2-bde4b5f1e7eb}"
3331
EndProject
3432
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
5250
{8c128bad-74c4-c0bb-b048-a5cf73a38375}.Debug|Any CPU.Build.0 = Debug|Any CPU
5351
{c5df9f86-3e35-0f6e-0780-12c348a8f8b9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5452
{c5df9f86-3e35-0f6e-0780-12c348a8f8b9}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56-
{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.Build.0 = Debug|Any CPU
5753
{75938cc8-f2a3-116f-17cf-96b867241c41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5854
{75938cc8-f2a3-116f-17cf-96b867241c41}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56+
{c8b121fc-dcad-64f6-d94b-a2f8a1e16f8b}.Debug|Any CPU.Build.0 = Debug|Any CPU
5957
{1e9d8133-b3c0-17bd-0e56-d1d2e01d3482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6058
{1e9d8133-b3c0-17bd-0e56-d1d2e01d3482}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.Build.0 = Debug|Any CPU
6161
{dc10e17c-24dc-35bd-a8db-a688248033af}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6262
{dc10e17c-24dc-35bd-a8db-a688248033af}.Debug|Any CPU.Build.0 = Debug|Any CPU
6363
{40bef3b2-29b8-ac71-3915-c13baaf77135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6464
{40bef3b2-29b8-ac71-3915-c13baaf77135}.Debug|Any CPU.Build.0 = Debug|Any CPU
65-
{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66-
{1ab14fdb-60c7-f132-d25e-208624437cc6}.Debug|Any CPU.Build.0 = Debug|Any CPU
6765
{8643a316-aa09-b962-622b-b4547b9ef234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6866
{8643a316-aa09-b962-622b-b4547b9ef234}.Debug|Any CPU.Build.0 = Debug|Any CPU
6967
{a488b018-47ab-0d4a-57db-ae71fc1ffc22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7068
{a488b018-47ab-0d4a-57db-ae71fc1ffc22}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.Build.0 = Debug|Any CPU
7171
{d7d2fb5a-e54f-260f-35b8-1d3c97282b93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7272
{d7d2fb5a-e54f-260f-35b8-1d3c97282b93}.Debug|Any CPU.Build.0 = Debug|Any CPU
7373
{48541e89-8dce-b7cf-6c07-af8269495d1c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7474
{48541e89-8dce-b7cf-6c07-af8269495d1c}.Debug|Any CPU.Build.0 = Debug|Any CPU
75-
{e4dec26b-e93c-15bf-eee8-f9adcfbd04ee}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{e4dec26b-e93c-15bf-eee8-f9adcfbd04ee}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{0ba6f64d-cd0e-cd39-bf03-c711232cae16}.Debug|Any CPU.Build.0 = Debug|Any CPU
7975
{b66baa94-4f5d-fe7b-dad2-bde4b5f1e7eb}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8076
{b66baa94-4f5d-fe7b-dad2-bde4b5f1e7eb}.Debug|Any CPU.Build.0 = Debug|Any CPU
8177
{6bdbdb39-5a80-4492-acd3-8b700a755b9d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)