133 Commits

Author SHA1 Message Date
xiekaidong
5214dd8136 伤害数字重叠问题 2023-06-14 18:35:20 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
xiekaidong
e3b8eaa04c 显示buff 2023-06-14 15:34:21 +08:00
xiekaidong
6cf247d86d 对手先手期间,英雄不会播放死亡动作bug修复 2023-06-14 10:03:21 +08:00
xiekaidong
e010700340 技能音效 2023-06-13 17:43:55 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
0441e09d12 bug修复 2023-06-05 18:24:06 +08:00
xiekaidong
628da8aade 音效容错 2023-06-05 16:24:06 +08:00
xiekaidong
fd4b60dfd2 多段伤害音效 2023-06-02 20:22:54 +08:00
xiekaidong
dd86bf5283 战斗速度 2023-06-02 15:15:10 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
12d73fc941 特效反转 2023-05-31 17:22:48 +08:00
xiekaidong
8c779f826c bug修复 2023-05-31 16:04:46 +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
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
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
xiekaidong
550a51efa7 死亡时恢复战斗速度 2023-05-29 15:21: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
77a9039092 多段伤害的更改 2023-05-26 15:46:15 +08:00
xiekaidong
7a87210ae3 局内任务显示 2023-05-26 15:43:01 +08:00
xiekaidong
55983ad95a 构建一些任务需要的战斗数据 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
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
8316e48633 随机技能机制 2023-05-19 15:15:02 +08:00
xiekaidong
aae0f74648 新增消除类型 2023-05-19 10:51:48 +08:00
xiekaidong
91680e5c9a 被动触发时机 2023-05-19 10:00:14 +08:00
xiekaidong
0f8121fea1 增加触发机制 2023-05-18 22:07:35 +08:00
xiekaidong
82d95ee5fd 被动、buff触发时机 2023-05-18 20:43:10 +08:00
xiekaidong
170ddb3066 技能效果生效条件判定 2023-05-18 15:34:17 +08:00
xiekaidong
98070979dc 多段伤害 2023-05-18 10:58:49 +08:00
xiekaidong
11d28008db 死亡召唤buff 2023-05-11 19:11:21 +08:00
xiekaidong
d9bf3ee52b 修改影响棋盘的技能的逻辑 2023-05-11 11:22:46 +08:00
xiekaidong
af0c61130d 冻结buff 2023-05-10 20:53:06 +08:00
xiekaidong
530ea14776 禁锢buff 2023-05-10 16:51:45 +08:00
xiekaidong
1c6ff387fc 反击 2023-05-10 11:53:44 +08:00
xiekaidong
c9558d872e 反伤 2023-05-09 20:39:00 +08:00
xiekaidong
199ff4a7a2 bug修复 2023-05-09 19:40:47 +08:00