c1_lua

History

xiekaidong d311ea14aa Merge branch 'master' into dev_20230815

# Conflicts:
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board.lua
#	lua/app/config/grid_type.lua
#	lua/app/config/strings/cn/avatar.lua
#	lua/app/config/strings/cn/avatar_frame.lua
#	lua/app/config/strings/en/avatar.lua
#	lua/app/config/strings/en/avatar_frame.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/avatar.lua
#	lua/app/config/strings/es/avatar_frame.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/id/avatar.lua
#	lua/app/config/strings/id/avatar_frame.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/avatar.lua
#	lua/app/config/strings/ja/avatar_frame.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/avatar.lua
#	lua/app/config/strings/ko/avatar_frame.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/avatar.lua
#	lua/app/config/strings/pt/avatar_frame.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/th/avatar.lua
#	lua/app/config/strings/th/avatar_frame.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/avatar.lua
#	lua/app/config/strings/vi/avatar_frame.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/avatar.lua
#	lua/app/config/strings/zh/avatar_frame.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/summon.lua
#	lua/app/module/battle/component/battle_unit_comp.lua
#	lua/app/module/battle/team/battle_team.lua

2023-08-10 09:39:07 +08:00

battle_board_touch_helper.lua

木棍边缘障碍物

2023-08-02 18:07:44 +08:00

battle_board_touch_helper.lua.meta

pvp战斗和整合pve战斗

2023-06-28 21:24:15 +08:00

battle_buff_handle.lua

Merge branch 'dev_20230815' into battle

2023-08-08 16:02:24 +08:00

battle_buff_handle.lua.meta

冒伤害

2023-04-13 22:04:22 +08:00

battle_buff_special.lua

复活buff

2023-08-08 15:27:21 +08:00

battle_buff_special.lua.meta

冒伤害

2023-04-13 22:04:22 +08:00

battle_formula.lua

bug

2023-08-03 16:23:53 +08:00

battle_formula.lua.meta

冒伤害

2023-04-13 22:04:22 +08:00

battle_helper.lua

pvp战斗和整合pve战斗

2023-06-28 21:24:15 +08:00

battle_helper.lua.meta

战斗

2023-04-11 18:23:25 +08:00

battle_instructions_helper.lua

战斗任务数据

2023-05-19 18:00:03 +08:00

battle_instructions_helper.lua.meta

技能机制

2023-05-19 16:27:54 +08:00

battle_passive.lua

带有流血buff时死亡触发的被动机制

2023-05-26 21:22:00 +08:00

battle_passive.lua.meta

被动

2023-04-18 18:59:36 +08:00

battle_pool.lua

技能特效

2023-04-21 15:52:50 +08:00

battle_pool.lua.meta

技能特效

2023-04-21 15:52:50 +08:00

battle_scheduler.lua

修改上报

2023-06-06 15:25:21 +08:00

battle_scheduler.lua.meta

移动攻击表现

2023-04-12 23:10:22 +08:00

battle_skill_condition_handle.lua

review

2023-07-20 16:20:11 +08:00

battle_skill_condition_handle.lua.meta

技能效果生效条件判定

2023-05-18 15:34:17 +08:00

battle_snapshot_helper.lua

Merge branch 'master' into dev_20230815

2023-08-10 09:39:07 +08:00

battle_snapshot_helper.lua.meta