diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index 16151ecf1..dd3b583a3 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_manager.lua.bytes b/Assets/lua/app/common/sdk_manager.lua.bytes index 398bf376f..b853c2640 100644 Binary files a/Assets/lua/app/common/sdk_manager.lua.bytes and b/Assets/lua/app/common/sdk_manager.lua.bytes differ diff --git a/Assets/lua/app/config/attr.lua.bytes b/Assets/lua/app/config/attr.lua.bytes index ee37942ca..844aa44c6 100644 Binary files a/Assets/lua/app/config/attr.lua.bytes and b/Assets/lua/app/config/attr.lua.bytes differ diff --git a/Assets/lua/app/config/buff.lua.bytes b/Assets/lua/app/config/buff.lua.bytes index 7840c141d..2cc6d9f40 100644 Binary files a/Assets/lua/app/config/buff.lua.bytes and b/Assets/lua/app/config/buff.lua.bytes differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 46d96e515..0a4e5c955 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/skill.lua.bytes b/Assets/lua/app/config/skill.lua.bytes index 26f4abbac..e2ecbfe0f 100644 Binary files a/Assets/lua/app/config/skill.lua.bytes and b/Assets/lua/app/config/skill.lua.bytes differ diff --git a/Assets/lua/app/config/skill_rogue.lua.bytes b/Assets/lua/app/config/skill_rogue.lua.bytes index 58a1e208a..0ef5e25aa 100644 Binary files a/Assets/lua/app/config/skill_rogue.lua.bytes and b/Assets/lua/app/config/skill_rogue.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 1442adb6c..435a20cfb 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/config/struct.lua.bytes b/Assets/lua/app/config/struct.lua.bytes index 4dfedacdc..d8c685728 100644 Binary files a/Assets/lua/app/config/struct.lua.bytes and b/Assets/lua/app/config/struct.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index c3c0a4dfe..55a04bb6e 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/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index fccd51e37..e979c1edb 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.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 b9c02725c..8ca0d660d 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/battle_manager.lua.bytes b/Assets/lua/app/module/battle/battle_manager.lua.bytes index a55a1d8b7..08edb585e 100644 Binary files a/Assets/lua/app/module/battle/battle_manager.lua.bytes and b/Assets/lua/app/module/battle/battle_manager.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 2a6917de7..774b17ba3 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 7dddef403..3b7cf15dc 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/controller/battle_controller_stage.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes index 819bb7a0d..b1a791650 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes differ diff --git a/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes b/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes index b1df7a0a0..ea4ea018b 100644 Binary files a/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes and b/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes differ diff --git a/Assets/lua/app/module/hero/hero_manager.lua.bytes b/Assets/lua/app/module/hero/hero_manager.lua.bytes index 43f72ddcc..7bc2d7082 100644 Binary files a/Assets/lua/app/module/hero/hero_manager.lua.bytes and b/Assets/lua/app/module/hero/hero_manager.lua.bytes differ diff --git a/Assets/lua/app/module/tips/tips_manager.lua.bytes b/Assets/lua/app/module/tips/tips_manager.lua.bytes index 1df4595ba..e24b4202a 100644 Binary files a/Assets/lua/app/module/tips/tips_manager.lua.bytes and b/Assets/lua/app/module/tips/tips_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes new file mode 100644 index 000000000..1b79c0438 Binary files /dev/null and b/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes.meta b/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes.meta new file mode 100644 index 000000000..1f8a022a1 --- /dev/null +++ b/Assets/lua/app/ui/battle/battle_pause_ui.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eb40db4e95d838b4fb12ce44df3ca1a0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes new file mode 100644 index 000000000..6b995b812 Binary files /dev/null and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes.meta b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes.meta new file mode 100644 index 000000000..b5cb065c1 --- /dev/null +++ b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 29b50684f4b858a4db7180f00a04d8c2 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes index e81063810..ec3b73c45 100644 Binary files a/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_skill_select_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 ec3f2dd0f..35a04aa17 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/ui/battle/cell/battle_select_skill_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/battle_select_skill_cell.lua.bytes index 8ea9f33ed..2d2162ba4 100644 Binary files a/Assets/lua/app/ui/battle/cell/battle_select_skill_cell.lua.bytes and b/Assets/lua/app/ui/battle/cell/battle_select_skill_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/select_skill_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/select_skill_cell.lua.bytes new file mode 100644 index 000000000..d7c400152 Binary files /dev/null and b/Assets/lua/app/ui/battle/cell/select_skill_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/select_skill_cell.lua.bytes.meta b/Assets/lua/app/ui/battle/cell/select_skill_cell.lua.bytes.meta new file mode 100644 index 000000000..cccadd127 --- /dev/null +++ b/Assets/lua/app/ui/battle/cell/select_skill_cell.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e3b450beb26fbd408183182f41226fe +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes new file mode 100644 index 000000000..4b7be6337 Binary files /dev/null and b/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes.meta b/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes.meta new file mode 100644 index 000000000..f2d8e87b9 --- /dev/null +++ b/Assets/lua/app/ui/battle/cell/unit_result_report_cell.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c8c93b95fe9486146a4b19540f9d51b4 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 457780a61..5106c2ba9 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes b/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes index 38a3c03e7..b2d780956 100644 Binary files a/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes and b/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_comp.lua.bytes index aa94dc829..d8fa63baf 100644 Binary files a/Assets/lua/app/ui/hero/hero_comp.lua.bytes and b/Assets/lua/app/ui/hero/hero_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index c33c983ac..9a61790cb 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index be80ebecd..153c3705c 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 1a67cebc4..fb8f52de5 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/tips/desc_tips.lua.bytes b/Assets/lua/app/ui/tips/desc_tips.lua.bytes new file mode 100644 index 000000000..18d23ab69 Binary files /dev/null and b/Assets/lua/app/ui/tips/desc_tips.lua.bytes differ diff --git a/Assets/lua/app/ui/tips/desc_tips.lua.bytes.meta b/Assets/lua/app/ui/tips/desc_tips.lua.bytes.meta new file mode 100644 index 000000000..268915566 --- /dev/null +++ b/Assets/lua/app/ui/tips/desc_tips.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 36bdfcf56fdb36a4aada6c117661af1d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/tips/reward_box.lua.bytes b/Assets/lua/app/ui/tips/reward_box.lua.bytes index 9094f025f..36a2bd726 100644 Binary files a/Assets/lua/app/ui/tips/reward_box.lua.bytes and b/Assets/lua/app/ui/tips/reward_box.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_data.lua.bytes index 463be9f8e..ac8b39135 100644 Binary files a/Assets/lua/app/userdata/battle/battle_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes index 292f9875e..2411a332c 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes index 3b081f70a..2a0cdb40e 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 8b8ba3928..27b78c7a7 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index 4a50d6a73..29e2a427f 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 834c8c08b..cf5333b77 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -109,7 +109,7 @@ RectTransform: 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: 856.5} + m_AnchoredPosition: {x: 0, y: 900} m_SizeDelta: {x: 1280, y: 1800} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2297117606088499637 @@ -257,11 +257,11 @@ RectTransform: m_Father: {fileID: 8367488913663849825} m_RootOrder: 5 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: -6} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 83} m_SizeDelta: {x: 702, y: 702} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &9169016088919175857 MonoBehaviour: m_ObjectHideFlags: 0 @@ -640,11 +640,11 @@ RectTransform: m_Father: {fileID: 8367488913663849825} m_RootOrder: 6 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: -6} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 83} m_SizeDelta: {x: 702, y: 702} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0} --- !u!1 &3525614029680116551 GameObject: m_ObjectHideFlags: 0 @@ -1321,9 +1321,9 @@ RectTransform: 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: 387} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1280, y: 774} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &4090866635735359956 CanvasRenderer: m_ObjectHideFlags: 0