Merge branch 'develop' into 火山美术合入2.11

Assets/Scripts/FixSystemNew/BodyModule/Modules/BodyModule.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using AibisDream.Framework;
 using Newtonsoft.Json;
 using UnityEngine;
@@ -35,7 +35,6 @@ namespace AibisDream.FixSystem
 
         [Header("CutText闪烁效果")] private float cutTextFlickerThreshold = 0.4f; // 开始闪烁的阈值
         private float cutTextFlickerInterval = 0.1f; // 闪烁间隔
-        private float cutTextFlickerTimer = 0f; // 闪烁计时器
         private bool isCutTextFlickering = false; // 是否正在闪烁
         private Coroutine flickerCoroutine; // 闪烁协程引用
 
@@ -44,7 +43,6 @@ namespace AibisDream.FixSystem
         // 模块基本数据
         [SerializeField] public BodyModuleData data;
         public bool available = true;
-        private bool _cutting;
         private bool _isOpen;
 
         private void Awake()
@@ -102,9 +100,9 @@ namespace AibisDream.FixSystem
         {
         }
 
-        public Vector3 GetSocketPos()
+        public Transform GetSocketPos()
         {
-            return _socketPos.position;
+            return _socketPos;
         }
 
         public void OpenPlugSlot()

Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs

@@ -1,20 +1,19 @@
-using UnityEngine;
+using UnityEngine;
 using AibisDream.Framework;
 using AibisDream;
 using System;
 using System.Collections;
-using AibisDream.FixSystem;
 
 public class UFModule : MonoBehaviour
 {
     private GameObject _ufCover;
     private GameObject _ufModule;
 
-     private GameObject _ufSocket;
+    private GameObject _ufSocket;
 
     private GameObject _ufColor;
-    private UFData _ufData=new ();
-    
+    private UFData _ufData = new();
+
     private void Awake()
     {
         // 将数据注册到数据容器内
@@ -24,9 +23,8 @@ public class UFModule : MonoBehaviour
         _ufModule = transform.Find("Module Pic").gameObject;
         _ufSocket = transform.Find("Socket").gameObject;
         _ufCover = _ufModule.transform.Find("Cover").gameObject;
-        _ufColor=_ufModule.transform.Find("Color").gameObject;
+        _ufColor = _ufModule.transform.Find("Color").gameObject;
     }
-    // Start is called before the first frame update
 
     public void RemoveUFCover()
     {
@@ -44,7 +42,7 @@ public class UFModule : MonoBehaviour
         {
             _ufModule.SetActive(false);
             _ufSocket.SetActive(false);
-            
+
         }
 
         _ufData.isUFRemoved = true;
@@ -79,7 +77,7 @@ public class UFModule : MonoBehaviour
 
         _ufData.isColorRemoved = false;
     }
-        public void RemoveUFColor()
+    public void RemoveUFColor()
     {
         if (_ufColor.activeInHierarchy)
         {