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

Merge branch '回退timeline' into 'develop'

Browse Source 
回退timeline

See merge request aibis-dream/aibis-dream!253
This commit is contained in:
bottlefish
2025-02-20 17:14:34 +00:00
parent 5f40a69044 713fba16ee
commit 472be7b042
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/FixSystemNew/FixStateMachine.cs
+7 -6
View File
@@ -23,12 +23,12 @@ namespace AibisDream.FixSystem
yield return _curState?.Exit();
// 检查当前状态和下一个状态
if (_curState.GetState == FixState.Clinic && nextState == FixState.BodyModule)
{
// 仅在从 Clinic 到 BodyModule 时执行这两行
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine);
yield return TimelineManager.Instance.PlayTimeline("ToBodyModule");
}
// if (_curState.GetState == FixState.Clinic && nextState == FixState.BodyModule)
// {
// // 仅在从 Clinic 到 BodyModule 时执行这两行
// yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine);
// yield return TimelineManager.Instance.PlayTimeline("ToBodyModule");
// }
GameLoopManager.Instance?.UpdateFixState(nextState, _curArgs);
_curState = CreateState(nextState, _curArgs);
@@ -123,6 +123,7 @@ namespace AibisDream.FixSystem
// 拔出插头
bodyModuleSystem.ResetPlug();
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
// 开启交互
bodyModuleSystem.EnableSystem();