396 Commits

Author SHA1 Message Date
xiekaidong
ebb4a77f18 每日挑战bug修复 2023-05-31 21:13:35 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
12d73fc941 特效反转 2023-05-31 17:22:48 +08:00
xiekaidong
10bd5a422d bug修复 2023-05-31 16:43:46 +08:00
xiekaidong
8c779f826c bug修复 2023-05-31 16:04:46 +08:00
xiekaidong
89b35ce6aa 战斗相关bug修复 2023-05-31 14:23:48 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +08:00
xiekaidong
fdbafd1dfe 增加一个战斗内使用的gm命令 2023-05-30 15:56:29 +08:00
xiekaidong
6f59974c33 优化代码 2023-05-30 15:41:23 +08:00
xiekaidong
71daac9cb7 表现优化 2023-05-30 15:06:33 +08:00
xiekaidong
122c0da462 buff描述 2023-05-30 14:15:42 +08:00
xiekaidong
8e8930230f 容错 2023-05-30 11:54:33 +08:00
陈希
bbc196035c Merge branch 'fang/daily_challenge' into 'dev'
每日挑战

See merge request b6-client/b6-lua!1
2023-05-30 03:38:33 +00:00
xiekaidong
c3bcb35a33 没有战斗动作的技能 2023-05-30 11:29:59 +08:00
Fang
9b3a00e809 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/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
2023-05-30 10:35:05 +08:00
xiekaidong
8f1fd47fd2 战斗优化 2023-05-30 09:57:18 +08:00
xiekaidong
09e8acb915 删除空余行 2023-05-29 21:00:24 +08:00
xiekaidong
fe6994625c bug修复 2023-05-29 20:56:46 +08:00
xiekaidong
c50f92bbc0 bug修复 2023-05-29 20:21:05 +08:00
xiekaidong
13e752a761 bug修复 2023-05-29 19:25:25 +08:00
Fang
3880dfd3d2 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
#	lua/app/common/module_manager.lua
#	lua/app/config/buff_daily_challenge.lua
#	lua/app/config/chapter.lua
#	lua/app/config/hero.lua
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/skill.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/global.lua
2023-05-29 18:24:33 +08:00
Fang
74f242b214 每日挑战开启状态变化fix 2023-05-29 18:22:17 +08:00
xiekaidong
34494cdb1f bug修复 2023-05-29 17:54:02 +08:00
xiekaidong
550a51efa7 死亡时恢复战斗速度 2023-05-29 15:21:56 +08:00
xiekaidong
2d51debf5a 显示i问题 2023-05-29 11:06:24 +08:00
xiekaidong
6246a9cd9d 存储一些技能效果 2023-05-29 10:50:56 +08:00
xiekaidong
6f084d2c91 战斗死亡延迟 2023-05-29 09:45:36 +08:00
xiekaidong
fdd5ad08f5 反击bug修复 2023-05-26 21:36:08 +08:00
xiekaidong
35c56dda72 带有流血buff时死亡触发的被动机制 2023-05-26 21:22:00 +08:00
xiekaidong
2430e09f7e bug修复 2023-05-26 20:03:33 +08:00
Fang
b57318f3a6 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-26 18:26:21 +08:00
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +08:00
xiekaidong
77a9039092 多段伤害的更改 2023-05-26 15:46:15 +08:00
xiekaidong
7a87210ae3 局内任务显示 2023-05-26 15:43:01 +08:00
xiekaidong
13d470ad5b 每日挑战战斗内部界面 2023-05-26 15:43:01 +08:00
xiekaidong
5c1307ad0d 一些数据和更新配置 2023-05-26 15:43:01 +08:00
xiekaidong
55983ad95a 构建一些任务需要的战斗数据 2023-05-26 15:42:35 +08:00
xiekaidong
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
xiekaidong
cbba15794a 增加一下受击动画容错 2023-05-25 10:37:49 +08:00
xiekaidong
f7a4a0fe31 表现bug修复 2023-05-24 12:07:20 +08:00
xiekaidong
db985c714c 相互反击的bug 2023-05-24 11:02:26 +08:00
xiekaidong
bff772a1de 技能刷新接入联网 2023-05-24 10:01:36 +08:00
xiekaidong
715408f15f 反击表现 2023-05-23 20:09:09 +08:00
xiekaidong
c5609f4867 新增的buff 2023-05-23 19:08:26 +08:00
xiekaidong
e5bcfa3f09 冰冻状态、昏睡状态 2023-05-23 18:35:08 +08:00
xiekaidong
637264f383 格挡动作表现、反击界面表现 2023-05-23 16:39:29 +08:00
xiekaidong
1e6e99de9a 伤害数字 2023-05-23 15:05:23 +08:00
xiekaidong
f3946e1424 boss入场动画 2023-05-22 20:29:25 +08:00
xiekaidong
3f747de9aa boss的buff自动提示 2023-05-22 17:23:36 +08:00
xiekaidong
8ae7df28e2 通用技能tips 2023-05-22 16:38:04 +08:00