diff --git a/Assets/Art/FengLei/Boss/7001/7001_Timeline.playable b/Assets/Art/FengLei/Boss/7001/7001_Timeline.playable
index 1b0fb06d9..bfc76f19a 100644
--- a/Assets/Art/FengLei/Boss/7001/7001_Timeline.playable
+++ b/Assets/Art/FengLei/Boss/7001/7001_Timeline.playable
@@ -592,6 +592,22 @@ MonoBehaviour:
m_bufferingTime: 0.1
m_ClipProperties:
volume: 1
+--- !u!114 &-5099967381092836654
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+ m_Name: Signal Emitter
+ m_EditorClassIdentifier:
+ m_Time: 31.516666666666666
+ m_Retroactive: 0
+ m_EmitOnce: 0
+ m_Asset: {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}
--- !u!114 &-5096751686031469613
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1435,6 +1451,8 @@ MonoBehaviour:
m_Markers:
m_Objects:
- {fileID: 2955643342932070903}
+ - {fileID: -5099967381092836654}
+ - {fileID: 1524682099729309856}
--- !u!114 &-888554609757106462
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1724,6 +1742,22 @@ MonoBehaviour:
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &1524682099729309856
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+ m_Name: Signal Emitter
+ m_EditorClassIdentifier:
+ m_Time: 27.666666666666668
+ m_Retroactive: 0
+ m_EmitOnce: 0
+ m_Asset: {fileID: 11400000, guid: 27ead056a3555a449b1c33be851ca0c5, type: 2}
--- !u!114 &2318158033118291172
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1841,7 +1875,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
- m_Time: 11.950517734264334
+ m_Time: 15.015532879818593
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index a17124391..39543a147 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -3690,7 +3690,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!114 &1096182886
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6707,7 +6707,7 @@ PrefabInstance:
- target: {fileID: 3531218012915984842, guid: ad0160ec062450746ac31aa7aec0e507,
type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8822545478285579720, guid: ad0160ec062450746ac31aa7aec0e507,
type: 3}
@@ -6832,6 +6832,79 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1001 &2518911503280687070
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 6379684486006968571, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_Name
+ value: PW_Prop_IronFist
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6385227750942468653, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6411523127270236248, guid: 9b8be0fc8702c6546bdb3fce2d1f479f,
+ type: 3}
+ propertyPath: m_Mesh
+ value:
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9b8be0fc8702c6546bdb3fce2d1f479f, type: 3}
--- !u!224 &2557606984666069063
RectTransform:
m_ObjectHideFlags: 0
@@ -7844,3 +7917,4 @@ SceneRoots:
- {fileID: 260232829}
- {fileID: 841547336076769388}
- {fileID: 1328183416056466136}
+ - {fileID: 2518911503280687070}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Settle_FuJiaTianXia_XingJiXunHang.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Settle_FuJiaTianXia_XingJiXunHang.prefab
new file mode 100644
index 000000000..6f6e2479b
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Settle_FuJiaTianXia_XingJiXunHang.prefab
@@ -0,0 +1,488 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &562352123266538986
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2770091150133115935}
+ - component: {fileID: 2270990058925289786}
+ - component: {fileID: 777753061411402955}
+ m_Layer: 0
+ m_Name: Node (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &2770091150133115935
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562352123266538986}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 4147595403994363637}
+ 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: -16.2}
+ m_SizeDelta: {x: 200, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2270990058925289786
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562352123266538986}
+ m_CullTransparentMesh: 1
+--- !u!114 &777753061411402955
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 562352123266538986}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 225
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
+ m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
+ 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: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 48
+ m_fontSizeBase: 48
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ 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!1001 &4220572954963626354
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1100655176334518, guid: b37de85902248b24e950708aeaf5f189, type: 3}
+ propertyPath: m_Name
+ value: PW_Effect_Settle_FuJiaTianXia_XingJiXunHang
+ objectReference: {fileID: 0}
+ - target: {fileID: 1861618631960548, guid: b37de85902248b24e950708aeaf5f189, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199056237864797958, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199076552584034004, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199101480381425731, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199169805480740504, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199240467719467551, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199292213422937176, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199386426294032702, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199393989888085158, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199467490268263160, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199533322371724000, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199599453769387433, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199628429400343197, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199641050318656310, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199680138877831817, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199695317004565866, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199734684400449193, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199795804163001910, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199798510847901965, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199799957453843207, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199830983297525259, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199849725886090453, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199888932533671757, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199965688493018462, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199983948509394196, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224132790131276409, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224132790131276409, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224132790131276409, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 224132790131276409, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 224132790131276409, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224132790131276409, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224496269006584623, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3533087717370052923, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: 162e0fe20c554bb45b8300427b3cea13,
+ type: 3}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 224411105820819335, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2770091150133115935}
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 1100655176334518, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: -382508373279050920}
+ m_SourcePrefab: {fileID: 100100000, guid: b37de85902248b24e950708aeaf5f189, type: 3}
+--- !u!224 &4147595403994363637 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 224411105820819335, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ m_PrefabInstance: {fileID: 4220572954963626354}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &4220318943093749188 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1100655176334518, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ m_PrefabInstance: {fileID: 4220572954963626354}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &-382508373279050920
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4220318943093749188}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f0df2f946ba608449970c84418dade5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ tMP_beishu: {fileID: 777753061411402955}
+ tMP_score: {fileID: 4701385555962165873}
+ goldSprite: {fileID: 11400000, guid: b5a3b539bfcb41e46ad594b9b14d7732, type: 2}
+ SilverSprite: {fileID: 11400000, guid: e034cf5e78470b44f8a1c4d42d5039d6, type: 2}
+ img_BaoJiangZhong: {fileID: 0}
+ useScoreAnim: 0
+ autoDestroyDelay: 5
+ animTrigger_Appear: Appear
+ animTrigger_Loop: Loop
+ animTrigger_Close: Close
+--- !u!114 &4701385555962165873 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 8911728646117176067, guid: b37de85902248b24e950708aeaf5f189,
+ type: 3}
+ m_PrefabInstance: {fileID: 4220572954963626354}
+ 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/BJEnd/PW_Effect_Settle_FuJiaTianXia_XingJiXunHang.prefab.meta b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Settle_FuJiaTianXia_XingJiXunHang.prefab.meta
new file mode 100644
index 000000000..ab8f71320
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJEnd/PW_Effect_Settle_FuJiaTianXia_XingJiXunHang.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 75a52b8c1537cad49b3d521483fe134e
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJScore/PW_Effect_AwardFrame_IronFist_XingJiXunHang.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJScore/PW_Effect_AwardFrame_IronFist_XingJiXunHang.prefab
new file mode 100644
index 000000000..552fc9589
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJScore/PW_Effect_AwardFrame_IronFist_XingJiXunHang.prefab
@@ -0,0 +1,119 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &3556085941636598178
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1113427671107482, guid: 7eb7935416291104eb53b6839082dd66, type: 3}
+ propertyPath: m_Name
+ value: PW_Effect_AwardFrame_IronFist Variant
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 224241932902952481, guid: 7eb7935416291104eb53b6839082dd66,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 7eb7935416291104eb53b6839082dd66, type: 3}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJScore/PW_Effect_AwardFrame_IronFist_XingJiXunHang.prefab.meta b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJScore/PW_Effect_AwardFrame_IronFist_XingJiXunHang.prefab.meta
new file mode 100644
index 000000000..11b8e7953
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/BJ/BJScore/PW_Effect_AwardFrame_IronFist_XingJiXunHang.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e5be8e475a669fe4d8ecb020fc09bf28
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/ChaoNengMoHe/ChaoNengMoHeEvent.cs b/Assets/MyGame/aa/Game/XJMH/Boss/ChaoNengMoHe/ChaoNengMoHeEvent.cs
index 6eaa90c45..f44849e83 100644
--- a/Assets/MyGame/aa/Game/XJMH/Boss/ChaoNengMoHe/ChaoNengMoHeEvent.cs
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/ChaoNengMoHe/ChaoNengMoHeEvent.cs
@@ -87,9 +87,31 @@ public class ChaoNengMoHeEvent : BJEventBase
Debug.Log($"[ChaoNengMoHe] 解析到 {_cardParams.Count} 个选项: [{string.Join(", ", _cardParams.Select(p => p.Score))}]");
}
+ /// Timeline 结束触发:无爆奖,直接播放 bjEndUI 并退出
public void TimeLineEnd()
{
- ManualFinishBJ();
+ if (isScoreEnd) return;
+ isScoreEnd = true;
+
+ // 回加金币到玩家(击杀奖励)
+ JiaFen?.Invoke();
+
+ // 计算最终分数:_totalBeishu × fishScore(同 EndBeiShu 逻辑)
+ int finalScore = _totalBeishu * (int)fishScore;
+
+ // 显示结束 UI:定位在座位上方,显示最终分数
+ if (bjEndUI != null)
+ {
+ float y = bjEndUIOffsetY;
+ if (posID == 2 || posID == 3) y *= -1f;
+ Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
+
+ var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
+ endUI.Init(bJbeishu, maxScore, isSelf);
+ }
+
+ // 退出(回池/销毁)
+ die();
}
/// 移动动画时长(秒)
public float moveDuration = 2f;
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Prop_IronFist Variant.prefab b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Prop_IronFist Variant.prefab
new file mode 100644
index 000000000..d10af1703
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Prop_IronFist Variant.prefab
@@ -0,0 +1,59 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &6380981896766343102
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1403006993094469, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_Name
+ value: PW_Prop_IronFist Variant
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4837804086439315, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 8a3eb92f5b88a6645b2e7c4719e73521, type: 3}
diff --git a/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Prop_IronFist Variant.prefab.meta b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Prop_IronFist Variant.prefab.meta
new file mode 100644
index 000000000..daf61e6a1
--- /dev/null
+++ b/Assets/MyGame/aa/Game/XJMH/Boss/XingJiXunHang/PW_Prop_IronFist Variant.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9b8be0fc8702c6546bdb3fce2d1f479f
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: