diff --git a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle index e441272..f7d87d1 100644 --- a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle +++ b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle @@ -62,6 +62,7 @@ dependencies { // Android Resolver Exclusions Start android { + namespace "com.unity3d.player" packagingOptions { exclude ('/lib/armeabi/*' + '*') exclude ('/lib/mips/*' + '*') diff --git a/sdk-intergration/Assets/Scenes/UnbindTest.unity b/sdk-intergration/Assets/Scenes/UnbindTest.unity index 40800ff..4077ccc 100644 --- a/sdk-intergration/Assets/Scenes/UnbindTest.unity +++ b/sdk-intergration/Assets/Scenes/UnbindTest.unity @@ -1715,8 +1715,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 175.13513} - m_SizeDelta: {x: 0, y: -350.2703} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -0.000030517578} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1044920374 MonoBehaviour: diff --git a/sdk-intergration/Packages/manifest.json b/sdk-intergration/Packages/manifest.json index 303820d..86d7463 100644 --- a/sdk-intergration/Packages/manifest.json +++ b/sdk-intergration/Packages/manifest.json @@ -3,16 +3,16 @@ "com.github.skistua.unity-vimeditor": "https://gitee.com/b166er/unity-vimeditor.git", "com.neuecc.unirx": "file:../LocalPackages/com.neuecc.unirx", "com.unity.addressables": "1.22.3", - "com.unity.collab-proxy": "2.5.2", - "com.unity.ide.rider": "3.0.34", + "com.unity.collab-proxy": "2.7.1", + "com.unity.ide.rider": "3.0.36", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.mobile.android-logcat": "1.4.3", + "com.unity.mobile.android-logcat": "1.4.5", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.render-pipelines.universal": "14.0.11", + "com.unity.render-pipelines.universal": "14.0.12", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.7", - "com.unity.timeline": "1.7.6", + "com.unity.timeline": "1.7.7", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.4", "com.unity.modules.ai": "1.0.0", diff --git a/sdk-intergration/Packages/packages-lock.json b/sdk-intergration/Packages/packages-lock.json index 616a9e9..7d0b562 100644 --- a/sdk-intergration/Packages/packages-lock.json +++ b/sdk-intergration/Packages/packages-lock.json @@ -34,7 +34,7 @@ "url": "https://packages.unity.cn" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.21", "depth": 1, "source": "registry", "dependencies": { @@ -44,7 +44,7 @@ "url": "https://packages.unity.cn" }, "com.unity.collab-proxy": { - "version": "2.5.2", + "version": "2.7.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -58,7 +58,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.34", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -90,7 +90,7 @@ "url": "https://packages.unity.cn" }, "com.unity.mobile.android-logcat": { - "version": "1.4.3", + "version": "1.4.5", "depth": 0, "source": "registry", "dependencies": {}, @@ -104,7 +104,7 @@ "url": "https://packages.unity.cn" }, "com.unity.render-pipelines.core": { - "version": "14.0.11", + "version": "14.0.12", "depth": 1, "source": "builtin", "dependencies": { @@ -115,14 +115,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.11", + "version": "14.0.12", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "14.0.11", - "com.unity.shadergraph": "14.0.11", + "com.unity.render-pipelines.core": "14.0.12", + "com.unity.shadergraph": "14.0.12", "com.unity.render-pipelines.universal-config": "14.0.9" } }, @@ -149,11 +149,11 @@ "url": "https://packages.unity.cn" }, "com.unity.shadergraph": { - "version": "14.0.11", + "version": "14.0.12", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.11", + "com.unity.render-pipelines.core": "14.0.12", "com.unity.searcher": "4.9.2" } }, @@ -178,13 +178,13 @@ "url": "https://packages.unity.cn" }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.7.7", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.cn" diff --git a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs index 8ca74a8..0a88992 100644 --- a/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs +++ b/sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs @@ -5,6 +5,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using asap.core; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UnityEngine; @@ -312,13 +313,18 @@ namespace tysdk public void LinkAccoutResult(string message) { - JObject data = new JObject(message); + JObject data = JObject.Parse(message); var result = new LinkResult() { code = data["code"].Value(), - userId = data["userId"].Value() + userId = data["userId"].Value(), }; + if (data.ContainsKey("bindInfo")) + { + result.bindInfo = JsonConvert.DeserializeObject>(data.GetValue(@"bindInfo").ToString()); + } + TYSDKCallbackManager.Instance.TryTriggerCallback(result); } #endif diff --git a/sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs b/sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs index cc846e7..43e5582 100644 --- a/sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs +++ b/sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs @@ -30,7 +30,7 @@ namespace tysdk // when exists userId is 0 public int userId; // not none when exists - public string bindInfo; + public Dictionary bindInfo; } public class LinkCheckInfo diff --git a/sdk-intergration/ProjectSettings/ProjectSettings.asset b/sdk-intergration/ProjectSettings/ProjectSettings.asset index 4407488..d8b201f 100644 --- a/sdk-intergration/ProjectSettings/ProjectSettings.asset +++ b/sdk-intergration/ProjectSettings/ProjectSettings.asset @@ -77,6 +77,7 @@ PlayerSettings: androidMinimumWindowHeight: 300 androidFullscreenMode: 1 androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 @@ -188,8 +189,10 @@ PlayerSettings: strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 + iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 VisionOSSdkVersion: 0 @@ -698,6 +701,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 diff --git a/sdk-intergration/ProjectSettings/ProjectVersion.txt b/sdk-intergration/ProjectSettings/ProjectVersion.txt index 720af25..d87ee45 100644 --- a/sdk-intergration/ProjectSettings/ProjectVersion.txt +++ b/sdk-intergration/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.53f1c1 -m_EditorVersionWithRevision: 2022.3.53f1c1 (f16e16b78e06) +m_EditorVersion: 2022.3.62f2c1 +m_EditorVersionWithRevision: 2022.3.62f2c1 (92e6e6be66dc)