From fb47ab6e9cd1aa09b84d365115f549459dfe38e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com>
Date: Thu, 13 Aug 2026 22:02:16 +0800
Subject: [PATCH] 1
---
.../AssetGroups/Fish_XJMH.asset | 14 +-
.../game/text/PW_Effect_TextCrit_Other.prefab | 110 +-
.../game/text/PW_Effect_TextCrit_Self.prefab | 108 +-
.../fortunewheel.controller | 2 +-
Assets/MyGame/Scenes/UIScene.unity | 262 +
.../MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs | 5 +-
.../MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs | 9 +
.../aa/Game/XJMH/Boss/BJ/BaoJiItem.cs.meta | 11 +
.../PW_Effect_TextCrit_Other_PoHuaiQiu.prefab | 39 +-
.../PW_Effect_TextCrit_Self_PoHuaiQiu.prefab | 39 +-
.../Boss/BaoLieJinSha/BaoLieJinShaEvent.cs | 24 +-
.../Boss/BaoLieJinSha/BaoLieJinSha_BOSS.cs | 31 +
...PW_Bullet_Explosion_Trigger Variant.prefab | 242 +-
.../XJMH/Boss/PoHuaiQiu/PW_Enemy_5000.prefab | 20 +
.../XJMH/Boss/PoHuaiQiu/PoHuaiQiuEvent.cs | 11 +
.../XJMH/Boss/PoHuaiQiu/PoHuaiQiu_BOSS.cs | 49 +-
.../aa/Game/XJMH/Boss/XiaoChouPuKe/FanPai.cs | 6 +-
.../PW_Effect_AwardFrame_Poker Variant.prefab | 304 +
.../Boss/XiaoChouPuKe/XiaoChouPuKeEvent.cs | 36 +-
.../Boss/XiaoChouPuKe/XiaoChouPuKe_BOSS.cs | 11 +
.../XJMH/Boss/XingYunLun/GameObject.prefab | 82 +
.../Boss/XingYunLun/GameObject.prefab.meta | 7 +
.../XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab | 2805 +
.../Boss/XingYunLun/PW_Enemy_6000.prefab.meta | 7 +
.../XingYunLun/PW_Prop_FortuneWheel_UI.prefab | 162902 ++++++++++++++-
.../PW_Prop_FortuneWheel_UI.prefab.meta | 2 +-
.../XJMH/Boss/XingYunLun/XingYunLunEvent.cs | 359 +
.../Boss/XingYunLun/XingYunLunEvent.cs.meta | 11 +
.../XJMH/Boss/XingYunLun/XingYunLun_BOSS.cs | 166 +
.../Boss/XingYunLun/XingYunLun_BOSS.cs.meta | 11 +
30 files changed, 167372 insertions(+), 313 deletions(-)
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs.meta
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/GameObject.prefab
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/GameObject.prefab.meta
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab.meta
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/XingYunLunEvent.cs
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/XingYunLunEvent.cs.meta
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/XingYunLun_BOSS.cs
create mode 100644 Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/XingYunLun_BOSS.cs.meta
diff --git a/Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset b/Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset
index 09f21538d..1b9465269 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Fish_XJMH.asset
@@ -941,13 +941,6 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
- - m_GUID: 9a0f98ba992183c48b8412576ab5f9e8
- m_Address: Assets/Art/XJMH/pw/pw_prefab/game/enemy/XJMHEnemy/PW_Enemy_6000.prefab
- m_ReadOnly: 0
- m_SerializedLabels:
- - FishPrefab
- - XJMH
- FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 9d48c306e07335f4d835b869c4ccb879
m_Address: Assets/Art/XJMH/pw/pw_spine/pw_spine_plane/All/PW_Spine_Plane_FeiDie_SkeletonData.asset
m_ReadOnly: 0
@@ -1243,6 +1236,13 @@ MonoBehaviour:
- Audio
- XJMH
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: cfc44501b343e064c88d4038dca2586c
+ m_Address: Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - FishPrefab
+ - XJMH
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: cfc6f361b6acfa94ba6e10700b9f0727
m_Address: Assets/Art/XJMH/pw/pw_sound/PW_Light.ogg
m_ReadOnly: 0
diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Other.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Other.prefab
index 965dc79a0..1e3aaa2b6 100644
--- a/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Other.prefab
+++ b/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Other.prefab
@@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 224999922662637568}
- component: {fileID: 222953643279135439}
- - component: {fileID: 7815232492923291566}
+ - component: {fileID: 8312465376436287468}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
@@ -25,18 +25,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1501416257916067}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 2.2, y: 2.2, z: 2.2}
+ m_LocalScale: {x: 3.9330714, y: 3.9330714, z: 3.9330714}
m_ConstrainProportionsScale: 1
- m_Children:
- - {fileID: 224065527637351452}
- m_Father: {fileID: 224901974192804030}
+ m_Children: []
+ m_Father: {fileID: 224065527637351452}
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: 57.4, y: 0}
- m_SizeDelta: {x: 28, y: 31}
+ m_AnchoredPosition: {x: 119.93176, y: 48.2288}
+ m_SizeDelta: {x: 19.3174, y: 51.8925}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222953643279135439
CanvasRenderer:
@@ -46,7 +45,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1501416257916067}
m_CullTransparentMesh: 0
---- !u!114 &7815232492923291566
+--- !u!114 &8312465376436287468
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -55,7 +54,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1501416257916067}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -66,16 +65,76 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: cfa8d28a51d099d45b1cfef827d8b80c, type: 2}
- 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
+ m_text: 123
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: fdd40eef2e75f6d46b51c289c46fe60b, type: 2}
+ m_sharedMaterial: {fileID: 581533097809427942, guid: fdd40eef2e75f6d46b51c289c46fe60b,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 11400000, guid: f944a3bf48b7e9744b4793bbb8559a32, type: 2}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 25.52
+ m_fontSizeBase: 25.52
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 0
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1682339805330361
GameObject:
m_ObjectHideFlags: 0
@@ -106,7 +165,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224451233000051049}
- - {fileID: 224999922662637568}
+ - {fileID: 224065527637351452}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -239,14 +298,15 @@ RectTransform:
m_GameObject: {fileID: 1904193593117956}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.25425422, y: 0.25425422, z: 0.25425422}
+ m_LocalScale: {x: 0.5593593, y: 0.5593593, z: 0.5593593}
m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 224999922662637568}
+ m_Children:
+ - {fileID: 224999922662637568}
+ m_Father: {fileID: 224901974192804030}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: -52.86458, y: -1.8161027}
+ m_AnchoredPosition: {x: -78.102066, y: -3.995424}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &222481306762611797
diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Self.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Self.prefab
index 3c6ce783d..79bfaa1f0 100644
--- a/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Self.prefab
+++ b/Assets/Art/XJMH/pw/pw_prefab/game/text/PW_Effect_TextCrit_Self.prefab
@@ -30,7 +30,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 224309221144355617}
- - {fileID: 224382434432145038}
+ - {fileID: 224389394065035741}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -90,12 +90,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.57905614, y: 0.57905614, z: 0.57905614}
m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 224382434432145038}
+ m_Children:
+ - {fileID: 224382434432145038}
+ m_Father: {fileID: 224258749892936363}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: -123.5, y: -5}
+ m_AnchoredPosition: {x: -72.20001, y: -5}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &222384914006682869
@@ -221,7 +222,7 @@ GameObject:
m_Component:
- component: {fileID: 224382434432145038}
- component: {fileID: 222026831056781289}
- - component: {fileID: 3809888959080002144}
+ - component: {fileID: 3841189870950153526}
m_Layer: 0
m_Name: Text
m_TagString: Untagged
@@ -236,18 +237,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1960290508862505}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: 1.7269483, y: 1.7269483, z: 1.7269483}
m_ConstrainProportionsScale: 1
- m_Children:
- - {fileID: 224389394065035741}
- m_Father: {fileID: 224258749892936363}
+ m_Children: []
+ m_Father: {fileID: 224389394065035741}
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: 76.3, y: 0}
- m_SizeDelta: {x: 50, y: 69}
+ m_AnchoredPosition: {x: 120.10434, y: 34.72711}
+ m_SizeDelta: {x: 50, y: 99.2179}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222026831056781289
CanvasRenderer:
@@ -257,7 +257,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1960290508862505}
m_CullTransparentMesh: 0
---- !u!114 &3809888959080002144
+--- !u!114 &3841189870950153526
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -266,7 +266,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1960290508862505}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
@@ -277,13 +277,73 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 6e5395ace31b81b458839a3d0e1e0931, type: 2}
- 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
+ m_text: 123
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: fdd40eef2e75f6d46b51c289c46fe60b, type: 2}
+ m_sharedMaterial: {fileID: 581533097809427942, guid: fdd40eef2e75f6d46b51c289c46fe60b,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 11400000, guid: 065376eeb2cfbc44fbf3dba5def6c039, type: 2}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 44.3
+ m_fontSizeBase: 44.3
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 0
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
diff --git a/Assets/Art/XJMH/pw/pw_spine/pw_spine_plane/pw_model_fortunewheel/fortunewheel.controller b/Assets/Art/XJMH/pw/pw_spine/pw_spine_plane/pw_model_fortunewheel/fortunewheel.controller
index 7dadf3b9f..3b4e954eb 100644
--- a/Assets/Art/XJMH/pw/pw_spine/pw_spine_plane/pw_model_fortunewheel/fortunewheel.controller
+++ b/Assets/Art/XJMH/pw/pw_spine/pw_spine_plane/pw_model_fortunewheel/fortunewheel.controller
@@ -172,7 +172,7 @@ AnimatorStateMachine:
m_Position: {x: -10, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102286293216253126}
- m_Position: {x: 190, y: -50, z: 0}
+ m_Position: {x: 260, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102195719012435479}
m_Position: {x: 0, y: 100, z: 0}
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index ed1bc3a0b..837d6b2d6 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -798,6 +798,108 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &260232825
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 260232829}
+ - component: {fileID: 260232828}
+ - component: {fileID: 260232827}
+ - component: {fileID: 260232826}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!114 &260232826
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 260232825}
+ 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!114 &260232827
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 260232825}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &260232828
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 260232825}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &260232829
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 260232825}
+ 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:
+ - {fileID: 1527860045}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
--- !u!1 &277665105
GameObject:
m_ObjectHideFlags: 0
@@ -4722,6 +4824,12 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1426290880}
m_CullTransparentMesh: 1
+--- !u!224 &1527860045 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ m_PrefabInstance: {fileID: 8491442140717908888}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1590022760
GameObject:
m_ObjectHideFlags: 0
@@ -7352,6 +7460,159 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
+--- !u!1001 &8491442140717908888
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 260232829}
+ m_Modifications:
+ - target: {fileID: 4991520454471689300, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Name
+ value: PW_Effect_AwardFrame_Poker Variant
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -386.96
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5070691509604048587, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6075133176329241697, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6075133176329241697, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6075133176329241697, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6886409067916528900, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6886522433621275273, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6888175976417419793, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6888254893418864276, guid: 2ac4bf12db1303148941b52ba49326c9,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2ac4bf12db1303148941b52ba49326c9, type: 3}
--- !u!222 &8526378846936910034
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -7414,3 +7675,4 @@ SceneRoots:
- {fileID: 160957285}
- {fileID: 1184862095}
- {fileID: 1663842063}
+ - {fileID: 260232829}
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs
index 908402e00..9d57e1788 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs
@@ -437,7 +437,10 @@ public class BJEventBase : MonoBehaviour
while (_activeCoinRoutines > 0)
yield return null;
- maxScore = currScore;
+ // ⭐ 不覆盖 maxScore！保留 Init/子类设置的原始值。
+ // currScore 是 CoinArrivalRoutine 累加的结果，可能因 LayeredPool 分包舍入
+ // 或 long→int 截断而与 maxScore 不一致，用 currScore 覆盖会导致最终显示错误。
+ // 直接显示 maxScore（真实总分）。
if (tMP_Score != null)
tMP_Score.text = maxScore.ToString();
}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs
new file mode 100644
index 000000000..466910ca1
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs
@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+
+public class BaoJiItem : MonoBehaviour
+{
+ public TextMeshProUGUI tmp_BaoJiLabel;
+}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs.meta b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs.meta
new file mode 100644
index 000000000..049811040
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BaoJiItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: caab2bff6293c8f4f8d46576986ea7e9
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Other/PW_Effect_TextCrit_Other_PoHuaiQiu.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Other/PW_Effect_TextCrit_Other_PoHuaiQiu.prefab
index d0cdd5396..dc65337a4 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Other/PW_Effect_TextCrit_Other_PoHuaiQiu.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Other/PW_Effect_TextCrit_Other_PoHuaiQiu.prefab
@@ -10,7 +10,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1682339805330361, guid: 061f8776e2a4ae34bbe698064eed1e8d, type: 3}
propertyPath: m_Name
- value: PW_Effect_TextCrit_Other Variant
+ value: PW_Effect_TextCrit_Other_PoHuaiQiu
objectReference: {fileID: 0}
- target: {fileID: 224901974192804030, guid: 061f8776e2a4ae34bbe698064eed1e8d,
type: 3}
@@ -115,5 +115,40 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 1682339805330361, guid: 061f8776e2a4ae34bbe698064eed1e8d,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: -9021725507871693872}
m_SourcePrefab: {fileID: 100100000, guid: 061f8776e2a4ae34bbe698064eed1e8d, type: 3}
+--- !u!1 &1800583966427392384 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1682339805330361, guid: 061f8776e2a4ae34bbe698064eed1e8d,
+ type: 3}
+ m_PrefabInstance: {fileID: 1799486601178894905}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &-9021725507871693872
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1800583966427392384}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: caab2bff6293c8f4f8d46576986ea7e9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ tmp_BaoJiLabel: {fileID: 7755973372233655765}
+--- !u!114 &7755973372233655765 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8312465376436287468, guid: 061f8776e2a4ae34bbe698064eed1e8d,
+ type: 3}
+ m_PrefabInstance: {fileID: 1799486601178894905}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Self/PW_Effect_TextCrit_Self_PoHuaiQiu.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Self/PW_Effect_TextCrit_Self_PoHuaiQiu.prefab
index 7bafc3b75..b77c37f0d 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Self/PW_Effect_TextCrit_Self_PoHuaiQiu.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/Self/PW_Effect_TextCrit_Self_PoHuaiQiu.prefab
@@ -10,7 +10,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1047040685445614, guid: 659828b5bb9d61e44802098105deda89, type: 3}
propertyPath: m_Name
- value: PW_Effect_TextCrit_Self Variant
+ value: PW_Effect_TextCrit_Self_PoHuaiQiu
objectReference: {fileID: 0}
- target: {fileID: 224258749892936363, guid: 659828b5bb9d61e44802098105deda89,
type: 3}
@@ -115,5 +115,40 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 1047040685445614, guid: 659828b5bb9d61e44802098105deda89,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: -6165011395184217862}
m_SourcePrefab: {fileID: 100100000, guid: 659828b5bb9d61e44802098105deda89, type: 3}
+--- !u!114 &1157590256180454842 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 3841189870950153526, guid: 659828b5bb9d61e44802098105deda89,
+ type: 3}
+ m_PrefabInstance: {fileID: 2692646674644932748}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &2692461694294559074 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1047040685445614, guid: 659828b5bb9d61e44802098105deda89,
+ type: 3}
+ m_PrefabInstance: {fileID: 2692646674644932748}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &-6165011395184217862
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2692461694294559074}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: caab2bff6293c8f4f8d46576986ea7e9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ tmp_BaoJiLabel: {fileID: 1157590256180454842}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinShaEvent.cs b/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinShaEvent.cs
index 895de4a54..9e3cb42d6 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinShaEvent.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinShaEvent.cs
@@ -43,6 +43,14 @@ public class BaoLieJinShaEvent : BJEventBase
// 不在此处启动协程，等待 Boss 通知（TriggerExplosion）
}
+ /// 重置子类运行时状态（对象池复用安全，由 base.Init → ResetState 调用）
+ protected override void ResetState()
+ {
+ base.ResetState();
+ _hasExploded = false; // ⭐ 复用后必须重置，否则 TriggerExplosion 直接 return
+ _totalCoin = 0;
+ }
+
///
/// Boss 缩小完成后调用，触发爆炸。
/// 由 BaoLieJinSha_BOSS.MoveRotateShrink 协程末尾调用。
@@ -116,8 +124,8 @@ public class BaoLieJinShaEvent : BJEventBase
}
///
- /// 重写 OnScoreEnd：bjEndUI 直接用 _totalCoin（炸死鱼总金币）显示，
- /// 不使用 maxScore（在 AddScoreRoutine 里被 currScore 污染）。
+ /// 重写 OnScoreEnd：bjEndUI 直接用 _totalCoin（long 精确值）显示。
+ /// maxScore 是 int，可能截断 long 总金币，所以用 _totalCoin 传给 bjEndUI。
///
protected override void OnScoreEnd()
{
@@ -127,16 +135,7 @@ public class BaoLieJinShaEvent : BJEventBase
// 回加金币到玩家
JiaFen?.Invoke();
- // 强制用真实总金币，不信任累加的 currScore
- if (_totalCoin > 0)
- {
- maxScore = (int)Math.Min(_totalCoin, int.MaxValue);
- currScore = maxScore;
- if (tMP_Score != null)
- tMP_Score.text = _totalCoin.ToString();
- }
-
- // BJEndUI：直接用 _totalCoin 传给 Init（参数是 long）
+ // BJEndUI：直接用 _totalCoin（long）传给 Init
if (bjEndUI != null)
{
Vector3 uiPos;
@@ -157,7 +156,6 @@ public class BaoLieJinShaEvent : BJEventBase
}
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
- // ⭐ 直接传 _totalCoin（long），而不是被污染的 maxScore（int）
long displayScore = _totalCoin > 0 ? _totalCoin : maxScore;
endUI.Init(bJbeishu, displayScore, isSelf);
}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinSha_BOSS.cs b/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinSha_BOSS.cs
index 80168a66d..86678c42a 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinSha_BOSS.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinSha_BOSS.cs
@@ -66,9 +66,11 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
// 重置大小、旋转、动画状态、受击标志、移动状态（避免对象池复用残留）
_hasSwitchedToDamage = false;
_pendingEffectObj = null;
+ _killNotice = null;
transform.localScale = Vector3.one;
transform.rotation = Quaternion.identity;
transform.DOKill();
+ StopAllCoroutines(); // 防残留 MoveRotateShrink 等协程
PlayNormalAnim();
// 切回 move 状态（DieFish 里切到了 idle）
if (isInitialized)
@@ -93,6 +95,8 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
// 注意：不在此处调 Id_DieFish_NotFX，否则鱼会立即回池禁用，导致移动/旋转/缩小协程被中断。
// 鱼的回收放在 MoveRotateShrink 协程结束后，由 OnDisable → YanChiDie 流程处理。
+ _killNotice = obj;
+
// 切换到第三种状态：临死前动画
PlayDyingAnim();
Debug.Log("[BaoLieJinSha] 死亡，切换临死前动画");
@@ -114,6 +118,9 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
/// 待激活的爆奖预制体（缩小完成后激活）
private GameObject _pendingEffectObj;
+ /// 死亡击杀数据（用于初始化爆奖事件）
+ private RoomKillNotice _killNotice;
+
/// 鱼往 (0,0) 移动 + 旋转 + 缩小（三者同时进行），完成后激活爆奖并触发爆炸
private IEnumerator MoveRotateShrink()
{
@@ -152,6 +159,30 @@ public class BaoLieJinSha_BOSS : MonsterControl_BossBase
if (evt != null)
{
evt.explosionCenter = dieTargetPosition;
+
+ // ⭐ 初始化 BaoLieJinShaEvent：设置 posID/paoBei/fishScore/beishu/JiaFen 等
+ // 否则 paoBei=0 导致爆炸算分全为 0、JiaFen 为空导致不加分。
+ // Init 不启动协程，由下面的 TriggerExplosion 触发爆炸流程。
+ if (_killNotice != null)
+ {
+ foreach (var item in CreateFishManager.Instance.currGameType.list_Sits)
+ {
+ if (item.user == _killNotice.userId)
+ {
+ evt.Init(
+ _killNotice.gold, // goldCount（最终回加金币）
+ item.posID, // posID（击杀者座位）
+ _killNotice.skillsGold, // paobei（炮倍）
+ _killNotice.fishScore, // fishScore（底分）
+ _killNotice.beishu, // beishu（总倍数，最终 BJEndUI 显示）
+ JiaFen, // action（加分回调）
+ () => { evt.obj = _killNotice.param; } // 服务端爆奖参数
+ );
+ break;
+ }
+ }
+ }
+
evt.TriggerExplosion();
}
_pendingEffectObj = null;
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/PW_Bullet_Explosion_Trigger Variant.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/PW_Bullet_Explosion_Trigger Variant.prefab
index a02a1b615..a854fb0ff 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/PW_Bullet_Explosion_Trigger Variant.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/PW_Bullet_Explosion_Trigger Variant.prefab
@@ -8,165 +8,69 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 1182168779358667, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1216266873135193, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1221258801499569, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1271283814279097, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1301752586837398, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1420988340884470, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1435700687263072, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1507919220135046, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1521056416533664, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1531613835474051, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1549259736363844, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1549259736363844, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1582864439444948, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1628029452789050, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- target: {fileID: 1652794491312824, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_Name
value: PW_Bullet_Explosion_Trigger Variant
objectReference: {fileID: 0}
- - target: {fileID: 1652794491312824, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1675204435456896, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1734249349150972, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1737224332009143, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1776381959085698, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1798724044864110, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1853820017478953, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1874623465770046, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1892043707122294, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1954049963151781, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_Layer
- value: 6
- objectReference: {fileID: 0}
- target: {fileID: 4022203061300050, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4022203061300050, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4022203061300050, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4023181742527415, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4023181742527415, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4023181742527415, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4030922813636365, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4030922813636365, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4030922813636365, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4053028229419915, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4053028229419915, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4053028229419915, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4063119241234881, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4063119241234881, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4063119241234881, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4139184691341360, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalPosition.x
@@ -210,199 +114,183 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4271097587177157, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4271097587177157, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4271097587177157, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4317722045236045, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4317722045236045, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4317722045236045, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
- objectReference: {fileID: 0}
- - target: {fileID: 4325171310588040, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_LocalScale.x
- value: 0.32184
- objectReference: {fileID: 0}
- - target: {fileID: 4325171310588040, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.32184
- objectReference: {fileID: 0}
- - target: {fileID: 4325171310588040, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_LocalScale.z
- value: 0.32184
- objectReference: {fileID: 0}
- - target: {fileID: 4325171310588040, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- propertyPath: m_ConstrainProportionsScale
- value: 1
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4360569920400241, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4360569920400241, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4360569920400241, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4388204476590121, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4388204476590121, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4388204476590121, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4394932462802309, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4394932462802309, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4394932462802309, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4436241266755310, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4436241266755310, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4436241266755310, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4546651002458332, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4546651002458332, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4546651002458332, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4574214225196653, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4574214225196653, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4574214225196653, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4756404101627002, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4756404101627002, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4756404101627002, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4757037605762943, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4757037605762943, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4757037605762943, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4788107201203195, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4788107201203195, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4788107201203195, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4808666210308903, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 9.5232
+ value: 7.1895003
objectReference: {fileID: 0}
- target: {fileID: 4808666210308903, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 9.5232
+ value: 7.1895003
objectReference: {fileID: 0}
- target: {fileID: 4808666210308903, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 9.5232
+ value: 7.1895003
objectReference: {fileID: 0}
- target: {fileID: 4964309657509270, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4964309657509270, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4964309657509270, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4965280363178913, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4965280363178913, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4965280363178913, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4968025064057891, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.x
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4968025064057891, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.y
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 4968025064057891, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
propertyPath: m_LocalScale.z
- value: 3.1744
+ value: 2.3965
objectReference: {fileID: 0}
- target: {fileID: 199050257008327921, guid: 208c34b63f5ae9340b85ea500f045428,
type: 3}
@@ -505,15 +393,13 @@ PrefabInstance:
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
- m_RemovedGameObjects:
- - {fileID: 1221258801499569, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
- - {fileID: 1549259736363844, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
+ m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1652794491312824, guid: 208c34b63f5ae9340b85ea500f045428,
type: 3}
insertIndex: -1
- addedObject: {fileID: 7225840926491933304}
+ addedObject: {fileID: 6413570912710030528}
m_SourcePrefab: {fileID: 100100000, guid: 208c34b63f5ae9340b85ea500f045428, type: 3}
--- !u!1 &2817657484381883510 stripped
GameObject:
@@ -521,7 +407,7 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 2819125516760979150}
m_PrefabAsset: {fileID: 0}
---- !u!114 &7225840926491933304
+--- !u!114 &6413570912710030528
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -540,7 +426,7 @@ MonoBehaviour:
type: 3}
currScore: 0
maxScore: 0
- scoreCount: 0
+ scoreCount: 1
posID: 0
paoBei: 0
fishScore: 0
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PW_Enemy_5000.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PW_Enemy_5000.prefab
index a55f0702c..d083424c1 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PW_Enemy_5000.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PW_Enemy_5000.prefab
@@ -16,6 +16,26 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1759619893655136, guid: dc96b58c5624d4a4c81915c1a96c1d2e, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4013435878656712, guid: dc96b58c5624d4a4c81915c1a96c1d2e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -10
+ objectReference: {fileID: 0}
+ - target: {fileID: 4316826217363421, guid: dc96b58c5624d4a4c81915c1a96c1d2e, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4316826217363421, guid: dc96b58c5624d4a4c81915c1a96c1d2e, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4316826217363421, guid: dc96b58c5624d4a4c81915c1a96c1d2e, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4316826217363421, guid: dc96b58c5624d4a4c81915c1a96c1d2e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiuEvent.cs b/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiuEvent.cs
index b21500c98..915b69845 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiuEvent.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiuEvent.cs
@@ -17,6 +17,10 @@ public class PoHuaiQiuEvent : BJEventBase
[HideInInspector]
public Vector3 explosionCenter = Vector3.zero;
+ /// 红包个数（由 Boss 在 Init 前设置 = 攻击阶段飘字总数）
+ [HideInInspector]
+ public int baoJiItemCount = 30;
+
public override void Init(long goldCount, int posID, long paobei, long fishScore, int beishu,
Action action, Action action1 = null)
{
@@ -25,6 +29,13 @@ public class PoHuaiQiuEvent : BJEventBase
// 定位到 Boss 传入的中心位置
transform.position = explosionCenter;
+ // ⭐ 红包个数 = 攻击阶段飘字总数（addSourceSpawnRate × addSourceDuration）
+ // 由 Boss 在 TriggerEventInit 前设置 baoJiItemCount，默认 30
+ scoreCount = baoJiItemCount;
+ totalBJCount = baoJiItemCount;
+ // layeredPool 置空，BigPrize 会按新 scoreCount 重建
+ layeredPool = null;
+
// 直接显示最终分数（不滚动，Boss 控制时序）
if (tMP_Score != null)
tMP_Score.text = maxScore.ToString();
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiu_BOSS.cs b/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiu_BOSS.cs
index 329289a52..ae5c629ce 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiu_BOSS.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiu_BOSS.cs
@@ -238,9 +238,12 @@ public class PoHuaiQiu_BOSS : MonsterControl_BossBase
yield return new WaitForSeconds(attackDuration);
- // === Phase 5: 离开动画 ===
- SetMoveEffectVisible(false); // 离开时隐藏
+ // === Phase 5: 攻击结束，回到移动动画停留 2 秒，再播放离开动画 ===
SetEffectActive(_attackEffect, false);
+ PlayMoveAnim(); // 重新变成移动动画
+ Debug.Log("[PoHuaiQiu] Phase 5: 攻击结束，回到移动动画停留 2 秒");
+ yield return new WaitForSeconds(2f);
+ SetMoveEffectVisible(false); // 离开时隐藏
Debug.Log("[PoHuaiQiu] Phase 5: 播放离开动画");
PlayLeaveAnim();
}
@@ -260,6 +263,8 @@ public class PoHuaiQiu_BOSS : MonsterControl_BossBase
if (evt != null)
{
evt.explosionCenter = dieTargetPosition;
+ // ⭐ 红包个数 = 攻击阶段飘字总数
+ evt.baoJiItemCount = Mathf.RoundToInt(addSourceSpawnRate * addSourceDuration);
}
v.Init(
@@ -365,7 +370,7 @@ public class PoHuaiQiu_BOSS : MonsterControl_BossBase
///
/// 协程：攻击阶段持续在屏幕随机位置克隆加分飘字 UI。
/// 按 addSourceSpawnRate 密度（个/秒）持续创建 addSourceDuration 秒。
- /// 每个 UI 克隆体存活 addSourceLifetime 秒后自动销毁。
+ /// 每个飘字通过红包算法（BigPrize）获取金额，显示在 BaoJiItem.tmp_BaoJiLabel 上。
///
private IEnumerator SpawnAddSourceRoutine()
{
@@ -401,6 +406,15 @@ public class PoHuaiQiu_BOSS : MonsterControl_BossBase
}
RectTransform canvasRect = canvas.GetComponent();
+ // 获取 Event 引用（用于调用 BigPrize 红包算法）
+ BJEventBase evt = null;
+ if (_pendingEffectObj != null)
+ evt = _pendingEffectObj.GetComponent();
+
+ // 红包记录队列：用完一批再调 BigPrize 补充
+ var redPacketQueue = new System.Collections.Generic.List();
+ int rpIndex = 0;
+
// 间隔时间 = 1 / 密度
float interval = 1f / Mathf.Max(1, addSourceSpawnRate);
int totalSpawn = Mathf.RoundToInt(addSourceSpawnRate * addSourceDuration);
@@ -419,6 +433,35 @@ public class PoHuaiQiu_BOSS : MonsterControl_BossBase
rt.anchoredPosition = randomPos;
}
+ // ⭐ 用红包算法获取金额，显示在 BaoJiItem.tmp_BaoJiLabel 上
+ long amount = 0;
+ if (evt != null)
+ {
+ // 队列用完 → 调用 BigPrize 补充一批
+ if (rpIndex >= redPacketQueue.Count)
+ {
+ redPacketQueue = evt.BigPrize(5, 10);
+ rpIndex = 0;
+ if (redPacketQueue == null || redPacketQueue.Count == 0)
+ {
+ // BigPrize 返回空（maxScore=0 或已分完），跳过金额显示
+ redPacketQueue = new System.Collections.Generic.List();
+ }
+ }
+ if (rpIndex < redPacketQueue.Count)
+ {
+ amount = redPacketQueue[rpIndex].Amount;
+ rpIndex++;
+ }
+ }
+
+ // 设置 BaoJiItem 文本（直接数字，TMP spriteAsset 已配好数字→图片映射）
+ var baoJiItem = inst.GetComponent();
+ if (baoJiItem != null && baoJiItem.tmp_BaoJiLabel != null)
+ {
+ baoJiItem.tmp_BaoJiLabel.text = amount.ToString();
+ }
+
// 缩放动画：放大 → 停留 0.5s → 缩小 → 销毁
rt.localScale = Vector3.zero;
rt.DOScale(Vector3.one, 0.2f)
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/FanPai.cs b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/FanPai.cs
index a974c7f53..9336fdbf3 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/FanPai.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/FanPai.cs
@@ -12,7 +12,8 @@ public class FanPai : MonoBehaviour
public CardItem cardItem2;
public CardItem cardItem3;
- [Header("依次翻牌间隔")]
+ [Header("翻牌节奏")]
+ public float firstDelay = 2f; // 第一张牌开始翻前等待的秒数
public float interval = 0.2f; // 上一张翻完后到下一张开始的间隔
private Coroutine _flipCo;
@@ -40,6 +41,9 @@ public class FanPai : MonoBehaviour
(int numIndex, int huaIndex, string beiShu, bool isGold) c3,
System.Action onAllComplete)
{
+ // 第一张牌开始翻前先等待 firstDelay 秒
+ if (firstDelay > 0) yield return new WaitForSeconds(firstDelay);
+
yield return FlipOne(cardItem1, c1);
if (interval > 0) yield return new WaitForSeconds(interval);
yield return FlipOne(cardItem2, c2);
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab
index 1c9c385f8..758f39855 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/PW_Effect_AwardFrame_Poker Variant.prefab
@@ -18107,6 +18107,91 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4821515310472779462
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6075133176329241697}
+ - component: {fileID: 3719606019325931812}
+ - component: {fileID: 3682268619713341762}
+ m_Layer: 0
+ m_Name: UIParticle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6075133176329241697
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4821515310472779462}
+ 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:
+ - {fileID: 6720345605737273136}
+ m_Father: {fileID: 5070691509604048587}
+ 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: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3719606019325931812
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4821515310472779462}
+ m_CullTransparentMesh: 1
+--- !u!114 &3682268619713341762
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4821515310472779462}
+ 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: 6912351274865228356}
+ - {fileID: 6886572722388740646}
+ - {fileID: 6886948030525880681}
+ - {fileID: 6886093674349169875}
+ 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!1 &5092403980887477994
GameObject:
m_ObjectHideFlags: 0
@@ -23631,6 +23716,21 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
+ - target: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.5
+ objectReference: {fileID: 0}
- target: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
type: 3}
propertyPath: m_LocalPosition.x
@@ -23691,6 +23791,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0
objectReference: {fileID: 0}
+ - target: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
+ type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 1039449459520011, guid: f0d445180880e4e419ac5047f2149d2c, type: 3}
@@ -23698,6 +23803,10 @@ PrefabInstance:
- {fileID: 1864012198928973, guid: f0d445180880e4e419ac5047f2149d2c, type: 3}
- {fileID: 1292779187103412, guid: f0d445180880e4e419ac5047f2149d2c, type: 3}
m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
+ type: 3}
+ insertIndex: 0
+ addedObject: {fileID: 6075133176329241697}
- targetCorrespondingSourceObject: {fileID: 224922953677348615, guid: f0d445180880e4e419ac5047f2149d2c,
type: 3}
insertIndex: -1
@@ -23849,3 +23958,198 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &6724461256813041265
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 6075133176329241697}
+ m_Modifications:
+ - target: {fileID: 1799337895869925, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_Name
+ value: PW_Effect_Explosion_Coin_2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4306241639404057, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4306241639404057, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4306241639404057, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4306241639404057, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4307958913872705, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4307958913872705, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4307958913872705, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4307958913872705, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4691396973550069, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4691396973550069, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4691396973550069, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4691396973550069, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4776098437480519, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4776098437480519, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4776098437480519, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 4776098437480519, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 199114327780121461, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199114327780121461, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199216424772101368, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199216424772101368, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199744345753695328, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199744345753695328, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199823829560985829, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199823829560985829, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 07932dac3a4d3e14585d734014e778e6, type: 3}
+--- !u!4 &6720345605737273136 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4894314209739073, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ m_PrefabInstance: {fileID: 6724461256813041265}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &6886093674349169875 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 198796464675248802, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ m_PrefabInstance: {fileID: 6724461256813041265}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &6886572722388740646 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 198176547622354007, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ m_PrefabInstance: {fileID: 6724461256813041265}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &6886948030525880681 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 198527116816805656, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ m_PrefabInstance: {fileID: 6724461256813041265}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &6912351274865228356 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 198034408756259893, guid: 07932dac3a4d3e14585d734014e778e6,
+ type: 3}
+ m_PrefabInstance: {fileID: 6724461256813041265}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/XiaoChouPuKeEvent.cs b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/XiaoChouPuKeEvent.cs
index 6b6b5885e..d1d5f80fe 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/XiaoChouPuKeEvent.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XiaoChouPuKe/XiaoChouPuKeEvent.cs
@@ -40,6 +40,14 @@ public class XiaoChouPuKeEvent : BJEventBase
public TextMeshProUGUI BeiShu; //爆奖倍数 n倍
public TextMeshProUGUI BJType; //爆奖类型 豹子...
+
+ /// 爆炸中心（世界坐标，由 Boss 传入=飞船死亡位置）
+ [HideInInspector]
+ public Vector3 explosionCenter = Vector3.zero;
+
+ /// UI 画布（用于世界坐标→UI 坐标转换，懒加载）
+ private Canvas _uiCanvas;
+
// ----------------- 奖项类型常量 -----------------
private const int AWARD_BAOZI = 1; // 豹子
private const int AWARD_TONGHUASHUN = 2; // 同花顺
@@ -63,11 +71,35 @@ public class XiaoChouPuKeEvent : BJEventBase
Action action, Action action1 = null)
{
base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1);
+
+ // ⭐ 世界坐标 → UI 坐标（小丑扑克爆奖是 UI，挂在 subPanelParent.parent 下）
+ // 复用 CoordinateTransformation.WorldPos_ToCanvas，Canvas 走 UIManager.uiRoot（与 CreateFishManager.GetUiCanvas 同源）
+ if (_uiCanvas == null && UIManager.Instance != null && UIManager.Instance.uiRoot != null)
+ _uiCanvas = UIManager.Instance.uiRoot.GetComponent