1

Assets/Art/FengLei/Boss/1595/1595_Timeline.prefab

@@ -120067,7 +120067,6 @@ GameObject:
   - component: {fileID: 3413891790153725749}
   - component: {fileID: 587284605560389850}
   - component: {fileID: 1013032855753225937}
-  - component: {fileID: 9140137541780865346}
   m_Layer: 0
   m_Name: 1 (3)
   m_TagString: Untagged
@@ -124905,21 +124904,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &9140137541780865346
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 709355221681288478}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0aab1a898097eb442a2cd6c0dfd462f1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0.35
-  loopCnt: 1
-  nextdelayTime: 0
 --- !u!1 &761341635869387049
 GameObject:
   m_ObjectHideFlags: 0
@@ -161255,7 +161239,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1029546511918474061}
-  - component: {fileID: 3861733116178620780}
   m_Layer: 21
   m_Name: shake
   m_TagString: Untagged
@@ -161278,18 +161261,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3132634215347790896}
   m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!114 &3861733116178620780
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 988055618562759642}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7adefbfcdc79f377acde681047699880, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &988402693088890716
 GameObject:
   m_ObjectHideFlags: 0
@@ -204495,7 +204466,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 507309170821793216}
-  - component: {fileID: 2259901298080488987}
   m_Layer: 21
   m_Name: shake
   m_TagString: Untagged
@@ -204518,18 +204488,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3859412095216574883}
   m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!114 &2259901298080488987
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1380724595735342460}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7adefbfcdc79f377acde681047699880, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1413088628080305968
 GameObject:
   m_ObjectHideFlags: 0
@@ -515370,7 +515328,6 @@ GameObject:
   - component: {fileID: 1192942766009352229}
   - component: {fileID: 4019690688996947914}
   - component: {fileID: 3594364383907037633}
-  - component: {fileID: 4699209292034586194}
   m_Layer: 0
   m_Name: 1 (3)
   m_TagString: Untagged
@@ -520208,21 +520165,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &4699209292034586194
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3906478562072429070}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0aab1a898097eb442a2cd6c0dfd462f1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0.35
-  loopCnt: 1
-  nextdelayTime: 0
 --- !u!1 &3920708118228889250
 GameObject:
   m_ObjectHideFlags: 0
@@ -527470,11 +527412,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4574926555101054826}
   - component: {fileID: 544344131516331274}
-  - component: {fileID: 6200318659309870788}
-  - component: {fileID: 2788181324627283165}
   - component: {fileID: 7380302373720209887}
-  - component: {fileID: 2479887271049202593}
-  - component: {fileID: 523368823488802394}
   m_Layer: 21
   m_Name: 1595_tx
   m_TagString: Untagged
@@ -527575,11 +527513,11 @@ PlayableDirector:
   - key: {fileID: 11400000, guid: 596f8d8b8bad5804fae463dfaff6a287, type: 2}
     value: {fileID: 0}
   - key: {fileID: 114928399344408411, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 6200318659309870788}
+    value: {fileID: 0}
   - key: {fileID: 11400000, guid: 63ec107d913a9b34e86f83afd2cf41b6, type: 2}
     value: {fileID: 0}
   - key: {fileID: 114424576824350092, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 2479887271049202593}
+    value: {fileID: 0}
   - key: {fileID: 0}
     value: {fileID: 7380302373720209887}
   - key: {fileID: 114969581885602060, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
@@ -527625,15 +527563,15 @@ PlayableDirector:
   - key: {fileID: 11400000, guid: 8c8d6ba34a528494da3ad112acb38510, type: 2}
     value: {fileID: 0}
   - key: {fileID: 114604876455164362, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 523368823488802394}
+    value: {fileID: 0}
   - key: {fileID: 114868263021989735, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 523368823488802394}
+    value: {fileID: 0}
   - key: {fileID: 114262104720372867, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 523368823488802394}
+    value: {fileID: 0}
   - key: {fileID: 114184525455482972, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 523368823488802394}
+    value: {fileID: 0}
   - key: {fileID: 114076939305976851, guid: c0cb1fd8fb808fd449a2b81436d532ad, type: 2}
-    value: {fileID: 523368823488802394}
+    value: {fileID: 0}
   - key: {fileID: 8556080881087418332, guid: 9878550804b8b8846a510502089e2f8d, type: 2}
     value: {fileID: 8144038867098044427}
   - key: {fileID: -6098008232638280433, guid: 9878550804b8b8846a510502089e2f8d, type: 2}
@@ -527749,30 +527687,6 @@ PlayableDirector:
     - dd094e06a80b17f478f8f82733463197: {fileID: 761341635869387049}
     - 5aced8e2c2dcd3c499b26e99c76227bc: {fileID: 2415534612118259976}
     - 517f76515f9bf7048b642724b1e139c5: {fileID: 2191855197013704216}
---- !u!114 &6200318659309870788
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3947948437039094499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1e7b2ff5adc6dfad2b0535009235bda8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &2788181324627283165
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3947948437039094499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7634ae6a06d959975cc7c74cb597c378, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!95 &7380302373720209887
 Animator:
   serializedVersion: 5
@@ -527794,30 +527708,6 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!114 &2479887271049202593
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3947948437039094499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7634ae6a06d959975cc7c74cb597c378, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &523368823488802394
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3947948437039094499}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eccb8bef7bdd0af2f3197e87ccdbe826, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &3974375194302513399
 GameObject:
   m_ObjectHideFlags: 0
@@ -694236,7 +694126,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1397990826616708738}
-  - component: {fileID: 4963376790349949541}
   m_Layer: 21
   m_Name: eff_tx_baokai
   m_TagString: Untagged
@@ -694260,18 +694149,6 @@ Transform:
   - {fileID: 3132634215347790896}
   m_Father: {fileID: 4574926555101054826}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4963376790349949541
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5210372043903924767}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ae9b70ba4e2aa2329407c722b6c5a5fd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &5233027215664266222
 GameObject:
   m_ObjectHideFlags: 0
@@ -740639,7 +740516,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4258503319454529356}
-  - component: {fileID: 8687617501029528259}
   m_Layer: 21
   m_Name: shake
   m_TagString: Untagged
@@ -740662,18 +740538,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1001575624223261201}
   m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!114 &8687617501029528259
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5439702296659042957}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7adefbfcdc79f377acde681047699880, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &5449545268952390588
 GameObject:
   m_ObjectHideFlags: 0
@@ -750473,7 +750337,6 @@ GameObject:
   - component: {fileID: 4725718964994004084}
   - component: {fileID: 4542615341527568710}
   - component: {fileID: 463309524557434990}
-  - component: {fileID: 262349306644682355}
   m_Layer: 0
   m_Name: 1 (2)
   m_TagString: Untagged
@@ -755311,21 +755174,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &262349306644682355
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5463592158875868315}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0aab1a898097eb442a2cd6c0dfd462f1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0.2
-  loopCnt: 1
-  nextdelayTime: 0
 --- !u!1 &5469707169576763811
 GameObject:
   m_ObjectHideFlags: 0
@@ -1033467,7 +1033315,6 @@ GameObject:
   - component: {fileID: 6928329943224202944}
   - component: {fileID: 7365925558055797027}
   - component: {fileID: 8705054285844080572}
-  - component: {fileID: 7910837176601713065}
   m_Layer: 0
   m_Name: Effect_zhadanxie_2Burst_hit
   m_TagString: Untagged
@@ -1038288,21 +1038135,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &7910837176601713065
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7892844641689730661}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0aab1a898097eb442a2cd6c0dfd462f1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 2
-  loopCnt: 1
-  nextdelayTime: 0
 --- !u!1 &7900444903582309056
 GameObject:
   m_ObjectHideFlags: 0
@@ -1069744,7 +1069576,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 484016321656840653}
-  - component: {fileID: 2052382635838068296}
   m_Layer: 21
   m_Name: shake (1)
   m_TagString: Untagged
@@ -1069767,18 +1069598,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 5653742848749812603}
   m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
---- !u!114 &2052382635838068296
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8168133544423762878}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7adefbfcdc79f377acde681047699880, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &8190271529447675589
 GameObject:
   m_ObjectHideFlags: 0
@@ -1103164,7 +1102983,6 @@ GameObject:
   - component: {fileID: 9114048706091115364}
   - component: {fileID: 64220047624480342}
   - component: {fileID: 4143517059708168062}
-  - component: {fileID: 4344484984300527971}
   m_Layer: 0
   m_Name: 1 (2)
   m_TagString: Untagged
@@ -1108002,21 +1107820,6 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
---- !u!114 &4344484984300527971
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8375621366770559883}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0aab1a898097eb442a2cd6c0dfd462f1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  delayTime: 0.2
-  loopCnt: 1
-  nextdelayTime: 0
 --- !u!1 &8380662148496452780
 GameObject:
   m_ObjectHideFlags: 0
@@ -1130047,7 +1129850,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7449577696093389658}
-  - component: {fileID: 6143340572883401801}
   m_Layer: 21
   m_Name: eff_tx_xiaobaokai_1
   m_TagString: Untagged
@@ -1130071,18 +1129873,6 @@ Transform:
   - {fileID: 852576680930842430}
   m_Father: {fileID: 4574926555101054826}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6143340572883401801
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8429043403534316758}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ae9b70ba4e2aa2329407c722b6c5a5fd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &8457748586297251865
 GameObject:
   m_ObjectHideFlags: 0
@@ -1190849,7 +1190639,6 @@ GameObject:
   m_Component:
   - component: {fileID: 6012373738196793477}
   - component: {fileID: 7121973545225864564}
-  - component: {fileID: 5492158301135603378}
   m_Layer: 21
   m_Name: 183_PT
   m_TagString: Untagged
@@ -1190894,18 +1190683,6 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!114 &5492158301135603378
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8838415017098771670}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 14d4a3415f0796d560b64f6e95ba429f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &8859605779149737082
 GameObject:
   m_ObjectHideFlags: 0

Assets/Art/FengLei/Boss/192/eff_dead_192_timeline.playable

@@ -2359,7 +2359,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
   m_Name: Signal Emitter
   m_EditorClassIdentifier: 
-  m_Time: 12.55
+  m_Time: 11
   m_Retroactive: 0
   m_EmitOnce: 0
   m_Asset: {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}

Assets/MyGame/Scripts/Turret/SitPosData.cs

@@ -1069,15 +1069,16 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         // XJMH 模式没有翅膀概念，直接跳过
         if (turretControlMode == TurretControlMode.XJMH) return;
 
-        // 先清理已有翅膀（保留预设的 Camera，它是用来渲染翅膀到 RawImage 的）
-        for (int i = wingParent.childCount - 1; i >= 0; i--)
+        // turretNumber<=0 = 卸下（与战神同一约定）：只清理不加载，不打警告
+        if (turretNumber <= 0)
         {
-            var child = wingParent.GetChild(i);
-            if (child.GetComponent<Camera>() != null)
-                continue;   // 保留 Camera
-            Destroy(child.gameObject);
+            ClearWing();
+            return;
         }
 
+        // 先清理已有翅膀
+        ClearWing();
+
         // 从 TurretResourcesData 拿预制体
         GameObject prefab = TurretResourcesData.GetTurretPrefab(turretNumber);
         if (prefab == null)
@@ -1093,6 +1094,20 @@ public class SitPosData : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         Debug.Log($"[SitPosData] 翅膀已加载: #{turretNumber}");
     }
 
+    /// <summary>卸下翅膀：清空 wingParent 下的翅膀模型（保留预设的 Camera，它是用来渲染翅膀到 RawImage 的）。</summary>
+    public void ClearWing()
+    {
+        if (turretControlMode == TurretControlMode.XJMH) return;
+
+        for (int i = wingParent.childCount - 1; i >= 0; i--)
+        {
+            var child = wingParent.GetChild(i);
+            if (child.GetComponent<Camera>() != null)
+                continue;   // 保留 Camera
+            Destroy(child.gameObject);
+        }
+    }
+
     /// <summary>根据炮台编号字符串加载。</summary>
     public void LoadWing(string turretNumberStr)
     {

Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/LLBTDieEvent.cs

@@ -13,7 +13,7 @@ public class LLBTDieEvent : BJRedPacketEvent
     public override void Init(long goldCount, int posID, long paobei, long fishScore, int beishu, Action<int> action, Action action1 = null)
     {
         base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1);
-        StartCoroutine(yanshi());
+        //StartCoroutine(yanshi());
     }
     public void bjLLBT()
     {

Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab

@@ -2691,6 +2691,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -0.0133831445
       objectReference: {fileID: 0}
+    - target: {fileID: 6915946105037678774, guid: 31d14c4d2edf17b4c9c5a5abad4a474e,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6915946105037678774, guid: 31d14c4d2edf17b4c9c5a5abad4a474e,
         type: 3}
       propertyPath: m_TagString

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

@@ -2889,7 +2889,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         if (sync.sitPos == currSitData.posID) return;
 
         var data = FrameDataParser.Parse<FrameData_ChangeTurret>(sync.frameData);
-        list_Sits[sync.sitPos].LoadWing(data.turretIndex);
+        // turretIndex<=0 = 卸下翅膀；>0 = 加载对应编号翅膀（与战神 changeZhanShen 同一约定）
+        if (data.turretIndex > 0)
+            list_Sits[sync.sitPos].LoadWing(data.turretIndex);
+        else
+            list_Sits[sync.sitPos].ClearWing();
     }
 
     public void SyncGameData_ChangeZhanShen(SyncGameData sync)

Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab

@@ -4964,6 +4964,7 @@ RectTransform:
   m_Children:
   - {fileID: 6613517557947517512}
   - {fileID: 2173153052804533598}
+  - {fileID: 7556917316933505438}
   - {fileID: 4670066188549950499}
   - {fileID: 7047705136109306664}
   - {fileID: 9210332093848116924}
@@ -6214,6 +6215,7 @@ MonoBehaviour:
   tmp_ZHanShenLabel: {fileID: 2829478681478899944}
   btn_XuanZe: {fileID: 3500349491260593746}
   btn_XieXia: {fileID: 3645199743623880684}
+  btn_XieXia_Wing: {fileID: 848851429584608479}
   obj_TurretWingPanel: {fileID: 4858565427870377112}
   obj_ZhanShenPanel: {fileID: 5722782085131459815}
 --- !u!1 &5701770668658621809
@@ -6322,7 +6324,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &9060029959765500742
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6464,6 +6466,202 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5848966925085162397
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7556917316933505438}
+  - component: {fileID: 8959237688636063345}
+  - component: {fileID: 2682022898945432965}
+  - component: {fileID: 848851429584608479}
+  m_Layer: 0
+  m_Name: XieXia
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7556917316933505438
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5848966925085162397}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7260207937314948868}
+  m_Father: {fileID: 3014377986955302398}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0.000011444, y: 65.5}
+  m_SizeDelta: {x: 227, y: 77}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8959237688636063345
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5848966925085162397}
+  m_CullTransparentMesh: 1
+--- !u!114 &2682022898945432965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5848966925085162397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1471f0a0cf72dd444a5dfde4db5f6ff3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &848851429584608479
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5848966925085162397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2682022898945432965}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5875793647059852209
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7260207937314948868}
+  - component: {fileID: 1313386240513734262}
+  - component: {fileID: 5881680565191952735}
+  m_Layer: 0
+  m_Name: "\u51FA\u6218"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7260207937314948868
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5875793647059852209}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7556917316933505438}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 4.500019, y: 1}
+  m_SizeDelta: {x: 92, y: 49}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1313386240513734262
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5875793647059852209}
+  m_CullTransparentMesh: 1
+--- !u!114 &5881680565191952735
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5875793647059852209}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 892bb04876732ec4fb32653cc36d15ab, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5943681652745722606
 GameObject:
   m_ObjectHideFlags: 0
@@ -9226,7 +9424,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 9}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &4511948263627284475
 MonoBehaviour:

Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs

@@ -69,8 +69,10 @@ public class UIHome_BY_ItemListPanels : SubUIBase
     public TextMeshProUGUI tmp_ZHanShenName;
     public TextMeshProUGUI tmp_ZHanShenLabel;
     public Button btn_XuanZe;
-    [Tooltip("卸下战神按钮：只在战神 Tab 且当前有装备战神时显示")]
+    [Tooltip("卸下战神按钮：战神 Tab 且选中的恰好是已装备战神时显示（炮台/翅膀面板无此按钮）")]
     public Button btn_XieXia;
+    [Tooltip("卸下翅膀按钮：翅膀 Tab 且选中的恰好是已装备翅膀时显示（炮台没有卸下概念，永远不显示）")]
+    public Button btn_XieXia_Wing;
     [Header("面板")]
     public GameObject obj_TurretWingPanel;
     public GameObject obj_ZhanShenPanel;
@@ -133,6 +135,9 @@ public class UIHome_BY_ItemListPanels : SubUIBase
         if (btn_XieXia != null)
             btn_XieXia.onClick.AddListener(OnClickXieXia);
 
+        if (btn_XieXia_Wing != null)
+            btn_XieXia_Wing.onClick.AddListener(OnClickXieXia_Wing);
+
         if (tMP_Type != null)
             tMP_Type.onValueChanged.AddListener(OnDropdownChanged);
 
@@ -191,16 +196,20 @@ public class UIHome_BY_ItemListPanels : SubUIBase
             // 默认选中已装备的战神编号
             var equipped = GetUserEquipped();
             _selectedZhanShenNumber = (equipped != null && int.TryParse(equipped.number, out int n)) ? n : -1;
-            // ⭐ 卸下按钮：战神 Tab 且当前有装备战神才显示（显隐随选中详情 RefreshZhanShenDetail 刷新）
+            // ⭐ 卸下按钮：此时 _selectedZhanShenNumber 已定位到已装备编号（选中的=已装备的），初始显隐即正确；
+            // 之后随选中详情 RefreshZhanShenDetail 刷新（点未装备的会隐藏）
             if (btn_XieXia != null)
                 btn_XieXia.gameObject.SetActive(equipped != null);
             RebuildZhanShenTypeList();
             return;
         }
 
-        // ⭐ 非战神 Tab：卸下按钮一律隐藏
+        // ⭐ 炮台/翅膀 Tab：战神卸下按钮一律隐藏；翅膀卸下按钮由 RefreshDetailPanel 按选中刷新，
+        // 这里只做初始值（进入翅膀 Tab 时默认选中已装备翅膀，有装备则初始显示）；炮台永远不显示
         if (btn_XieXia != null)
             btn_XieXia.gameObject.SetActive(false);
+        if (btn_XieXia_Wing != null)
+            btn_XieXia_Wing.gameObject.SetActive(itemPanel == ItemPanelSelect.Wing && GetUserEquipped() != null);
 
         // 切换到炮台/翅膀时，默认选中已装备的编号；无装备则清空，列表会自动选第一个
         if (itemPanel == ItemPanelSelect.Turrect || itemPanel == ItemPanelSelect.Wing)
@@ -708,9 +717,9 @@ public class UIHome_BY_ItemListPanels : SubUIBase
         if (btn_XuanZe != null)
             btn_XuanZe.interactable = isOwned;
 
-        // ---- 卸下按钮：当前有装备战神才显示（与选中的是哪个无关）----
+        // ---- 卸下按钮：选中的恰好是当前装备的战神才显示（点未装备的隐藏）----
         if (btn_XieXia != null)
-            btn_XieXia.gameObject.SetActive(GetUserEquipped() != null);
+            btn_XieXia.gameObject.SetActive(turretNumber > 0 && IsItemEquipped(turretNumber));
 
         // ---- 缩略图（和翅膀一样显示 RawImage）----
         if (rawImg_DetailPreview != null)
@@ -791,6 +800,51 @@ public class UIHome_BY_ItemListPanels : SubUIBase
         });
     }
 
+    // ==================== 翅膀卸下按钮 ====================
+
+    /// <summary>
+    /// 卸下翅膀按钮：卸下当前装备的翅膀（ChangeWing number="0"，与战神卸下同一约定）。
+    /// 成功后刷新用户数据；游戏内打开时同步清本地座位翅膀并广播给其他客户端（turretIndex=0=卸下）。
+    /// </summary>
+    private void OnClickXieXia_Wing()
+    {
+        var equipped = GetUserEquipped();
+        if (equipped == null)
+        {
+            Debug.Log("[UIHome_BY_ItemListPanels] 当前没有装备翅膀，无需卸下");
+            return;
+        }
+
+        APIRequestList.ChangeWing(new ChangeWingParam { number = "0" }, res =>
+        {
+            Debug.Log("[UIHome_BY_ItemListPanels] 卸下翅膀成功");
+
+            var userId = GameManager.Instance?.user?.id;
+            if (string.IsNullOrEmpty(userId))
+            {
+                if (btn_XieXia_Wing != null) btn_XieXia_Wing.gameObject.SetActive(false);
+                return;
+            }
+
+            APIRequestList.GetUser(userId, userRes =>
+            {
+                GameManager.Instance.UpdataUserData(userRes);
+
+                // 选中编号清掉（已无装备，列表重新定位到第一个）
+                _selectedTurretNumber = -1;
+
+                // 从游戏内打开：清本地座位翅膀 + 广播给其他客户端（turretIndex=0=卸下）
+                if (_isInGame)
+                {
+                    SitPosData.localPlayerSit?.ClearWing();
+                    CreateFishManager.Instance?.currGameType?.SyncChangeWing(0);
+                }
+
+                RebuildItemList();
+            });
+        });
+    }
+
     // ==================== GameManager 用户数据关联 ====================
 
     /// <summary>检查玩家是否拥有指定炮台/翅膀/战神。</summary>
@@ -929,6 +983,10 @@ public class UIHome_BY_ItemListPanels : SubUIBase
         RefreshButtonsVisibility(isOwned);
         RefreshDuiHuanUI(turretNumber);
 
+        // ---- 卸下按钮（仅翅膀）：选中的恰好是当前装备的翅膀才显示；炮台没有卸下概念，永远不显示 ----
+        if (btn_XieXia_Wing != null)
+            btn_XieXia_Wing.gameObject.SetActive(_currentSelectType == ItemPanelSelect.Wing && turretNumber > 0 && IsItemEquipped(turretNumber));
+
         // ---- 缩略图 ----
         if (rawImg_DetailPreview != null)
             rawImg_DetailPreview.gameObject.SetActive(_currentSelectType != ItemPanelSelect.Turrect);