miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base
jiaoyangna 96d47d34a8 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
2020-08-12 14:17:01 +08:00
..
BattleEvent.lua encoding upate 2020-08-06 17:52:32 +08:00
BattleEvent.lua.meta 提交 2020-05-09 13:31:21 +08:00
Buff.lua encoding upate 2020-08-06 17:52:32 +08:00
Buff.lua.meta 提交 2020-05-09 13:31:21 +08:00
Effect.lua encoding upate 2020-08-06 17:52:32 +08:00
Effect.lua.meta 提交 2020-05-09 13:31:21 +08:00
Passivity.lua Merge branch 'master_develop2' into xuanyuanbaojing 2020-08-12 14:17:01 +08:00
Passivity.lua.meta 提交 2020-05-09 13:31:21 +08:00
Random.lua encoding upate 2020-08-06 17:52:32 +08:00
Random.lua.meta 提交 2020-05-09 13:31:21 +08:00
RoleData.lua encoding upate 2020-08-06 17:52:32 +08:00
RoleData.lua.meta 提交 2020-05-09 13:31:21 +08:00
Skill.lua 技能释放后摇时间添加0.2 2020-08-06 18:01:59 +09:00
Skill.lua.meta 提交 2020-05-09 13:31:21 +08:00