282 Commits

Author SHA1 Message Date
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
xiekaidong
5142f704c5 多语言 2023-10-26 10:49:34 +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
033be63595 更表 2023-10-09 14:25:55 +08:00
Fang
9793884da6 锦标赛战令进度条显示修改,帮助文案修改 2023-10-08 16:56:27 +08:00
Fang
2f953375a5 锦标赛fix 2023-10-08 11:35:43 +08:00
Fang
caf1f2a8d7 文案修改 2023-09-28 14:44:20 +08:00
Fang
344aacd348 配置 2023-09-28 10:23:26 +08:00
Fang
7a475edcfc fix 2023-09-20 00:10:31 +08:00
xiekaidong
e5adf118d0 配置更新 2023-09-19 18:33:54 +08:00
Fang
38406343a2 更表、超框处理 2023-09-19 18:29:59 +08:00
xiekaidong
3e295388bf 更新配置 2023-09-19 15:03:34 +08:00
Fang
aabf68a924 更表 2023-09-19 11:28:17 +08:00
Fang
30e6f98fff 界面优化 2023-09-18 16:37:42 +08:00
xiekaidong
4badcc0064 循环活动的一些处理 2023-09-18 14:43:04 +08:00
xiekaidong
c4af5f7e5e 显示优化 2023-09-18 10:52:26 +08:00
Fang
a1098edc2e 更新 2023-09-18 10:16:54 +08:00
xiekaidong
e41a9b0b1a 帮助界面 2023-09-16 20:17:13 +08:00
xiekaidong
2038237e6c 界面优化 2023-09-16 18:45:50 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
e5547541e3 更新配置和优化显示 2023-09-15 17:37:03 +08:00
Fang
3f17beb2f2 淬炼锁定提示 2023-09-13 15:44:54 +08:00
Fang
2d1349eae0 自动铸造开启等级 2023-09-13 10:37:44 +08:00
Fang
35d78447a8 bug fix 2023-09-12 18:43:13 +08:00
Fang
1e21958ae6 更表 2023-09-12 18:11:24 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +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
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +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
c685261caa 更新配置 2023-09-05 20:22:27 +08:00
xiekaidong
a0daa1e692 更新配置 2023-09-05 18:00:32 +08:00
xiekaidong
180c12435f 更新配置 2023-09-05 15:59:37 +08:00
xiekaidong
12d5186557 倒计时优化 2023-09-04 17:25:50 +08:00
xiekaidong
11f982bd04 主动结算 2023-09-04 17:14:35 +08:00
xiekaidong
e7039061a8 更新配置 2023-09-01 21:20:53 +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
049d7508ea bossrush 2023-08-31 20:18:14 +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
6ec4c2cd40 装备礼包fix 2023-08-28 15:25:38 +08:00