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

提交

Browse Source
This commit is contained in:
dingyuntian
2025-06-13 22:43:40 +08:00
parent 1b1ee53954
commit 662000ab91
5 changed files with 2174 additions and 1649 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/FixSystemNew/FixStateMachine.cs
+74 -57
View File
@@ -18,9 +18,9 @@ namespace AibisDream.FixSystem
public FixStateMachine()
{
_stateMachine = new StateMachine<FixState>(CreateState);
_stateMachine.OnStateSwitch += state => EnumEventSystem.Global.Send(EventEnum.FixStateSwitch, state);
_stateMachine.OnStateSwitch += state => EnumEventSystem.Global.Send(EventEnum.FixStateSwitch, state);
}
public IEnumerator Init(FixState initState)
{
yield return _stateMachine.Init(initState);
@@ -161,12 +161,12 @@ namespace AibisDream.FixSystem
bodyModuleSystem.ResetPlug();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
// 加载气泡
var data = FixSystemCenter.SystemDic.Get<ScreenSystem>().BubbleSlotGroup.CollectData();
BubbleGroup.Instance.LoadBubbles(data);
DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.StandardBubble);
// 开启交互
bodyModuleSystem.EnableSystem();
}
@@ -336,7 +336,7 @@ namespace AibisDream.FixSystem
yield return CameraKit.Instance.SwitchCamera(CameraEnum.EyeDeep);
eyeSystem.OnEnter();
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.5f);
var data = eyeSystem.bubbleSlotGroup.CollectData();
BubbleGroup.Instance.LoadBubbles(data);
}
@@ -405,6 +405,7 @@ namespace AibisDream.FixSystem
memorySystem.PullMemoryProjector();
}
}
public struct ExpressionState : IState<FixState>
{
public FixState GetState => FixState.Expression;
@@ -424,6 +425,7 @@ namespace AibisDream.FixSystem
bodyModule.SwitchModuleGroup(ModuleState.Head);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
// 切换相机
expressionManager.OpenView();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Expression);
@@ -431,7 +433,6 @@ namespace AibisDream.FixSystem
//expressionManager.OpenView();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.ExpressionDeep);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.5f);
}
public IEnumerator Exit()
@@ -443,6 +444,7 @@ namespace AibisDream.FixSystem
yield break;
}
}
public struct EmoState : IState<FixState>
{
public FixState GetState => FixState.Emo;
@@ -477,15 +479,16 @@ namespace AibisDream.FixSystem
yield break;
}
}
public struct OpState : IState<FixState>
{
public FixState GetState => FixState.Op;
public void SetArgs(string args)
{
// 无
}
public IEnumerator Enter()
{
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.Op))
@@ -493,48 +496,50 @@ namespace AibisDream.FixSystem
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Op);
}
}
public IEnumerator Exit()
{
// 无
yield break;
}
}
public struct DreamState : IState<FixState>
public struct DreamState : IState<FixState>
{
public FixState GetState => FixState.Dream;
public void SetArgs(string args)
{
// 无
}
public IEnumerator Enter()
{
if (!CameraKit.Instance.EqualToCameraState(CameraEnum.DreamCamera))
{
yield return CameraKit.Instance.SwitchCamera(CameraEnum.DreamCamera);
var openSystem = FixSystemCenter.SystemDic.Get<OpenSystem>();
BubbleGroup.Instance.LoadBubbles(openSystem.bubbleSlotGroup.CollectData());
}
}
public IEnumerator Exit()
{
// 无
yield break;
}
}
public struct EmoCutState : IState<FixState>
public struct EmoCutState : IState<FixState>
{
public FixState GetState => FixState.EmoCut;
public void SetArgs(string args)
{
// 无
}
public IEnumerator Enter()
{
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
@@ -544,40 +549,46 @@ namespace AibisDream.FixSystem
bodyModuleSystem.SwitchModuleGroup(ModuleState.Head);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
// Cut的气泡统一放在BodyModule下
BubbleGroup.Instance.LoadBubbles(cuttingManager.bubbleSlotGroup.CollectData());
bodyModuleSystem.CableSystem.ResetPlug();
var bodyModule=bodyModuleSystem.FindBodyModuleByName("Emo");
if(bodyModule!=null)
var bodyModule = bodyModuleSystem.FindBodyModuleByName("Emo");
if (bodyModule != null)
{
bodyModule.GetCutSpriteRenderer().sortingOrder=100;
bodyModule.GetCutSpriteRenderer().color=new Color(1f,1f,1f,1f);
bodyModule.GetCutSpriteRenderer().GetComponentInChildren<SpriteRenderer>().color=new Color(1f,1f,1f,1f);
bodyModule.GetCutSpriteRenderer().sortingOrder = 100;
bodyModule.GetCutSpriteRenderer().color = new Color(1f, 1f, 1f, 1f);
bodyModule.GetCutSpriteRenderer().GetComponentInChildren<SpriteRenderer>().color =
new Color(1f, 1f, 1f, 1f);
}
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmo);
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);
yield return cuttingManager.StartCutting(bodyModule);
}
public IEnumerator Exit()
{
// 无
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.1f);
var cuttingManager = FixSystemCenter.SystemDic.Get<CuttingManager>();
cuttingManager.ClearCutLine();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmo);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmo);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
}
}
}
public struct MemoryCutState : IState<FixState>
public struct MemoryCutState : IState<FixState>
{
public FixState GetState => FixState.MemoryCut;
public void SetArgs(string args)
{
// 无
}
public IEnumerator Enter()
{
var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
@@ -587,42 +598,46 @@ namespace AibisDream.FixSystem
bodyModuleSystem.SwitchModuleGroup(ModuleState.Head);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
}
// Cut的气泡统一放在BodyModule下
BubbleGroup.Instance.LoadBubbles(cuttingManager.bubbleSlotGroup.CollectData());
bodyModuleSystem.CableSystem.ResetPlug();
var bodyModule=bodyModuleSystem.FindBodyModuleByName("Memory");
if(bodyModule!=null)
var bodyModule = bodyModuleSystem.FindBodyModuleByName("Memory");
if (bodyModule != null)
{
bodyModule.GetCutSpriteRenderer().sortingOrder=100;
bodyModule.GetCutSpriteRenderer().color=new Color(1f,1f,1f,1f);
bodyModule.GetCutSpriteRenderer().GetComponentInChildren<SpriteRenderer>().color=new Color(1f,1f,1f,1f);
bodyModule.GetCutSpriteRenderer().sortingOrder = 100;
bodyModule.GetCutSpriteRenderer().color = new Color(1f, 1f, 1f, 1f);
bodyModule.GetCutSpriteRenderer().GetComponentInChildren<SpriteRenderer>().color =
new Color(1f, 1f, 1f, 1f);
}
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemory);
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);
yield return cuttingManager.StartCutting(bodyModule);
}
public IEnumerator Exit()
{
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.1f);
var cuttingManager = FixSystemCenter.SystemDic.Get<CuttingManager>();
cuttingManager.ClearCutLine();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemory);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemory);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
}
}
}
public struct LogicCutState : IState<FixState>
public struct LogicCutState : IState<FixState>
{
public FixState GetState => FixState.LogicCut;
public void SetArgs(string args)
{
// 无
}
public IEnumerator Enter()
{
var cuttingManager = FixSystemCenter.SystemDic.Get<CuttingManager>();
@@ -631,31 +646,33 @@ namespace AibisDream.FixSystem
{
bodyModuleSystem.SwitchModuleGroup(ModuleState.Head);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule);
} ;
var bodyModule=bodyModuleSystem.FindBodyModuleByName("Logic");
if(bodyModule!=null)
{
bodyModule.GetCutSpriteRenderer().sortingOrder=100;
bodyModule.GetCutSpriteRenderer().color=new Color(1f,1f,1f,1f);
bodyModule.GetCutSpriteRenderer().GetComponentInChildren<SpriteRenderer>().color=new Color(1f,1f,1f,1f);
}
// Cut的气泡统一放在BodyModule下
BubbleGroup.Instance.LoadBubbles(cuttingManager.bubbleSlotGroup.CollectData());
var bodyModule = bodyModuleSystem.FindBodyModuleByName("Logic");
if (bodyModule != null)
{
bodyModule.GetCutSpriteRenderer().sortingOrder = 100;
bodyModule.GetCutSpriteRenderer().color = new Color(1f, 1f, 1f, 1f);
bodyModule.GetCutSpriteRenderer().GetComponentInChildren<SpriteRenderer>().color =
new Color(1f, 1f, 1f, 1f);
}
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogic);
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);
yield return cuttingManager.StartCutting(bodyModule);
}
public IEnumerator Exit()
{
{
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync(0.1f);
var cuttingManager = FixSystemCenter.SystemDic.Get<CuttingManager>();
cuttingManager.ClearCutLine();
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogic);
yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogic);
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
}
}
}
}
}