diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/FsmLoadSystem.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/FsmLoadSystem.cs index 318d6b9..15ead38 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/FsmLoadSystem.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/FsmLoadSystem.cs @@ -1,4 +1,5 @@ using Main; +using UnityEngine; namespace Stary.Evo { @@ -6,14 +7,25 @@ namespace Stary.Evo { private OpenDomainType OpenDomainType { get; set; } + private Vector3 position; + public ProgressBarPanel ProgressBarPanel { get; set; } public void SetOpenDomainType(OpenDomainType type) { this.OpenDomainType = type; } + public void SetPosition(Vector3 position) + { + this.position = position; + } public OpenDomainType GetOpenDomainType() { return this.OpenDomainType; } + + public Vector3 GetPosition() + { + return this.position; + } } } \ No newline at end of file diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs index 8464b2a..4c22b82 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/Fsm/LoadResState.cs @@ -83,7 +83,7 @@ namespace Stary.Evo } else if (fsmLoadSystem.GetOpenDomainType() == OpenDomainType.ImageTracked) { - info.Switch(2); + info.transform.position = fsmLoadSystem.GetPosition(); } } else diff --git a/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs b/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs index 046dd2a..c1788ea 100644 --- a/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs +++ b/Assets/00.StaryEvoTools/Runtime/HybridLoad/HybridClREntrance.cs @@ -69,7 +69,14 @@ namespace Stary.Evo AppConfig.PackageDomainName = domain; _fsmSystem.SetCurState(nameof(ResStartState)); } - + public void OpenDomain(string domain, Vector3 position) + { + this.domain = domain; + _fsmSystem.SetOpenDomainType(OpenDomainType.ImageTracked); + _fsmSystem.SetPosition(position); + AppConfig.PackageDomainName = domain; + _fsmSystem.SetCurState(nameof(ResStartState)); + } public void CloseDomain() { diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index 00636fe..5ee58ca 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.0.0", + "version": "1.0.1", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",