340 Commits

Author SHA1 Message Date
puxuan
58bcc1f45f 引导坐标 2025-09-22 12:00:22 +08:00
puxuan
160cc58d78 boss技能 2025-09-05 15:04:14 +08:00
puxuan
5f724a1491 fix bug 2025-09-04 20:07:02 +08:00
puxuan
08795a1bb4 震动 2025-09-04 17:35:24 +08:00
puxuan
9481bb830c fix bug 2025-09-04 16:21:46 +08:00
puxuan
ec86c17b8d fix bug 2025-09-03 20:42:20 +08:00
puxuan
da72e275bb fix bug 2025-08-29 17:21:22 +08:00
puxuan
6e938240d7 场景3 4 2025-08-29 11:57:13 +08:00
puxuan
15f5bdca59 局内颜色特效 2025-08-28 20:51:32 +08:00
puxuan
2044015a21 . 2025-08-28 17:41:28 +08:00
puxuan
6f7fd539eb 连击 2025-08-28 17:39:19 +08:00
puxuan
3c7c289c79 fix bug 2025-08-27 20:54:01 +08:00
puxuan
8309062814 还原boss 2025-08-27 20:32:12 +08:00
puxuan
1c49360734 fix bug 2025-08-27 19:36:47 +08:00
puxuan
3234a9d870 fix bug 2025-08-27 19:26:37 +08:00
puxuan
fec693c52f fix bug 2025-08-27 18:54:59 +08:00
puxuan
fa75e036f9 fix bug 2025-08-22 15:46:55 +08:00
puxuan
25b80d6f67 fix bug 2025-08-22 10:55:23 +08:00
puxuan
b1fa6a4444 fix bug 2025-08-21 11:33:07 +08:00
puxuan
1f552c4a41 场景 2025-08-19 17:12:25 +08:00
puxuan
aa9b35d053 结算 2025-08-15 17:33:57 +08:00
puxuan
0d57ff0937 box 2025-08-15 11:37:24 +08:00
puxuan
6ab80119eb 局内 2025-08-08 11:41:36 +08:00
puxuan
f1e44406bf arena 2025-07-21 21:05:08 +08:00
kai
ed7bb362f0 每日挑战 2025-07-16 21:57:10 +08:00
puxuan
b0f9cedce0 tips 2025-06-12 22:47:10 +08:00
puxuan
a142d9e9d2 boss技能 2025-06-11 23:51:45 +08:00
xiekaidong
935bd0c2ba fix 2024-01-26 11:08:52 +08:00
xiekaidong
0c8724a03d bug修复 2023-09-20 10:19:02 +08:00
xiekaidong
44356ebb52 增加战斗前后上阵英雄参数,方便查询作弊 2023-09-19 10:51:40 +08:00
xiekaidong
10e4e1ffc6 音效 2023-09-18 16:38:13 +08:00
xiekaidong
c9d73ceaf6 优化显示 2023-09-18 11:40:42 +08:00
xiekaidong
b60db0e3ef 结算界面的表现 2023-09-16 20:07:15 +08:00
xiekaidong
2038237e6c 界面优化 2023-09-16 18:45:50 +08:00
xiekaidong
fd24935c4b 优化 2023-09-16 18:13:25 +08:00
xiekaidong
820a22b051 Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/pay_manager.lua
#	lua/app/config/activity_pvp_board.lua.meta
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/monster_activity.lua
#	lua/app/config/monster_base.lua
#	lua/app/config/skill.lua
#	lua/app/config/skin.lua
#	lua/app/config/skin_skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/config/strings/cn/skin.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/de/skin.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/en/skin.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/es/skin.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/fr/skin.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/id/skin.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skin.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/ko/skin.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/pt/skin.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/ru/skin.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/th/skin.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/vi/skin.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skin.lua
#	lua/app/config/task_type.lua.meta
#	lua/app/global/global_const.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/battle_manager.lua
2023-09-16 17:55:38 +08:00
xiekaidong
8b6b8d2772 数据层 2023-09-15 17:28:14 +08:00
xiekaidong
b20644f4cb 显示bug修复 2023-09-12 20:26:49 +08:00
xiekaidong
dd62b41f00 修复bug 2023-09-12 19:46:37 +08:00
xiekaidong
1ef1f34c7a 战斗优化调整 2023-09-12 12:23:07 +08:00
xiekaidong
61b73d9c8f zancun 2023-09-12 11:15:52 +08:00
xiekaidong
94d59731c8 Merge branch 'dungeon_rune' into dev_20230919
# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/const.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/monster_dungeon_rune.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/proto/proto_msg_type.lua
2023-09-12 10:07:33 +08:00
xiekaidong
5544693612 符文副本 2023-09-12 10:07:16 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +08:00
Fang
874ecfd37b 添加容错 2023-09-08 10:01:36 +08:00
xiekaidong
f3d7d1c892 bug修复 2023-09-04 20:06:11 +08:00
xiekaidong
11f982bd04 主动结算 2023-09-04 17:14:35 +08:00
xiekaidong
d8aa8cce2c bug修复 2023-09-04 16:54:44 +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
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00