Merge branch 'feature/海浪' into 'develop'

问题修改

See merge request aibis-dream/aibis-dream!429

Assets/ScriptableObjects/BubbleStyle/Default Bottom Style.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
   m_Name: Default Bottom Style
   m_EditorClassIdentifier: 
-  bubblePadding: {x: 30, y: 40, z: 55, w: 30}
+  bubblePadding: {x: 30, y: 40, z: 30, w: 50}
   linePadding: {x: 30, y: 10, z: 20, w: 10}
   lineFontSize: 30
   actorPadding: {x: 0, y: 0, z: 0, w: 0}

Assets/ScriptableObjects/BubbleStyle/Default Top Style.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
   m_Name: Default Top Style
   m_EditorClassIdentifier: 
-  bubblePadding: {x: 30, y: 40, z: 55, w: 35}
+  bubblePadding: {x: 30, y: 40, z: 60, w: 25}
   linePadding: {x: 30, y: 10, z: 20, w: 10}
   lineFontSize: 30
   actorPadding: {x: 0, y: 0, z: 0, w: 0}

Assets/Scripts/FixSystemNew/FixStateMachine.cs

@@ -31,6 +31,7 @@ namespace AibisDream.FixSystem
 
         public IEnumerator SwitchState(FixState nextState, string args = "")
         {
+            Debug.Log($"SwitchState: {CurState}");
             if (CurState == nextState) yield break;
 
             _curArgs = args;
@@ -68,7 +69,7 @@ namespace AibisDream.FixSystem
                 FixState.MemoryCut => new MemoryCutState(),
                 FixState.LogicCut => new LogicCutState(),
                 FixState.Dream => new DreamState(),
-                _ => new ClinicState()
+                _ => new DefaultState()
             };
 
             res.SetArgs(args);
@@ -98,11 +99,26 @@ namespace AibisDream.FixSystem
     public interface IState
     {
         public FixState GetState { get; }
-        public void SetArgs(string args);
+        public void SetArgs(string args) {}
         public IEnumerator Enter();
         public IEnumerator Exit();
     }
 
+    public struct DefaultState : IState
+    {
+        public FixState GetState => FixState.Default;
+
+        public IEnumerator Enter()
+        {
+            yield break;
+        }
+
+        public IEnumerator Exit()
+        {
+            yield break;
+        }
+    }
+
     public struct ClinicState : IState
     {
         public FixState GetState => FixState.Clinic;
@@ -115,6 +131,7 @@ namespace AibisDream.FixSystem
         public IEnumerator Enter()
         {
             // 切换相机
+            Debug.Log("相机切换");
             yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic);
             // 注册对话气泡
             var clinicSystem = FixSystemCenter.SystemDic.Get<ClinicSystem>();