144 Commits

Author SHA1 Message Date
puxuan
45e600be69 新加任务 2025-10-07 19:59:53 +08:00
puxuan
d83268f66e Merge branch 'dev_hero' into dev_act
# Conflicts:
#	lua/app/config/fx.lua
#	lua/app/config/strings/cn/attr.lua
#	lua/app/config/strings/de/attr.lua
#	lua/app/config/strings/en/attr.lua
#	lua/app/config/strings/es/attr.lua
#	lua/app/config/strings/fr/attr.lua
#	lua/app/config/strings/id/attr.lua
#	lua/app/config/strings/ja/attr.lua
#	lua/app/config/strings/ko/attr.lua
#	lua/app/config/strings/pt/attr.lua
#	lua/app/config/strings/ru/attr.lua
#	lua/app/config/strings/th/attr.lua
#	lua/app/config/strings/vi/attr.lua
#	lua/app/config/strings/zh/attr.lua
2025-10-07 18:31:30 +08:00
puxuan
4e26d02191 每日挑战 2025-10-07 18:27:59 +08:00
puxuan
869dad3cff 冲刺 2025-09-29 16:27:22 +08:00
puxuan
d98418b50f config 2025-09-26 15:41:46 +08:00
puxuan
4bbe1af8b1 装备 2025-09-12 09:50:19 +08:00
puxuan
58f9825721 config 2025-09-04 09:40:35 +08:00
puxuan
a48c5a860a fix bug 2025-09-03 16:43:04 +08:00
puxuan
c4141108da config 2025-09-01 09:44:32 +08:00
puxuan
797de2db15 config 2025-08-19 21:18:14 +08:00
puxuan
9f41da288b fix bug 2025-08-19 20:31:19 +08:00
puxuan
36cdeeee11 fix bug 2025-08-19 15:11:25 +08:00
puxuan
11bb4e4017 fix bug 2025-08-18 20:49:25 +08:00
puxuan
dd4b156c07 chapter 2025-08-15 21:35:16 +08:00
puxuan
66c6437612 抽卡 2025-08-11 20:37:29 +08:00
puxuan
0166341747 config 2025-07-23 20:05:04 +08:00
puxuan
f1e44406bf arena 2025-07-21 21:05:08 +08:00
kai
a2d6fcc50e 主界面 2025-06-29 13:37:33 +08:00
puxuan
443bf10a2d star 2025-06-22 19:05:14 +08:00
puxuan
ec9b3a4815 config 2025-06-12 22:05:46 +08:00
puxuan
f18ab0ee83 升星 2025-05-27 00:08:22 +08:00
puxuan
6f2dc436f7 config 2025-05-24 14:24:19 +08:00
puxuan
5fd176f477 config 2025-05-24 12:00:09 +08:00
xiekaidong
935bd0c2ba fix 2024-01-26 11:08:52 +08:00
xiekaidong
13f7f35e27 更新配置表 2023-12-26 17:22:58 +08:00
xiekaidong
c82a6ca381 更新配置 2023-12-25 10:04:59 +08:00
Fang
45d10ff588 更表 2023-11-14 17:45:17 +08:00
Fang
3d98e4e343 更表 2023-10-20 18:10:19 +08:00
Fang
d4548c017a 更表 2023-10-20 16:08:00 +08:00
xiekaidong
e12d2cbf3a 更新配置 2023-10-09 17:48:49 +08:00
Fang
e10c78dc0d 更表 2023-10-09 15:25:29 +08:00
Fang
2f953375a5 锦标赛fix 2023-10-08 11:35:43 +08:00
Fang
aabf68a924 更表 2023-09-19 11:28:17 +08:00
Fang
30e6f98fff 界面优化 2023-09-18 16:37:42 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
e5547541e3 更新配置和优化显示 2023-09-15 17:37:03 +08:00
Fang
2d1349eae0 自动铸造开启等级 2023-09-13 10:37:44 +08:00
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
297dcded77 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:26:48 +08:00
xiekaidong
3a7f4576d8 更新配置 2023-09-05 20:24:35 +08:00
xiekaidong
12d5186557 倒计时优化 2023-09-04 17:25:50 +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
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
Fang
52cab75d25 更表 2023-08-30 17:03:50 +08:00
Fang
f15917914c 竞技场段位奖励 2023-08-23 14:40:52 +08:00
Fang
0ed6abb0f4 更新配置 2023-08-14 09:47:37 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
4c65578099 更新配置 2023-08-11 10:41:09 +08:00