81 Commits

Author SHA1 Message Date
puxuan
d67a67839e fix bug 2025-10-31 15:41:35 +08:00
puxuan
f5f092c1e8 技能增加能量特效 2025-10-30 21:07:41 +08:00
puxuan
63e00b46bb fix bug 2025-10-30 15:50:07 +08:00
puxuan
e1e39a020c fix bug 2025-10-28 15:36:00 +08:00
puxuan
aaccaa8bd1 fix bug 2025-10-28 11:13:00 +08:00
puxuan
69dc46402f fix bug 2025-10-27 18:35:17 +08:00
puxuan
676ced2dec 伤害公式 2025-10-27 10:54:15 +08:00
puxuan
71bb3ff422 fix bug 2025-10-22 10:13:37 +08:00
puxuan
71820d787f 广告 2025-10-20 11:09:54 +08:00
puxuan
e6afcd0ccd fix bug 2025-10-18 18:05:05 +08:00
puxuan
ebb3797170 fix bug 2025-10-17 20:37:11 +08:00
puxuan
9e99bea561 特殊天赋 2025-10-17 16:12:49 +08:00
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
349f321a97 新增肉鸽类型 2025-09-19 14:49:12 +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
a29a9606bf 锁定buff修复 2023-10-27 16:00:43 +08:00
xiekaidong
7c5a57323e bug修复 2023-10-26 10:38:35 +08:00
xiekaidong
45174e1f9f Merge branch 'master' into dev_20230919 2023-09-18 14:50:51 +08:00
xiekaidong
1e30641b76 限时pvp数据层 2023-09-13 17:01:17 +08:00
xiekaidong
ed65ae452b 一些优化和审核模式处理 2023-09-13 14:55:52 +08:00
xiekaidong
10253fbafb 符文副本 2023-09-11 20:01:55 +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
fe245efaba 接入数据 2023-09-01 11:55:16 +08:00
xiekaidong
0498aaf75f 战斗波次加密 2023-09-01 10:41:55 +08:00
xiekaidong
b6b342c435 boss_rush战斗 2023-09-01 10:23:48 +08:00
xiekaidong
594910154b 优化 2023-08-29 21:32:00 +08:00
xiekaidong
20eb5d0a41 bug修复 2023-08-28 19:15:27 +08:00
xiekaidong
33673c2f17 逻辑调整 2023-08-28 19:11:47 +08:00
xiekaidong
a24e64ba74 调整一下填充和格子效果的逻辑顺序 2023-08-28 14:50:14 +08:00
xiekaidong
d05cec484a bug修复 2023-08-28 11:11:04 +08:00
xiekaidong
8ad104e38d 选技能buf修复 2023-08-18 11:44:57 +08:00
xiekaidong
27388b3238 bug修复 2023-08-15 11:51:36 +08:00