401 Commits

Author SHA1 Message Date
puxuan
d8a9bc459d 肉鸽 2025-10-17 12:17:36 +08:00
puxuan
07c11aded9 肉鸽 2025-10-17 11:45:47 +08:00
puxuan
9702c903ac . 2025-10-16 21:26:20 +08:00
puxuan
7ce2b6a419 肉鸽 2025-10-16 21:16:15 +08:00
puxuan
2fb0bdc8df fix bug 2025-10-15 20:39:00 +08:00
kai
dcbaf9258f 肉鸽技能直接带入 2025-10-14 15:36:56 +08:00
puxuan
91ac8062ba fix bug 2025-10-13 18:22:38 +08:00
puxuan
800c9ab533 副本 2025-10-10 19:45:52 +08:00
puxuan
4ecf8a87dd 副本 2025-10-10 19:21:42 +08:00
puxuan
4e26d02191 每日挑战 2025-10-07 18:27:59 +08:00
puxuan
349f321a97 新增肉鸽类型 2025-09-19 14:49:12 +08:00
puxuan
e1d389b02d 每日挑战 2025-09-15 17:20:14 +08:00
puxuan
4a737e7e68 fix bug 2025-09-08 11:45:19 +08:00
puxuan
9481bb830c fix bug 2025-09-04 16:21:46 +08:00
puxuan
15f5bdca59 局内颜色特效 2025-08-28 20:51:32 +08:00
puxuan
8309062814 还原boss 2025-08-27 20:32:12 +08:00
puxuan
fec693c52f fix bug 2025-08-27 18:54:59 +08:00
puxuan
aa9b35d053 结算 2025-08-15 17:33:57 +08:00
puxuan
6beb44b672 fix bug 2025-06-17 20:28:43 +08:00
puxuan
a142d9e9d2 boss技能 2025-06-11 23:51:45 +08:00
puxuan
30fcf69843 mystery_box 2025-06-10 23:36:41 +08:00
puxuan
c026ff582c skill 2025-06-03 23:57:45 +08:00
puxuan
5cfdb4c8d8 hero 2025-06-03 15:15:01 +08:00
xiekaidong
2cf8e25ced fix 2024-02-21 15:35:43 +08:00
xiekaidong
f2a8e2c8a4 竞技场bug修复 2023-11-10 10:36:43 +08:00
xiekaidong
a29a9606bf 锁定buff修复 2023-10-27 16:00:43 +08:00
xiekaidong
7c5a57323e bug修复 2023-10-26 10:38:35 +08:00
xiekaidong
0d79e85452 容错 2023-09-22 09:58:21 +08:00
xiekaidong
a74b0d6f56 bug修复 2023-09-22 09:46:10 +08:00
xiekaidong
5112645d9d 试玩功能属性加成 2023-09-20 15:16:23 +08:00
xiekaidong
cbbccaaa63 bug修复 2023-09-20 11:27:26 +08:00
xiekaidong
2e6541445e 复活优化 2023-09-20 11:16:33 +08:00
xiekaidong
ca0762659b 优化体验 2023-09-20 10:56:29 +08:00
xiekaidong
37a3f3bf25 优化符文副本重生 2023-09-20 10:54:55 +08:00
xiekaidong
7dc298a2bb 符文副本复活处理 2023-09-20 10:47:30 +08:00
xiekaidong
44356ebb52 增加战斗前后上阵英雄参数,方便查询作弊 2023-09-19 10:51:40 +08:00
xiekaidong
45174e1f9f Merge branch 'master' into dev_20230919 2023-09-18 14:50:51 +08:00
xiekaidong
28c21af47e bug修复 2023-09-18 09:37:43 +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
Fang
4c27243520 请求优化 2023-09-15 20:11:50 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
37f93d1cd1 pvp战斗取消元素随机加权 2023-09-15 17:41:29 +08:00
xiekaidong
8b6b8d2772 数据层 2023-09-15 17:28:14 +08:00
xiekaidong
1e30641b76 限时pvp数据层 2023-09-13 17:01:17 +08:00
xiekaidong
ed65ae452b 一些优化和审核模式处理 2023-09-13 14:55:52 +08:00
xiekaidong
394a7a37ae 优化 2023-09-13 09:43:32 +08:00
xiekaidong
24b8242de8 优化 2023-09-13 09:19:02 +08:00
xiekaidong
dd62b41f00 修复bug 2023-09-12 19:46:37 +08:00
xiekaidong
97cef0d41d bug修复 2023-09-12 16:31:27 +08:00
xiekaidong
178de4c506 bug修复 2023-09-12 16:22:10 +08:00