Merge branch 'feature/stone-day2' into feature/merge

Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs

@@ -91,6 +91,10 @@ namespace AibisDream.FixSystem
             {
                 coolingBottle.Rotate(true);
             }
+        }
+
+        public void ChangeSlot(CoolingBottle coolingBottle)
+        {
             InsertSlotEvent?.Invoke(coolingBottle);
         }
 

Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs

@@ -50,6 +50,7 @@ namespace AibisDream.FixSystem
         public void StartMove()
         {
             _rb.isKinematic = false;
+            gameObject.layer = LayerMask.NameToLayer("Clinic");
             // 开始移动时就切换成横版
             Rotate(false);
         }
@@ -92,13 +93,15 @@ namespace AibisDream.FixSystem
                 // 更新到新的Slot
                 curSnapSlot = targetSlot;
                 
-                curSnapSlot.InsertSlot(this);
+                curSnapSlot.ChangeSlot(this);
             }
 
             targetSnapSlotSet.Clear();
 
             // 吸附到目标位置
             _rb.isKinematic = true;
+            gameObject.layer = LayerMask.NameToLayer("Default");
+            curSnapSlot.InsertSlot(this);
             transform.DOMove(curSnapSlot.transform.position, SnapMoveTime);
             
             // TODO 停止描边

Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs

@@ -68,14 +68,14 @@ namespace AibisDream.Framework
         public void InsertBottle(CoolingBottle bottle)
         {
             // 设置当前瓶子名称
-            DialogController.Instance.SetVariable("$curBottleName", bottle.data.name);
-            // 触发插入对话
-            DialogController.Instance.StartDialogNode("插入冷却液");
+            // DialogController.Instance.SetVariable("$curBottleName", bottle.data.name);
+            // // 触发插入对话
+            // DialogController.Instance.StartDialogNode("插入冷却液");
         }
 
         public void RemoveBottle()
         {
-            DialogController.Instance.SetVariable("$curBottleName", "");
+            // DialogController.Instance.SetVariable("$curBottleName", "");
         }
 
         public void Lock()

Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs

@@ -0,0 +1,49 @@
+using System.Collections;
+using AibisDream.Framework;
+using DG.Tweening;
+using UnityEngine;
+
+namespace AibisDream.FixSystem
+{
+    public class BodyModuleTransition
+    {
+        public struct BodyModuleToGearCommand : ITransitionCommand
+        {
+            private static readonly Vector3 CameraPos = new(-2.5f, 2.13f, -10);
+            private const float OrthographicSize = 2.5f;
+            private const float Duration = 2f;
+            
+            public IEnumerator Execute()
+            {
+                var bodyModuleSystem = FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
+                var gearSystem = FixSystemCenter.SystemDic.Get<GearSystem>();
+                
+                // 插头回到初始插孔
+                bodyModuleSystem.ResetPlug();
+                // 相机聚焦到目标位
+                yield return CameraKit.Instance.TransCamera(CameraPos, OrthographicSize, Duration).WaitForCompletion();
+
+                // 打开引擎盖子
+                yield return gearSystem.OpenCover();
+            }
+
+            public void SetArgs(string arg)
+            {
+                // 暂无参数
+            }
+        }
+        
+        public struct GearToBodyModuleCommand : ITransitionCommand
+        {
+            public IEnumerator Execute()
+            {
+                throw new System.NotImplementedException();
+            }
+
+            public void SetArgs(string arg)
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+    }
+}

Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ae4ece844a9a417687bd443b4cdf7820
+timeCreated: 1735242780