diff --git a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes index 08fa6552e..b02567984 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes index c01bb3030..d1f13360a 100644 Binary files a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 1ed010a5d..610173d71 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index d60a07b81..28f48e6b2 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -2324,7 +2324,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2868547218605158834 RectTransform: m_ObjectHideFlags: 0 @@ -12689,7 +12689,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8367488913663849825 RectTransform: m_ObjectHideFlags: 0 @@ -12873,7 +12873,6 @@ RectTransform: m_Children: - {fileID: 3489063842309262745} - {fileID: 4664354651433881416} - - {fileID: 510271606863796830} m_Father: {fileID: 5339333885219356068} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14474,10 +14473,6 @@ MonoBehaviour: hashName: 4025019357 objectType: 0 gameObject: {fileID: 7633637597024204544} - - name: battle_ui.battle_root.boss_enter_node.boss_spine_obj - hashName: 3755517652 - objectType: 6 - gameObject: {fileID: 3767016927279783096} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14536,7 +14531,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2886343875096011968 RectTransform: m_ObjectHideFlags: 0 @@ -14969,7 +14964,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8052032989142352168 RectTransform: m_ObjectHideFlags: 0 @@ -17389,147 +17384,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 3452747b5628f41ec93c3c599ee87149, type: 3} m_PrefabInstance: {fileID: 3263632709327919479} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3450820013168095680 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 214456677755514855} - m_Modifications: - - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Name - value: boss_spine_obj - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: referenceSize.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: referenceSize.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: skeletonDataAsset - value: - objectReference: {fileID: 11400000, guid: dd580a3f81b12fa4a8deaed8ce6419ca, type: 2} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.z - value: -4.486114e-11 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchoredPosition.x - value: 153.81494 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchoredPosition.y - value: 342.31274 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &510271606863796830 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 3450820013168095680} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3767016927279783096 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 3450820013168095680} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1075725768342633610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3767016927279783096} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonGraphic: {fileID: 4204506030038985324} - initializeOnAwake: 1 - boneName: boss - followBoneRotation: 1 - followSkeletonFlip: 1 - followLocalScale: 0 - followParentWorldScale: 0 - followXYPosition: 1 - followZPosition: 1 - maintainedAxisOrientation: 1 --- !u!1001 &3501028591294518496 PrefabInstance: m_ObjectHideFlags: 0