From fb291e899ae7517cdc0e1610449e12900a6fe3fb Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Fri, 10 Apr 2026 19:44:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87=E9=99=A4?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B2=A1=E6=9C=89=E5=A3=B0=E9=9F=B3=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/FixSystemNew/FixStateMachine.cs | 43 +++++++++---------- .../Scripts/FixSystemNew/FixSystemCenter.cs | 5 ++- .../Framework/AudioKit/AudioManager.cs | 7 ++- .../AnimatorKit/AnimatorYarnCommand.md.meta | 7 +++ 4 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 Assets/Scripts/SceneManagement/AnimatorKit/AnimatorYarnCommand.md.meta diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index b35ae309a..579be3447 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -1,6 +1,5 @@ using System; using System.Collections; -using AibisDream; using AibisDream.Framework; using AibisDream.Kit; using AibisDream.UI; @@ -50,6 +49,7 @@ namespace AibisDream.FixSystem { IState res = nextState switch { + FixState.Default => new DefaultState(), FixState.Clinic => new ClinicState(), FixState.BodyModule => new BodyModuleState(), FixState.Memory => new MemoryState(), @@ -75,24 +75,22 @@ namespace AibisDream.FixSystem public enum FixState { - Default, - Clinic, - BodyModule, - Memory, - Eye, - UF, - Expression, - Engine, - Gear, - Emo, - Op, - EmoCut, - MemoryCut, - LogicCut, - Dream, - AnalysisMode, - Sales, - BlockPuzzle + Default = 0, + Clinic = 1, + BodyModule = 2, + Memory = 3, + Eye = 4, + UF = 5, + Expression = 6, + Emo = 9, + Op = 10, + EmoCut = 11, + MemoryCut = 12, + LogicCut = 13, + Dream = 14, + AnalysisMode = 15, + Sales = 16, + BlockPuzzle = 17 } public struct DefaultState : IState @@ -101,6 +99,10 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { + CameraKit.Instance.SwitchCamera(CameraEnum.Clinic, true); + var clinicSystem = FixSystemCenter.SystemDic.Get(); + var data = clinicSystem.bubbleSlotGroup.CollectData(); + DialogUIManager.Instance.LoadBubbles(data); yield break; } @@ -503,7 +505,6 @@ namespace AibisDream.FixSystem yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmo); yield return UIManager.Instance.GetPanel().FadeInAsync(0.1f); - AudioManager.Instance.SetGlobalParam("scene",14); yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmoDeep); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.1f); yield return cuttingManager.StartCutting(bodyModule); @@ -554,7 +555,6 @@ namespace AibisDream.FixSystem yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemory); yield return UIManager.Instance.GetPanel().FadeInAsync(0.1f); - AudioManager.Instance.SetGlobalParam("scene",12); yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutMemoryDeep); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.1f); yield return cuttingManager.StartCutting(bodyModule); @@ -604,7 +604,6 @@ namespace AibisDream.FixSystem yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogic); yield return UIManager.Instance.GetPanel().FadeInAsync(0.1f); - AudioManager.Instance.SetGlobalParam("scene",13); yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutLogicDeep); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.1f); yield return cuttingManager.StartCutting(bodyModule); diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index c630e1886..023a8dc07 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -9,7 +9,7 @@ namespace AibisDream.FixSystem { public FixState CurState => StateMachine.CurState; - public FixState defaultState = FixState.Clinic; + public FixState defaultState = FixState.Default; private readonly FixSystemData _data = new(); @@ -58,4 +58,5 @@ namespace AibisDream.FixSystem yield return FixSystemCenter.StateMachine.SwitchState(curState, args); } } -} \ No newline at end of file +} + diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs index 23ae41dc3..cec16dd38 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs @@ -8,6 +8,7 @@ using FMOD.Studio; using FMODUnity; using UnityEngine; using STOP_MODE = FMOD.Studio.STOP_MODE; +using Debug = UnityEngine.Debug; namespace AibisDream.Kit { @@ -186,6 +187,7 @@ namespace AibisDream.Kit { // 状态切换时加载 var state = MatchAmbState(nextState); + Debug.Log("OnFixStateChange: " + state); ChangeAmb(state); } @@ -364,9 +366,10 @@ namespace AibisDream.Kit return fixState switch { FixState.Clinic => AmbState.Clinic, - FixState.Engine => AmbState.Engine, FixState.BodyModule => AmbState.Body, - FixState.Gear => AmbState.GearBox, + FixState.EmoCut => AmbState.Head, + FixState.MemoryCut => AmbState.Head, + FixState.LogicCut => AmbState.Head, FixState.UF => AmbState.UF, FixState.Eye => AmbState.Eye, FixState.Memory => AmbState.Memory, diff --git a/Assets/Scripts/SceneManagement/AnimatorKit/AnimatorYarnCommand.md.meta b/Assets/Scripts/SceneManagement/AnimatorKit/AnimatorYarnCommand.md.meta new file mode 100644 index 000000000..26d51adc0 --- /dev/null +++ b/Assets/Scripts/SceneManagement/AnimatorKit/AnimatorYarnCommand.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6ca63e4d2eab6a49809479575fa079d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: