miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/Logic
jiaoyangna 4121f24a27 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2021-03-10 13:50:38 +08:00
..
Base Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-03-10 13:50:38 +08:00
Buff [战斗]==================126效果修改 生命百分比伤害会被无敌盾挡住 2021-02-02 15:02:25 +09:00
Misc Merge branch '0功能/本周版本优化内容' into 0功能/本周版本优化内容_battle 2021-02-27 15:14:59 +09:00
Monster Merge branch 'master_xma_local' into gx/xma_local 2021-01-12 10:56:36 +08:00
Role lua 提交 2021-03-02 15:59:29 +08:00
Base.meta
BattleLogManager.lua 【本地化】中文字还原,合并用 2021-02-05 12:00:39 +08:00
BattleLogManager.lua.meta
BattleLogic.lua Merge branch 'master_xma_local' into 0功能/本周版本优化内容 2021-03-10 13:50:38 +08:00
BattleLogic.lua.meta
Buff.meta
Misc.meta
Monster.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
OutDataManager.lua 中文表导出提交 2020-08-25 15:46:38 +08:00
OutDataManager.lua.meta
Role.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
SkillManager.lua lua 提交 2021-03-02 15:59:29 +08:00
SkillManager.lua.meta