【m】修改
All checks were successful
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 23s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 7s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 4s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 38s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 6s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 5s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 18s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (10.XNode) (push) Successful in 5s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 18s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 4s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 4s
Plugin Library CI / publish (12.WeixinMinigame) (push) Successful in 1m6s
All checks were successful
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 23s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 7s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 4s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 38s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 6s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 5s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 18s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (10.XNode) (push) Successful in 5s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 18s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 4s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 4s
Plugin Library CI / publish (12.WeixinMinigame) (push) Successful in 1m6s
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
/// </summary>
|
||||
public enum OpenDomainType
|
||||
{
|
||||
Editor,
|
||||
PointCloud,
|
||||
VIOICE,
|
||||
ImageTracked
|
||||
Default=0,
|
||||
OriginalPoint=1,
|
||||
SetTransform=2,
|
||||
PointCloud=3,
|
||||
Voice=4,
|
||||
}
|
||||
|
||||
public enum StageType
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user