diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Base/DomainBase.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Base/DomainBase.cs index 949a574..d602b62 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Base/DomainBase.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Base/DomainBase.cs @@ -23,7 +23,7 @@ namespace Stary.Evo { if (HybridClREntrance.Global.domain == "Main" && !HybridClREntrance.Global.loadDomain.Equals("null")) { - HybridClREntrance.Global.OpenDomain(HybridClREntrance.Global.loadDomain, OpenDomainType.VIOICE); + HybridClREntrance.Global.OpenDomain(HybridClREntrance.Global.loadDomain, OpenDomainType.Default); //return; } } diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/DomainAssetSystem.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/DomainAssetSystem.cs index 0796d8d..ccd3d2c 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/DomainAssetSystem.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/DomainAssetSystem.cs @@ -75,19 +75,19 @@ namespace Stary.Evo { info.Switch(1); } - else if (_openDomainType == OpenDomainType.VIOICE) + else if (_openDomainType == OpenDomainType.Voice) { info.Switch(0); } - else if (_openDomainType == OpenDomainType.ImageTracked) + else if (_openDomainType == OpenDomainType.SetTransform) { info.transform.position = _transformCtor.position; info.transform.rotation = Quaternion.Euler(_transformCtor.rotation); info.transform.localScale = _transformCtor.scale; - } - else + }else if (_openDomainType == OpenDomainType.OriginalPoint) { - info.Switch(0); + info.transform.position = Vector3.zero; + info.transform.rotation = Quaternion.identity; } } else diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs index ea4ffcc..5b56604 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs @@ -92,42 +92,32 @@ namespace Stary.Evo { this.domain = domain; DomainAssetSystem.SetOpenDomainType(openDomainType); - if (this.domain != AppConfig.PackageDomainName) - { - AppConfig.PackageDomainName = domain; - await _loadSystem.SetCurState(nameof(HotFixStartState)); - } - else - { - Debug.Log($"domain:{domain} 已打开, 请勿重复打开"); - } + OpenDomain(domain); } public void OpenDomain(string domain, TransformCtor transformCtor) { this.domain = domain; - DomainAssetSystem.SetOpenDomainType(OpenDomainType.ImageTracked); + DomainAssetSystem.SetOpenDomainType(OpenDomainType.SetTransform); DomainAssetSystem.SetTransformCtor(transformCtor); - if (this.domain != AppConfig.PackageDomainName) - { - AppConfig.PackageDomainName = domain; - _loadSystem.SetCurState(nameof(HotFixStartState)); - } - else - { - Debug.Log($"domain:{domain} 已打开, 请勿重复打开"); - } + OpenDomain(domain); } public void OpenDomain(string domain, Transform transform) { this.domain = domain; - DomainAssetSystem.SetOpenDomainType(OpenDomainType.ImageTracked); + DomainAssetSystem.SetOpenDomainType(OpenDomainType.SetTransform); DomainAssetSystem.SetTransformCtor(transform); + OpenDomain(domain); + } + + public async void OpenDomain(string domain) + { + this.domain = domain; if (this.domain != AppConfig.PackageDomainName) { AppConfig.PackageDomainName = domain; - _loadSystem.SetCurState(nameof(HotFixStartState)); + await _loadSystem.SetCurState(nameof(HotFixStartState)); } else { @@ -149,10 +139,11 @@ namespace Stary.Evo /// public enum OpenDomainType { - Editor, - PointCloud, - VIOICE, - ImageTracked + Default=0, + OriginalPoint=1, + SetTransform=2, + PointCloud=3, + Voice=4, } public enum StageType diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index b140a01..d62e39d 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.5.1", + "version": "1.5.2", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",