Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev

# Conflicts: # Assets/arts/atlas/ui/battle.asset # Assets/arts/textures/ui/battle/battle_progress_bg_1.png.meta # Assets/prefabs/ui/battle/battle_ui.prefab
2023-04-14 22:19:56 +08:00 · 2023-04-14 22:19:56 +08:00 · 152c5177ea
commit 152c5177ea
parent adc551021d 0dc1481919
9 changed files with 0 additions and 0 deletions
--- a/Assets/lua/app/module/battle/battle_const.lua.bytes
+++ b/Assets/lua/app/module/battle/battle_const.lua.bytes
--- a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
+++ b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
--- a/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes
+++ b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_buff_handle.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_buff_handle.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_buff_special.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_buff_special.lua.bytes
--- a/Assets/lua/app/ui/battle/battle_ui.lua.bytes
+++ b/Assets/lua/app/ui/battle/battle_ui.lua.bytes
--- a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes
--- a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes