diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
index 683fc14c1..65fea85de 100644
--- a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
@@ -294,6 +294,14 @@ public class MonsterContral : MonoBehaviour
}
}
+ ///
+ /// ⭐ 本次服务端击杀通知是否需要清除各座位对该鱼的锁定引用（默认 true：死了就清锁）。
+ /// 多次死亡的 Boss（星际巡航/烈焰风暴）重写：非最终死亡（爆奖不死）时返回 false，
+ /// 此时鱼既没死也不回收，保持锁定，玩家不用重新点一次锁定。
+ ///
+ /// 本次击杀通知（子类据此判断是否最终死亡）
+ public virtual bool ShouldClearLockOnKill(RoomKillNotice killNotice) => true;
+
///
/// ⭐ 是否延迟注册入鱼列表(子类控制,默认false=OnlyFish 创建时立即注册,现有鱼零影响)。
/// true=CreateFishManager.OnlyFish 跳过 RegisterFishInstance,
diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
index 7f4de7dca..79491ab6e 100644
--- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
@@ -2055,10 +2055,14 @@ public class CreateFishManager : MonoSingleton
}
}
// ⭐ 死鱼清除所有座位的锁定引用(原逻辑只清击杀者座位,其他座位锁同一条鱼时不清)
- ClearLockOnFish(killFish.fishId);
+ // ⭐ 例外：多次死亡 Boss（星际巡航/烈焰风暴）"爆奖不死"（非最终死亡）时不清锁 ——
+ // 鱼既没死也不回收，保持锁定，玩家不用重新点一次；是否清锁由 Boss 自己判定
+ bool killedFound = fishDatas_hashCodekey.TryGetValue(killFish.fishId, out var monster);
+ if (!killedFound || monster.ShouldClearLockOnKill(killFish))
+ ClearLockOnFish(killFish.fishId);
- if (!fishDatas_hashCodekey.TryGetValue(killFish.fishId, out var monster)) return;
+ if (!killedFound) return;
// ⭐ 统一标记死亡:死亡后子弹不再命中、不再被锁定(含不调 base.DieFish 的 Boss 子类)
monster.isDead = true;
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab
index d565546a8..d1838e934 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/RYGZ/6004.prefab
@@ -1,5 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8736803076235612826
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2866029181717433144}
+ - component: {fileID: 2267442714499221204}
+ - component: {fileID: 4351692412961435534}
+ m_Layer: 5
+ m_Name: UIParticle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2866029181717433144
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8736803076235612826}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 5702324966999054739}
+ 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: -762, y: -325}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2267442714499221204
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8736803076235612826}
+ m_CullTransparentMesh: 1
+--- !u!114 &4351692412961435534
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8736803076235612826}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, 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_IsTrail: 0
+ m_IgnoreCanvasScaler: 0
+ m_AbsoluteMode: 0
+ m_Scale3D: {x: 10, y: 10, z: 10}
+ m_AnimatableProperties: []
+ m_Particles:
+ - {fileID: 7589336166610997717}
+ - {fileID: 4730918331129498432}
+ - {fileID: 4444604718127915883}
+ - {fileID: 8366636684790394718}
+ - {fileID: 8547520956348470349}
+ - {fileID: 6716081450798443759}
+ - {fileID: 5801121726008110454}
+ - {fileID: 9102946073112875007}
+ - {fileID: 2399728264535813339}
+ - {fileID: 4417311518539555088}
+ - {fileID: 9213335075193679781}
+ - {fileID: 240873296578553223}
+ - {fileID: 4180257320062445691}
+ - {fileID: 1919246844038169835}
+ - {fileID: 6312620368948735476}
+ - {fileID: 7706970951940998726}
+ - {fileID: 2214108032534755035}
+ - {fileID: 3342265726955153155}
+ - {fileID: 7016242895374563371}
+ - {fileID: 4225034169365683542}
+ m_MeshSharing: 0
+ m_GroupId: 0
+ m_GroupMaxId: 0
+ m_PositionMode: 0
+ m_AutoScaling: 0
+ m_AutoScalingMode: 2
+ m_UseCustomView: 0
+ m_CustomViewSize: 10
+ m_TimeScaleMultiplier: 1
--- !u!1001 &325141021942548073
PrefabInstance:
m_ObjectHideFlags: 0
@@ -78,6 +178,16 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 153873188428718241, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 153873188428718241, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.7071068
+ objectReference: {fileID: 0}
- target: {fileID: 158730497209562917, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -103,6 +213,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 273526174223530296, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 303857750135097854, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -133,6 +248,16 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 406585044105205708, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 459048604338708517, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 475313771444930668, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -423,6 +548,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 1505955361338725159, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1507507379184038321, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -583,6 +713,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 2378027409955981558, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2417529409028009714, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -618,6 +753,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 2583310613629535420, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2588954635931261407, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -663,6 +803,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 2774267434756767344, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2830868156837397038, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -683,6 +828,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 2857775774614602528, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2882704925936835761, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -793,6 +943,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 3394367646996557694, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3420007968721576374, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -973,6 +1128,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 3893905434810466726, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 3893905434810466726, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.7071068
+ objectReference: {fileID: 0}
- target: {fileID: 3896512328072640659, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1098,6 +1263,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 4178155297590085059, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4216645757504062495, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1128,6 +1298,16 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 4294906646171102542, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4329876347124411889, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4365499981309317726, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1468,6 +1648,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 5515434453048020666, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 5608013610277713051, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1818,6 +2003,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 6803757593220983608, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6824193232012846055, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1878,6 +2068,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 6955116551903498184, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6961341892704687888, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1903,6 +2098,16 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 7024333102479470366, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 7024333102479470366, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.7071068
+ objectReference: {fileID: 0}
- target: {fileID: 7026981282392388333, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -1913,6 +2118,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 7032065496077962473, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7072743129047501770, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_PlayableAsset
@@ -2283,6 +2493,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
+ - target: {fileID: 7953047232634255959, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8027616426133536365, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -2388,6 +2603,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 8436048331769801313, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8459281355470209591, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -2563,6 +2783,16 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
+ - target: {fileID: 8944003613571046102, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8956150259149191653, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8966530183567188651, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
propertyPath: m_Layer
@@ -3011,7 +3241,11 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 3882252625413371882, guid: cf762c0a6428e1c42b456cb87803660f, type: 3}
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 5449804497907539962, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2866029181717433144}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8577029329742161438, guid: cf762c0a6428e1c42b456cb87803660f,
type: 3}
@@ -3614,6 +3848,12 @@ CircleCollider2D:
m_Offset: {x: 0.1160464, y: -0.122582875}
serializedVersion: 2
m_Radius: 0.22760317
+--- !u!198 &240873296578553223 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 564325398523552750, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &281193097655146041 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 533075846715265104, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -4125,6 +4365,18 @@ CircleCollider2D:
m_Offset: {x: 0.17091475, y: 1.3426483}
serializedVersion: 2
m_Radius: 0.3058867
+--- !u!198 &1919246844038169835 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 2171204371967394434, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &2214108032534755035 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 1889600408018071730, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2338652587807852409 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2663793598736023824, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -4207,6 +4459,12 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
+--- !u!198 &2399728264535813339 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 2724306333033835186, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2641630894746917213 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2318183124294262580, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -4514,6 +4772,12 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
+--- !u!198 &3342265726955153155 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 3089820024476852586, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &3506815376292764656 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3758698127541263769, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -4861,6 +5125,24 @@ CircleCollider2D:
m_Offset: {x: 0.05368716, y: 0.054799836}
serializedVersion: 2
m_Radius: 0.13550302
+--- !u!198 &4180257320062445691 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4503709488654020114, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &4225034169365683542 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4476987290432232255, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &4417311518539555088 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4165358400735127417, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &4421614957785777972 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4170220460357386589, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -4902,6 +5184,12 @@ CircleCollider2D:
m_Offset: {x: 0.07890221, y: 0.24488188}
serializedVersion: 2
m_Radius: 0.19540475
+--- !u!198 &4444604718127915883 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4120031114003817730, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &4469729105867899510 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4216645757504062495, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -4994,6 +5282,12 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.93144596}
m_EdgeRadius: 0
+--- !u!198 &4730918331129498432 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4982312840176110889, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &4813254417098979118 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5066337844978037063, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -5507,6 +5801,12 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
+--- !u!224 &5702324966999054739 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 5449804497907539962, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &5751476060242622677 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5427535777274248892, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -5558,6 +5858,12 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.43301505}
m_EdgeRadius: 0
+--- !u!198 &5801121726008110454 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 6053571754667322143, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &6095155446860562895 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5770647813476206502, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -5732,6 +6038,12 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.43948677}
m_EdgeRadius: 0
+--- !u!198 &6312620368948735476 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 5988042368188591005, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &6362133594410829995 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6686144238664863426, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -5973,6 +6285,12 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.15819675}
m_EdgeRadius: 0
+--- !u!198 &6716081450798443759 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 6464761643118455430, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &6841520174880147458 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6517505053130837611, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -6157,6 +6475,12 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.7729265, y: 1}
m_EdgeRadius: 0
+--- !u!198 &7016242895374563371 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 7340183170876423746, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &7035319059487501035 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7287206146455284866, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -6552,6 +6876,18 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1.1567506, y: 1}
m_EdgeRadius: 0
+--- !u!198 &7589336166610997717 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 7913280851089332156, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &7706970951940998726 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 7959983931359068207, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &7797673939836943935 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7545153539212195926, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -6962,6 +7298,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+--- !u!198 &8366636684790394718 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 8115312487377004855, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &8547520956348470349 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 8222947351209218596, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &8552314665183466667 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8227178120819823298, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -7240,6 +7588,12 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.4203203}
m_EdgeRadius: 0
+--- !u!198 &9102946073112875007 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 8851555894272788886, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &9130694043736657510 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8806120372286638095, guid: cf762c0a6428e1c42b456cb87803660f,
@@ -7291,3 +7645,9 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 0.28232747}
m_EdgeRadius: 0
+--- !u!198 &9213335075193679781 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 8889953273274689996, guid: cf762c0a6428e1c42b456cb87803660f,
+ type: 3}
+ m_PrefabInstance: {fileID: 325141021942548073}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Crit_GammaStorm_XingJiXunHang.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Crit_GammaStorm_XingJiXunHang.prefab
index 7c344499c..85da80fe1 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Crit_GammaStorm_XingJiXunHang.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Crit_GammaStorm_XingJiXunHang.prefab
@@ -114,6 +114,11 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 223778281884576079, guid: 785eace5f6a2fa64d90ef0be4ea4a15a,
+ type: 3}
+ propertyPath: m_SortingOrder
+ value: 20
+ objectReference: {fileID: 0}
- target: {fileID: 224076189845488788, guid: 785eace5f6a2fa64d90ef0be4ea4a15a,
type: 3}
propertyPath: m_Pivot.x
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Wheel_LieYanFengBao.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Wheel_LieYanFengBao.prefab
index e7c2aa0ff..6331ccd9b 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Wheel_LieYanFengBao.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Wheel_LieYanFengBao.prefab
@@ -249,6 +249,11 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 223170139096826373, guid: 27bc2d5066725f74fb3b5cdcf7a505e9,
+ type: 3}
+ propertyPath: m_SortingOrder
+ value: 20
+ objectReference: {fileID: 0}
- target: {fileID: 224502639086961523, guid: 27bc2d5066725f74fb3b5cdcf7a505e9,
type: 3}
propertyPath: m_SizeDelta.x
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/JiJiaLeiTing/Z_4030.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/JiJiaLeiTing/Z_4030.prefab
index 2d9dfae62..d00ed266f 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/JiJiaLeiTing/Z_4030.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/JiJiaLeiTing/Z_4030.prefab
@@ -2822,7 +2822,7 @@ MonoBehaviour:
drawLineSegments: 60
drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
bossName:
- isToUI: 1
+ isToUI: 0
tMP_CurrBossScore: {fileID: 0}
currBossScoreValue: 0
bossScoreValue: 0
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/LieYanFengBao/LieYanFengBao_BOSS.cs b/Assets/MyGame/aa/Game/XJMH/Boss/LieYanFengBao/LieYanFengBao_BOSS.cs
index bcb800f49..ba40ed4bd 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/LieYanFengBao/LieYanFengBao_BOSS.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/LieYanFengBao/LieYanFengBao_BOSS.cs
@@ -210,6 +210,25 @@ public class LieYanFengBao_BOSS : MonsterControl_BossBase
_spine.AnimationState.SetAnimation(0, animName, loop);
}
+ // ================================================================
+ // 锁定
+ // ================================================================
+
+ ///
+ /// ⭐ 爆奖不死（非最终死亡）时不影响各座位对该 Boss 的锁定：不清锁，玩家不用重新点一次。
+ /// 判定与 DieFish 保持一致：animId 优先于 isKill（animId>=2 才算最终死亡）。
+ ///
+ public override bool ShouldClearLockOnKill(RoomKillNotice killNotice)
+ {
+ if (!useServerParam || killNotice?.param == null || killNotice.param.Type == JTokenType.Null)
+ return true; // 没有 param → 按"会死"处理，走原来的清锁逻辑
+
+ var p = BossKillParamParser.ParseMultiDeath(killNotice.param);
+ if (p == null) return true;
+
+ return p.animId >= 1 ? p.animId >= 2 : p.isKill;
+ }
+
// ================================================================
// 死亡 / 被击（对齐 lua OnExplosion，两种分支）
// ================================================================
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHang_BOSS.cs b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHang_BOSS.cs
index b8b8d2436..d27b1ed3a 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHang_BOSS.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/XingJiXunHang_BOSS.cs
@@ -200,6 +200,23 @@ public class XingJiXunHang_BOSS : MonsterControl_BossBase
}
}
+ // ==================== 锁定 ====================
+
+ ///
+ /// ⭐ 爆奖不死（非最终死亡）时不影响各座位对该 Boss 的锁定：不清锁，玩家不用重新点一次。
+ /// 判定与 DieFish 保持一致：animId 优先于 isKill（animId>=2 才算最终死亡）。
+ ///
+ public override bool ShouldClearLockOnKill(RoomKillNotice killNotice)
+ {
+ if (!useServerParam || killNotice?.param == null || killNotice.param.Type == JTokenType.Null)
+ return true; // 没有 param → 按"会死"处理，走原来的清锁逻辑
+
+ var p = BossKillParamParser.ParseMultiDeath(killNotice.param);
+ if (p == null) return true;
+
+ return p.animId >= 1 ? p.animId >= 2 : p.isKill;
+ }
+
// ==================== 非最终死亡 ====================
/// 非最终死亡：显示 BJEndUI + 播放不死动画，Boss 保留，等待下次击杀
diff --git a/Assets/MyGame/aa/Game/XJMH/Prefabs/Bullit/PW_Bullet_FlameRound.prefab b/Assets/MyGame/aa/Game/XJMH/Prefabs/Bullit/PW_Bullet_FlameRound.prefab
index de55e18e5..37b058529 100644
--- a/Assets/MyGame/aa/Game/XJMH/Prefabs/Bullit/PW_Bullet_FlameRound.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Prefabs/Bullit/PW_Bullet_FlameRound.prefab
@@ -60,7 +60,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 2, y: 2, z: 2}
+ m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 2623919183334045106}
@@ -23837,7 +23837,7 @@ Transform:
serializedVersion: 2
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_LocalScale: {x: -0.93431956, y: 0.9455313, z: 0.93431956}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2626886699085632554}
diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
index ff3f43c20..5bcd16b11 100644
--- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
@@ -2085,8 +2085,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
long oldGold = sit.goldNum;
sit.goldNum += gold;
- if (sit.tMP_GoldNum != null)
- sit.tMP_GoldNum.text = sit.goldNum.ToString();
+ // ⭐ 刷新走 SetGoldNumText（优先 TMP、回退旧版 UGUI Text）：
+ // 原来这里只刷 tMP_GoldNum，而 XJMH 座位拖的是 goldNum_UGUI（tMP_GoldNum 为空）→ 数字不刷新，
+ // 表现为"XJMH 刮刮卡金币不实时"（FLZY/HHWK 座位用 TMP 所以正常）。与杀鱼/扣费/后端修正路径统一。
+ sit.SetGoldNumText(sit.goldNum);
// ⭐ 记录金币流水：已加钱（刮刮卡等途径，本地已执行）
GameManager.LogGoldFlowAppliedGain(source,
$"加金币=+{gold} 座位={sit.posID} 修正前金币={oldGold} 剩余金币={sit.goldNum} 房间={GameManager.Instance.gameData?.currRoomData?.roomId}");
diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
index e84f9b899..11ea9d5f8 100644
--- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
+++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab
@@ -9711,6 +9711,8 @@ GameObject:
m_Component:
- component: {fileID: 8019622945320605939}
- component: {fileID: 5812222518583518}
+ - component: {fileID: 4744630040498574565}
+ - component: {fileID: 2342297378402153362}
m_Layer: 5
m_Name: Turret_Left
m_TagString: Untagged
@@ -9829,6 +9831,46 @@ MonoBehaviour:
JGFXLeftParent: {fileID: 0}
JGFXRightParent: {fileID: 0}
biaoQingDuration: 3
+--- !u!223 &4744630040498574565
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5844352391902547866}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 20
+ m_TargetDisplay: 0
+--- !u!114 &2342297378402153362
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5844352391902547866}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &5854058861895449597
GameObject:
m_ObjectHideFlags: 0
@@ -12512,6 +12554,8 @@ GameObject:
m_Component:
- component: {fileID: 3277345602720993286}
- component: {fileID: 7267664368300524434}
+ - component: {fileID: 9079033681526718684}
+ - component: {fileID: 3050638589169442137}
m_Layer: 5
m_Name: Turret_Left (1)
m_TagString: Untagged
@@ -12630,6 +12674,46 @@ MonoBehaviour:
JGFXLeftParent: {fileID: 0}
JGFXRightParent: {fileID: 0}
biaoQingDuration: 3
+--- !u!223 &9079033681526718684
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7625899849173548161}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 20
+ m_TargetDisplay: 0
+--- !u!114 &3050638589169442137
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7625899849173548161}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &7661478501777824865
GameObject:
m_ObjectHideFlags: 0
@@ -17356,7 +17440,7 @@ PrefabInstance:
- target: {fileID: 224349892793438657, guid: 6f077aa14d1a8e34687a3af5f0f1eae5,
type: 3}
propertyPath: m_SizeDelta.x
- value: 6
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224349892793438657, guid: 6f077aa14d1a8e34687a3af5f0f1eae5,
type: 3}
@@ -17386,7 +17470,7 @@ PrefabInstance:
- target: {fileID: 224448299783411175, guid: 6f077aa14d1a8e34687a3af5f0f1eae5,
type: 3}
propertyPath: m_SizeDelta.x
- value: 6
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 224448299783411175, guid: 6f077aa14d1a8e34687a3af5f0f1eae5,
type: 3}