101 Commits

Author SHA1 Message Date
xiekaidong
b3af360cd3 buff修改 2023-09-11 10:49:18 +08:00
xiekaidong
297dcded77 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:26:48 +08:00
xiekaidong
f839dc3b57 buff数值上线 2023-09-05 17:14:49 +08:00
xiekaidong
aff0c425bf 背景特效 2023-08-15 14:59:15 +08:00
xiekaidong
5bd2b94cd8 技能位置 2023-08-15 09:21:50 +08:00
xiekaidong
5b8030552d 皮肤技能表现 2023-08-10 10:48:30 +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
8ae11ac948 新机制 2023-08-08 15:58:17 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +08:00
xiekaidong
fdfeae8819 bug修复 2023-08-03 16:53:47 +08:00
xiekaidong
caf1fd0af9 战斗续关 2023-07-31 16:22:05 +08:00
xiekaidong
dbbfbf4842 优化技能的释放位置逻辑 2023-07-21 15:36:05 +08:00
xiekaidong
8bc3bdba34 报错修复 2023-06-29 10:12:33 +08:00
xiekaidong
d4d92cf97d pvp战斗和整合pve战斗 2023-06-28 21:24:15 +08:00
xiekaidong
4cce3bb36b buff显示修改 2023-06-15 14:17:48 +08:00
xiekaidong
e664f4ab0a 连携提示 2023-06-14 18:20:57 +08:00
xiekaidong
e3b8eaa04c 显示buff 2023-06-14 15:34:21 +08:00
xiekaidong
e010700340 技能音效 2023-06-13 17:43:55 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
xiekaidong
47ee292697 更改近身攻击距离 2023-06-12 10:09:42 +08:00
xiekaidong
225fa8ad1f 每日挑战不显示每日buff信息 2023-06-12 09:46:51 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00
xiekaidong
122c0da462 buff描述 2023-05-30 14:15:42 +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
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
b00c0eb831 buff修改 2023-05-29 11:26:25 +08:00
xiekaidong
6246a9cd9d 存储一些技能效果 2023-05-29 10:50:56 +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
7fa2c93ad5 每日战斗战斗部分 2023-05-26 15:42:35 +08:00
xiekaidong
ff56360efa 技能机制 2023-05-19 16:27:54 +08:00
xiekaidong
8316e48633 随机技能机制 2023-05-19 15:15:02 +08:00
xiekaidong
aae0f74648 新增消除类型 2023-05-19 10:51:48 +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
d9bf3ee52b 修改影响棋盘的技能的逻辑 2023-05-11 11:22:46 +08:00
xiekaidong
b7dda49394 主动技能伤害增加 2023-05-10 15:17:30 +08:00
xiekaidong
199ff4a7a2 bug修复 2023-05-09 19:40:47 +08:00
xiekaidong
518aabb829 buff叠加机制和然烧buff 2023-05-08 16:31:44 +08:00
chenxi
fe39dbe13c 连击bug 2023-04-27 11:27:31 +08:00
chenxi
54174019ee 技能加速 2023-04-26 14:17:08 +08:00
chenxi
9489cf9a6f fix bug 2023-04-25 22:01:19 +08:00
xiekaidong
2f2e9b23eb Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 17:50:44 +08:00
xiekaidong
99d6318442 bug修复 2023-04-25 17:50:41 +08:00
chenxi
d60a461a60 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 16:20:21 +08:00
chenxi
824841e6f1 buff破裂特效 2023-04-25 16:20:18 +08:00