tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/新对话框

Browse Source
This commit is contained in:
dingyuntian
2025-06-05 22:24:43 +08:00
parent 3a46dc1142 6d96508132
commit c195a3bb15
151 changed files with 40838 additions and 3375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/FixSystemNew/FixStateMachine.cs
+19 -8
View File
@@ -141,17 +141,28 @@ namespace AibisDream.FixSystem
public IEnumerator Enter()
{
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
var lightSystem = FixSystemCenter.SystemDic.Get<FixLightSystem>();
// 拔出插头
bodyModuleSystem.ResetPlug();
// 切换Body或Head
if (Enum.TryParse<ModuleState>(_args, out var moduleState))
{
bodyModuleSystem.SwitchModuleGroup(moduleState);
}
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
if (lightSystem != null && !lightSystem.IsSystemOn())
{
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModuleCenter);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.5f);
yield return new WaitForSeconds(0.5f);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
yield return lightSystem.StartSystem();
}
else
{
bodyModuleSystem.ResetPlug();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
// 开启交互
bodyModuleSystem.EnableSystem();
}
@@ -506,7 +517,7 @@ namespace AibisDream.FixSystem
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.1f);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmoDeep);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
cuttingManager.StartCutting(bodyModule);
yield return cuttingManager.StartCutting(bodyModule);
@@ -550,7 +561,7 @@ namespace AibisDream.FixSystem
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.1f);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemoryDeep);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
cuttingManager.StartCutting(bodyModule);
yield return cuttingManager.StartCutting(bodyModule);
}
@@ -581,7 +592,7 @@ namespace AibisDream.FixSystem
bodyModuleSystem.SwitchModuleGroup(ModuleState.Head);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
bodyModuleSystem.CableSystem.ResetPlug();
//bodyModuleSystem.CableSystem.ResetPlug();
var bodyModule=bodyModuleSystem.FindBodyModuleByName("Logic");
if(bodyModule!=null)
{
@@ -593,7 +604,7 @@ namespace AibisDream.FixSystem
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.1f);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogicDeep);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
cuttingManager.StartCutting(bodyModule);
yield return cuttingManager.StartCutting(bodyModule);
}