34 Commits

Author SHA1 Message Date
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
xiekaidong
297dcded77 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:26:48 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
Fang
6ec4c2cd40 装备礼包fix 2023-08-28 15:25:38 +08:00
Fang
017be0ef1c 新增皮肤报错fix 2023-08-22 11:56:22 +08:00
xiekaidong
5b119201cf 界面和协议 2023-08-17 18:16:06 +08:00
Fang
fbe290212e 导表 2023-08-15 11:37:27 +08:00
Fang
b06ed8a9eb 导表 2023-08-14 18:32:48 +08:00
xiekaidong
4c65578099 更新配置 2023-08-11 10:41:09 +08:00
xiekaidong
e17c9bf4cf 更新配置 2023-08-10 09:40:35 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +08:00
xiekaidong
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
xiekaidong
6cdae47b74 更新配置 2023-08-03 16:59:40 +08:00
xiekaidong
041d222d53 更新配置 2023-08-02 18:30:43 +08:00
xiekaidong
5a7249a545 更新配置 2023-07-27 12:32:51 +08:00
Fang
ce1e2f557d 收集奖励报错fix 2023-07-25 15:44:10 +08:00
xiekaidong
d7ed50ab8c 处理界面显示 2023-07-24 10:36:25 +08:00
Fang
b2dba1de2e 英雄图鉴 2023-07-14 17:07:03 +08:00
Fang
7eabeeb752 超框 2023-07-06 19:23:17 +08:00
Fang
47418bab2e 竞技场宝箱增加每日次数控制 2023-07-06 10:24:53 +08:00
Fang
b563ed2970 导表 2023-07-05 15:04:22 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
Fang
abe661f228 空名称处理 2023-07-03 14:16:03 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
xiekaidong
c9558263e2 更新配置 2023-06-06 14:39:25 +08:00
chenxi
5790cef72b 更新配置 2023-06-05 21:30:53 +08:00
chenxi
a79e89cac4 更新配置 2023-06-03 23:53:27 +08:00
CloudJ
cc674c3204 更新配置表与pb 修复一些问题 2023-05-25 15:26:57 +08:00
CloudJ
1fb818d12b 提交一波 2023-05-23 18:37:09 +08:00
chenxi
dcc1d8377d 更新配置 2023-05-15 21:37:14 +08:00
xiekaidong
11d28008db 死亡召唤buff 2023-05-11 19:11:21 +08:00
chenxi
3c6a538338 设置 2023-05-08 21:10:41 +08:00