xiekaidong
|
37f93d1cd1
|
pvp战斗取消元素随机加权
|
2023-09-15 17:41:29 +08:00 |
|
xiekaidong
|
4e5021741d
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/local_data.lua
# lua/app/common/module_manager.lua
# lua/app/config/act_fourteen_bounty.lua.meta
# lua/app/config/act_fourteen_exchange.lua.meta
# lua/app/config/act_fourteen_quest.lua
# lua/app/config/act_fourteen_quest.lua.meta
# lua/app/config/activity_boss_rush_chapter.lua.meta
# lua/app/config/activity_boss_rush_exchange.lua.meta
# lua/app/config/activity_boss_rush_rank.lua.meta
# lua/app/config/activity_exchange.lua.meta
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board_bossrush.lua.meta
# lua/app/config/monster_activity.lua.meta
# lua/app/config/strings/cn/act_fourteen_quest.lua.meta
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/task_type.lua.meta
# lua/app/config/strings/de/act_fourteen_quest.lua.meta
# lua/app/config/strings/de/task_type.lua.meta
# lua/app/config/strings/en/act_fourteen_quest.lua.meta
# lua/app/config/strings/en/task_type.lua.meta
# lua/app/config/strings/es/act_fourteen_quest.lua.meta
# lua/app/config/strings/es/task_type.lua.meta
# lua/app/config/strings/fr/act_fourteen_quest.lua.meta
# lua/app/config/strings/fr/task_type.lua.meta
# lua/app/config/strings/id/act_fourteen_quest.lua.meta
# lua/app/config/strings/id/task_type.lua.meta
# lua/app/config/strings/ja/act_fourteen_quest.lua.meta
# lua/app/config/strings/ja/task_type.lua.meta
# lua/app/config/strings/ko/act_fourteen_quest.lua.meta
# lua/app/config/strings/ko/task_type.lua.meta
# lua/app/config/strings/pt/act_fourteen_quest.lua.meta
# lua/app/config/strings/pt/task_type.lua.meta
# lua/app/config/strings/ru/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/task_type.lua.meta
# lua/app/config/strings/vi/act_fourteen_quest.lua.meta
# lua/app/config/strings/vi/task_type.lua.meta
# lua/app/config/strings/zh/act_fourteen_quest.lua.meta
# lua/app/config/strings/zh/task_type.lua.meta
# lua/app/proto/proto_msg_type.lua
|
2023-09-01 21:18:54 +08:00 |
|
xiekaidong
|
0498aaf75f
|
战斗波次加密
|
2023-09-01 10:41:55 +08:00 |
|
xiekaidong
|
8b47e90f54
|
bug修复
|
2023-08-29 21:03:39 +08:00 |
|
xiekaidong
|
28b9d2bc7f
|
bug修复
|
2023-07-06 18:43:02 +08:00 |
|
xiekaidong
|
c1592accae
|
敌方也显示combo
|
2023-07-04 21:04:50 +08:00 |
|
xiekaidong
|
d7cf21fde6
|
竞技场波次显示
|
2023-07-04 20:13:24 +08:00 |
|
xiekaidong
|
9b738529fc
|
竞技场修改为自己先手
|
2023-07-03 09:46:39 +08:00 |
|
xiekaidong
|
a51ee6d872
|
竞技场战斗流程更改
|
2023-06-30 20:47:22 +08:00 |
|
xiekaidong
|
3f4f62903d
|
bug修复
|
2023-06-30 17:54:07 +08:00 |
|
xiekaidong
|
84f1f27c3c
|
战斗处理
|
2023-06-30 16:03:51 +08:00 |
|
xiekaidong
|
e7c6c45f0d
|
战斗系数
|
2023-06-29 21:56:47 +08:00 |
|
xiekaidong
|
cae3580d2c
|
竞技场敌方自动战斗
|
2023-06-29 20:51:55 +08:00 |
|
xiekaidong
|
7f7707094d
|
竞技场战斗
|
2023-06-29 14:24:29 +08:00 |
|
xiekaidong
|
d4d92cf97d
|
pvp战斗和整合pve战斗
|
2023-06-28 21:24:15 +08:00 |
|
xiekaidong
|
a623c25f6f
|
pvp战斗概念引入
|
2023-06-26 15:28:40 +08:00 |
|