miduo_client/Assets/ManagedResources/~Lua/Modules/Battle/Logic
wangzhenxing d943d3044b Merge branch 'china/dev' into china/dev-c-battle
Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-06-21 15:29:16 +08:00
..
Base Merge branch 'china/dev' into china/dev-c-battle 2021-06-21 15:29:16 +08:00
Buff Merge branch 'china/dev' into china/dev-c-battle 2021-06-21 15:29:16 +08:00
Misc [战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交 2021-06-16 10:27:56 +08:00
Monster 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
Role 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
Base.meta 提交 2020-05-09 13:31:21 +08:00
BattleLogManager.lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
BattleLogManager.lua.meta 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
BattleLogic.lua 【山河社稷图】条件:5回合内打出8万伤害,如果我在第三回合打出7万伤害,第四回合直接秒杀怪物,面板总计造成12万伤害但是不给星星 2021-05-27 16:38:31 +08:00
BattleLogic.lua.meta 提交 2020-05-09 13:31:21 +08:00
Buff.meta 提交 2020-05-09 13:31:21 +08:00
HardStageCondition.lua [战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交 2021-06-16 10:27:56 +08:00
HardStageCondition.lua.meta [战斗]====精英副本相关修改提交 2021-05-11 17:05:11 +08:00
HardStageEventManager.lua [战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交 2021-06-16 10:27:56 +08:00
HardStageEventManager.lua.meta [战斗]====精英副本相关修改提交 2021-05-11 17:05:11 +08:00
Misc.meta 提交 2020-05-09 13:31:21 +08:00
Monster.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
OutDataManager.lua 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
OutDataManager.lua.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
Role.meta 【战斗】灵兽战斗逻辑同步 2020-11-01 16:17:26 +08:00
SkillManager.lua Merge branch 'china/dev' into china/ios 2021-04-21 17:54:16 +08:00
SkillManager.lua.meta 提交 2020-05-09 13:31:21 +08:00