107 Commits

Author SHA1 Message Date
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
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
xiekaidong
e17c9bf4cf 更新配置 2023-08-10 09:40:35 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +08:00
xiekaidong
97cddfa125 复活buff 2023-08-08 15:27:21 +08:00
xiekaidong
6cdae47b74 更新配置 2023-08-03 16:59:40 +08:00
xiekaidong
e0882c61c6 更新配置 2023-07-31 16:27:31 +08:00
xiekaidong
2f98218e7d 更新配置 2023-07-27 10:27:48 +08:00
Fang
22a26bcda0 导表 2023-07-25 20:18:15 +08:00
xiekaidong
1071013356 更新配置 2023-07-25 16:50:38 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
xiekaidong
d7ed50ab8c 处理界面显示 2023-07-24 10:36:25 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
xiekaidong
bab7c281ca 更新配置,英雄排序问题 2023-07-21 11:47:19 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
xiekaidong
000bc5e926 武器副本的一些界面 2023-07-19 16:52:28 +08:00
xiekaidong
0cfce182b3 更新配置 2023-07-18 16:45:46 +08:00
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
xiekaidong
a69305960b 更新配置 2023-07-13 18:03:33 +08:00
xiekaidong
dde65f49c3 设置界面新增社区链接按钮 2023-07-11 15:45:14 +08:00
Fang
f24f8d5e75 显示修复 2023-07-05 15:55:44 +08:00
Fang
b563ed2970 导表 2023-07-05 15:04:22 +08:00
Fang
68f80b45d3 竞技场ad宝箱功能补全 2023-07-05 15:02:59 +08:00
xiekaidong
7cb37f9d96 更新配置 2023-07-04 15:37:34 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
xiekaidong
749de33dae 更新配置 2023-06-20 15:29:34 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
chenxi
8032ca378d 更新配置 2023-06-16 21:34:30 +08:00
xiekaidong
aa5f557c75 怪物经验可配置根据血量的分段经验 2023-06-16 18:42:41 +08:00
chenxi
e402550d92 更新配置 2023-06-16 12:05:32 +08:00
xiekaidong
c1fb666388 更新配置 2023-06-16 10:09:20 +08:00
xiekaidong
47d8b479f9 连携提示 2023-06-14 18:21:42 +08:00
Fang
98206fea34 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	lua/app/config/avatar.lua.meta
#	lua/app/config/avatar_frame.lua.meta
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/avatar.lua.meta
#	lua/app/config/strings/cn/avatar_frame.lua.meta
#	lua/app/config/strings/cn/hero.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/avatar.lua.meta
#	lua/app/config/strings/de/avatar_frame.lua.meta
#	lua/app/config/strings/en/avatar.lua.meta
#	lua/app/config/strings/en/avatar_frame.lua.meta
#	lua/app/config/strings/fr/avatar.lua.meta
#	lua/app/config/strings/fr/avatar_frame.lua.meta
#	lua/app/config/strings/id/avatar.lua.meta
#	lua/app/config/strings/id/avatar_frame.lua.meta
#	lua/app/config/strings/ja/avatar.lua.meta
#	lua/app/config/strings/ja/avatar_frame.lua.meta
#	lua/app/config/strings/ko/avatar.lua.meta
#	lua/app/config/strings/ko/avatar_frame.lua.meta
#	lua/app/config/strings/pt/avatar.lua.meta
#	lua/app/config/strings/pt/avatar_frame.lua.meta
#	lua/app/config/strings/ru/avatar.lua.meta
#	lua/app/config/strings/ru/avatar_frame.lua.meta
#	lua/app/config/strings/th/avatar.lua.meta
#	lua/app/config/strings/th/avatar_frame.lua.meta
#	lua/app/config/strings/vi/avatar.lua.meta
#	lua/app/config/strings/vi/avatar_frame.lua.meta
#	lua/app/config/strings/zh/avatar.lua.meta
#	lua/app/config/strings/zh/avatar_frame.lua.meta
2023-06-14 11:41:12 +08:00
Fang
a788b1cb8c ui资源补充替换 2023-06-13 16:16:18 +08:00
chenxi
9779e5f4c6 删除多余的lua 2023-06-13 15:12:47 +08:00
chenxi
c65113785d 更新配置 2023-06-13 14:37:42 +08:00