1

Assets/Art/FengLei/ResLY/dataresources/new_effect/timeline/6004/AnimationClipMismatchChecker.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 65c7b29898458444fb24885d13077424
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/MyGame/Scripts/Net/WebSocketReponseList.cs

@@ -204,6 +204,10 @@ namespace Assets.MyGame.Scripts.Net
                     break;
                 case FrameDataType.freezeFish:
                     EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_FreezeFish, syncGameData);
+                    break;
+                case FrameDataType.changeTurretState:
+                    EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_TurretState, syncGameData);
+
                     break;
                 default:
                     break;

Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs

@@ -306,7 +306,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
                 {
                     // 本地清理锁定
                     if (currSitData != null)
+                    {
                         currSitData.ClearLock();
+                        SyncTurretState(TurretState.Idle);
+                    }
 
                     // 同步给服务器：取消锁定
                     SyncGameData sgd = new SyncGameData
@@ -1083,6 +1086,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         else
         {
             currSitData.ClearLock();
+            SyncTurretState(TurretState.Idle);
             SyncLock(null);
         }
     }
@@ -1136,6 +1140,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         if (monster == null || !monster.gameObject.activeInHierarchy)
         {
             currSitData.ClearLock();   // 清除锁定
+            SyncTurretState(TurretState.Idle);
             SyncLock(null);            // 同步服务器
 
             // ⭐⭐⭐ 关键：怪死了 → 动画回到 Idle ⭐⭐⭐
@@ -1181,6 +1186,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         else
         {
             currSitData.ClearLock();
+            SyncTurretState(TurretState.Idle);
             SyncLock(null);
         }
     }