diff --git a/Assets/00.BuildOriginality/Editor/com.stary.buildoriginality.editor.asmdef b/Assets/00.BuildOriginality/Editor/com.stary.buildoriginality.editor.asmdef index a77c345..4fe72d8 100644 --- a/Assets/00.BuildOriginality/Editor/com.stary.buildoriginality.editor.asmdef +++ b/Assets/00.BuildOriginality/Editor/com.stary.buildoriginality.editor.asmdef @@ -6,7 +6,9 @@ "com.stary.evo.editor", "com.stary.buildoriginality.runtime", "YooAsset", - "YooAsset.Editor" + "YooAsset.Editor", + "DOTween.Modules", + "UniTask" ], "includePlatforms": [ "Editor" diff --git a/Assets/00.BuildOriginality/Runtime/ArtLoadAssetServer.cs b/Assets/00.BuildOriginality/Runtime/ArtLoadAssetServer.cs index 61fb875..322f732 100644 --- a/Assets/00.BuildOriginality/Runtime/ArtLoadAssetServer.cs +++ b/Assets/00.BuildOriginality/Runtime/ArtLoadAssetServer.cs @@ -31,6 +31,11 @@ namespace Stary.Evo public async static Task GetServerDomainAllName() { var serverDomainEntities = await GetServerDomainAll(); + if (serverDomainEntities == null) + { + Debug.LogError($"UnityEvo:获取服务器全部作用域失败...服务器返回空"); + return null; + } List domains = new List(); for (int i = 0; i < serverDomainEntities.Count; i++) { diff --git a/Assets/00.BuildOriginality/package.json b/Assets/00.BuildOriginality/package.json index e82bed2..4de1c8d 100644 --- a/Assets/00.BuildOriginality/package.json +++ b/Assets/00.BuildOriginality/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.buildoriginality", - "version": "1.0.10", + "version": "1.0.11", "displayName": "00.StaryEvo.BuildOriginality", "description": "美术打包工具", "unity": "2021.3", diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixState.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixState.cs index 15285e9..3873924 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixState.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/HotFixState.cs @@ -14,7 +14,7 @@ namespace Stary.Evo public string[] PatchedAOTAssemblyList = { - "System.Core.dll", + "System.Core.dll", "UnityEngine.CoreModule.dll", "mscorlib.dll", "DOTween.dll", diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs index 409fa71..aae59f4 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs @@ -181,7 +181,6 @@ namespace Stary.Evo { await SceneManager.UnloadSceneAsync(_sceneName); } - AppConfig.PackageDomainName = ""; } } diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs index aeee443..84bdd49 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs @@ -90,14 +90,14 @@ namespace Stary.Evo } - public void OpenDomain(string domain, OpenDomainType openDomainType) + public async void OpenDomain(string domain, OpenDomainType openDomainType) { this.domain = domain; _devLoadSystem.SetOpenDomainType(openDomainType); if (this.domain != AppConfig.PackageDomainName) { AppConfig.PackageDomainName = domain; - _devLoadSystem.SetCurState(nameof(ResStartState)); + await _devLoadSystem.SetCurState(nameof(ResStartState)); } else { diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index b3355b6..4775aac 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.2.14", + "version": "1.2.15", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",