diff --git a/Assets/lua/app/bf/unity/character_spine_object.lua.bytes b/Assets/lua/app/bf/unity/character_spine_object.lua.bytes index f48d075f8..ad48f5906 100644 Binary files a/Assets/lua/app/bf/unity/character_spine_object.lua.bytes and b/Assets/lua/app/bf/unity/character_spine_object.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index e216ecda8..7e2dcc701 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 47f68e4a5..9aaf03e59 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index ca17dae71..79a400c24 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes index 64e51f26a..b101c1f1d 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes differ diff --git a/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes b/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes index d9c4e29c3..dcf6737ae 100644 Binary files a/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes and b/Assets/lua/app/module/battle/helper/battle_helper.lua.bytes differ diff --git a/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes b/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes new file mode 100644 index 000000000..3656da5ef Binary files /dev/null and b/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes differ diff --git a/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes.meta b/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes.meta new file mode 100644 index 000000000..a77b1ad5c --- /dev/null +++ b/Assets/lua/app/module/battle/helper/battle_pool.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 11e6605d14a221a4782f61c93a03010e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 94db48d0d..1cf3f5051 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/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes index 39c2d4b7c..b203be856 100644 Binary files a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes and b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index ff338bbe3..f64d8eb7f 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -771,7 +771,7 @@ RectTransform: - {fileID: 4106454344608963245} - {fileID: 1603915954017502330} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1181,7 +1181,7 @@ RectTransform: - {fileID: 7945390112548214915} - {fileID: 5938755434983395188} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5109,6 +5109,41 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: 0, y: 0, z: 0, w: 0} m_Softness: {x: 0, y: 0} +--- !u!1 &5506336141550111868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8767600639872220622} + m_Layer: 5 + m_Name: batttle_fx_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8767600639872220622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5506336141550111868} + 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_Children: [] + m_Father: {fileID: 4165930251451731960} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 950} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5608342323733900253 GameObject: m_ObjectHideFlags: 0 @@ -8066,7 +8101,7 @@ RectTransform: - {fileID: 4292633816534545540} - {fileID: 6497301874867098174} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -8749,6 +8784,7 @@ RectTransform: - {fileID: 5198724544769838051} - {fileID: 766509631108997893} - {fileID: 5146938743224756479} + - {fileID: 8767600639872220622} - {fileID: 8367488913663849825} - {fileID: 1493758059695593667} - {fileID: 2868547218605158834} @@ -9052,6 +9088,10 @@ MonoBehaviour: hashName: 4215141983 objectType: 1 gameObject: {fileID: 5822956687597775327} + - name: battle_ui.batttle_fx_node + hashName: 659684139 + objectType: 0 + gameObject: {fileID: 5506336141550111868} --- !u!114 &305814484176852896 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9291,7 +9331,7 @@ RectTransform: - {fileID: 3542903639894422700} - {fileID: 2367957692945644157} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9741,16 +9781,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &8240790560213506744 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5688246229370211124} - m_PrefabAsset: {fileID: 0} --- !u!224 &1029817523774987629 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5688246229370211124} m_PrefabAsset: {fileID: 0} +--- !u!1 &8240790560213506744 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5688246229370211124} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6281625263577488710 PrefabInstance: m_ObjectHideFlags: 0 @@ -10043,13 +10083,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &2706240165845954244 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 7292576075314493597} - m_PrefabAsset: {fileID: 0} --- !u!1 &6456457455187257617 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 7292576075314493597} m_PrefabAsset: {fileID: 0} +--- !u!224 &2706240165845954244 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 7292576075314493597} + m_PrefabAsset: {fileID: 0}