153 Commits

Author SHA1 Message Date
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
1e21958ae6 更表 2023-09-12 18:11:24 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +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
180c12435f 更新配置 2023-09-05 15:59:37 +08:00
xiekaidong
e7039061a8 更新配置 2023-09-01 21:20:53 +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
f15917914c 竞技场段位奖励 2023-08-23 14:40:52 +08:00
Fang
017be0ef1c 新增皮肤报错fix 2023-08-22 11:56:22 +08:00
xiekaidong
87cedf6a28 更新配置 2023-08-17 18:59:17 +08:00
xiekaidong
a62d759abc 更新配置 2023-08-15 18:42:55 +08:00
xiekaidong
aff0c425bf 背景特效 2023-08-15 14:59:15 +08:00
Fang
fbe290212e 导表 2023-08-15 11:37:27 +08:00
Fang
b06ed8a9eb 导表 2023-08-14 18:32:48 +08:00
Fang
6bfc886dd5 配置更新 2023-08-14 14:43:50 +08:00
Fang
0ed6abb0f4 更新配置 2023-08-14 09:47:37 +08:00
xiekaidong
866094a76f 边缘障碍物逻辑优化 2023-08-11 15:17:28 +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
26862b0e02 Merge branch 'dev_20230815' into battle
# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/es/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/helper/battle_buff_handle.lua
2023-08-08 16:02:24 +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
97cddfa125 复活buff 2023-08-08 15:27:21 +08:00
xiekaidong
e51b9bf86a 更新配置 2023-08-04 16:56:37 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +08:00
Fang
84e1e14d79 装备材料副本扫荡排序修改 2023-08-04 10:53:00 +08:00
xiekaidong
6cdae47b74 更新配置 2023-08-03 16:59:40 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
e0882c61c6 更新配置 2023-07-31 16:27:31 +08:00
Fang
7c7d201e01 技能tips 2023-07-28 11:46:22 +08:00
xiekaidong
2f98218e7d 更新配置 2023-07-27 10:27:48 +08:00
xiekaidong
08fa2ab356 更新配置 2023-07-26 15:58:03 +08:00
xiekaidong
2f84455356 更新配置 2023-07-25 19:28:47 +08:00
xiekaidong
37482eb2ca 副本引导 2023-07-24 17:10:39 +08:00
xiekaidong
3148733679 更新配置,上传资源 2023-07-21 17:17:51 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
xiekaidong
bab7c281ca 更新配置,英雄排序问题 2023-07-21 11:47:19 +08:00
xiekaidong
a4a1574ace 支线副本 2023-07-20 21:56:24 +08:00
xiekaidong
8b4933f4f0 支线副本 2023-07-20 17:41:42 +08:00
xiekaidong
2ffd6e88ba 装备副本 2023-07-19 20:16:17 +08:00
xiekaidong
0cfce182b3 更新配置 2023-07-18 16:45:46 +08:00
xiekaidong
de04cbc6ff 更新配置和优化 2023-07-17 17:21:00 +08:00
xiekaidong
47d5b00318 取消连线 2023-07-04 18:05:17 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00