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

2023-04-18 19:52:57 +08:00 · 2023-04-18 19:52:57 +08:00 · 5fad7fe709
commit 5fad7fe709
parent 77bdd90527 5c54e7077f
9 changed files with 7 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/helper/battle_buff_special.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_buff_special.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_passive.lua.bytes
+++ b/Assets/lua/app/module/battle/helper/battle_passive.lua.bytes
--- a/Assets/lua/app/module/battle/helper/battle_passive.lua.bytes.meta
+++ b/Assets/lua/app/module/battle/helper/battle_passive.lua.bytes.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 752c495403a6b40458759ff9338aebf2
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/userdata/battle/battle_data.lua.bytes
+++ b/Assets/lua/app/userdata/battle/battle_data.lua.bytes
--- a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes
+++ b/Assets/lua/app/userdata/battle/skill/battle_skill_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