开头合并

2025-05-14 13:03:08 +08:00
parent 4d34b96154
commit 4120482e88
35 changed files with 12913 additions and 584 deletions
@@ -31,8 +31,8 @@ namespace AibisDream.FixSystem

        // 模块基本数据
        [SerializeField] public BodyModuleData data;
-        public float clickRadius = 0.5f;
-        private bool _available = true;
+        public float clickRadius = 0.2f;
+        public bool available = true;
        private bool _cutting;

        private void Awake()
@@ -64,12 +64,12 @@ namespace AibisDream.FixSystem

        public bool IsAvailable()
        {
-            return _available;
+            return available;
        }

        public void SetSocketAvailable(bool isAvailable)
        {
-            _available = isAvailable;
+            available = isAvailable;
        }

        public void PlugIn()
@@ -119,6 +119,8 @@ namespace AibisDream.FixSystem
            ShowCutLine();
            _cutLine.OnCuttingDown += OnCuttingDown;
            _cutting = true;
+            
+            EnumEventSystem.Global.Send(EventEnum.CutStart);
        }

        private void OnCut()
@@ -138,6 +140,8 @@ namespace AibisDream.FixSystem
                .Delay(0.5f)
                .DOTween(() => transform.DOMoveY(ConstRef.TweenEndY,
                    (transform.position.y - ConstRef.TweenEndY) / ConstRef.FallSpeed).SetEase(Ease.InQuad))
+                .Callback(() => DialogController.Instance?.StartDialogNode($"{data.moduleName}_cutdown"))
+                .Callback(() => EnumEventSystem.Global.Send(EventEnum.CutEnd))
                .Start(this, () => Destroy(gameObject));
        }

@@ -45,7 +45,6 @@ namespace AibisDream.FixSystem

        private void Awake()
        {
-            
            InitComponentRefs();
        }

@@ -53,7 +52,7 @@ namespace AibisDream.FixSystem
        {
            // 注册数据
            StorageSystem.Instance.RegisterData(_data);
-            
+
            // 处理内部索引
            _bodyModuleGroup = transform.Find("Body Module Group")?.gameObject;
            _headModuleGroup = transform.Find("Head Module Group")?.gameObject;
@@ -62,8 +61,9 @@ namespace AibisDream.FixSystem
            {
                heatMapController = transform.Find("HeatMapController").GetComponent<HeatMapController>();
            }
+
            FixSystemCenter.SystemDic.Register(this);
-            
+
            // 注册Camera
            var virtualCam = transform.GetComponentInChildren<ICinemachineCamera>();
            CameraKit.Instance.RegisterCamera(CameraEnum.BodyModule, virtualCam);
@@ -199,6 +199,7 @@ namespace AibisDream.FixSystem
                default:
                    throw new ArgumentOutOfRangeException(nameof(moduleState), moduleState, null);
            }
+
            // 重新获取ModuleGroup
            var root = moduleState == ModuleState.Body ? _bodyModuleGroup : _headModuleGroup;
            BodyModules = root?.GetComponentsInChildren<BodyModule>().ToList();
@@ -220,7 +221,7 @@ namespace AibisDream.FixSystem
    public class ModuleSystemData : IData
    {
        public ModuleState moduleState;
-        
+
        public IEnumerator Load()
        {
            FixSystemCenter.SystemDic.Get<BodyModuleSystem>().SwitchModuleGroup(moduleState);
@@ -9,6 +9,13 @@ namespace AibisDream
        private static BodyModuleSystem BodyModuleSystem => FixSystemCenter.SystemDic.Get<BodyModuleSystem>();
        private static PunchTapeSystem PunchTapeSystem => FixSystemCenter.SystemDic.Get<PunchTapeSystem>();

+        [YarnCommand("enable_cut")]
+        public static void EnableCut(string moduleName)
+        {
+            var cutModule = BodyModuleSystem.FindBodyModuleByName(moduleName);
+            cutModule.EnableCut();
+        }
+        
        [YarnCommand("ShowHeatMap")]
        public static void ShowHeatMap()
        {