415 Commits

Author SHA1 Message Date
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
xiekaidong
c2ddb208b9 更改一下死亡召唤触发时机 2023-06-03 17:46:24 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
xiekaidong
fd4b60dfd2 多段伤害音效 2023-06-02 20:22:54 +08:00
xiekaidong
1689436124 新增障碍物效果类型 2023-06-02 20:13:38 +08:00
xiekaidong
14f51d2900 水泡动画 2023-06-02 19:01:33 +08:00
xiekaidong
5a9558184b 火箭动画 2023-06-02 17:58:18 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
aaafadf812 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-02 15:15:13 +08:00
xiekaidong
dd86bf5283 战斗速度 2023-06-02 15:15:10 +08:00
chenxi
75a1352777 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 12:11:35 +08:00
chenxi
b609f796ba 只有主线关卡战斗结算显示金猪 2023-06-02 12:11:29 +08:00
xiekaidong
738a57f9f4 bug修复 2023-06-02 11:53:55 +08:00
xiekaidong
197fcb9518 过场动画 2023-06-02 11:07:23 +08:00
xiekaidong
09598b076b bug修复 2023-06-01 21:06:59 +08:00
xiekaidong
143f67c2f3 特效问题修复 2023-06-01 18:18:54 +08:00
xiekaidong
1198d7cd88 bug修复 2023-06-01 17:44:57 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
xiekaidong
2bc46d2d30 优化战斗中的table 2023-06-01 16:29:01 +08:00
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