129 Commits

Author SHA1 Message Date
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
xiekaidong
2f1f405a73 bug修复 2023-04-25 16:05:05 +08:00
chenxi
5c4d0bf6b7 经验加成 2023-04-25 10:29:17 +08:00
chenxi
5bdf637e03 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 10:19:18 +08:00
chenxi
a560ccf8a1 血量bug 2023-04-25 10:19:16 +08:00
xiekaidong
09e85e9dba 棋盘技能 2023-04-25 09:56:03 +08:00
xiekaidong
e32a3dd388 技能位置 2023-04-24 22:06:47 +08:00
chenxi
7f3c65c7ef 体力恢复 2023-04-24 21:20:55 +08:00
xiekaidong
405aad10f7 消除bug修复 2023-04-24 20:49:53 +08:00
chenxi
391f7b7925 普攻次数 2023-04-24 17:37:31 +08:00
chenxi
c4f0fa9afa 属性伤害bug 2023-04-24 17:24:13 +08:00
chenxi
fe492541a4 伤害反弹 2023-04-24 15:11:55 +08:00
xiekaidong
de8328b809 bug修复 2023-04-24 11:32:19 +08:00
xiekaidong
eb73f1b943 bug修复 2023-04-24 10:14:23 +08:00
xiekaidong
a6489466e9 第二次刷新棋盘时,不下落空元素的bug修复 2023-04-24 09:46:42 +08:00
chenxi
4e512c95db buff特效 2023-04-23 21:16:55 +08:00
chenxi
c0b2c67fdd 技能音效 2023-04-23 19:20:44 +08:00
chenxi
984b4e2b50 伤害数字高度 2023-04-23 18:45:04 +08:00
xiekaidong
664b2b2590 bug和显示优化 2023-04-23 17:22:11 +08:00
chenxi
66542a24f9 被动技能 2023-04-23 16:09:53 +08:00
chenxi
214d4c3494 技能 2023-04-23 15:40:05 +08:00
xiekaidong
8ced267a7f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 10:53:22 +08:00
xiekaidong
56745e7a0f bug修复 2023-04-23 10:53:18 +08:00
chenxi
133625a519 技能 2023-04-23 10:34:30 +08:00
chenxi
95a07316d8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 10:17:48 +08:00
chenxi
df6d39a984 第一个主英雄的排序规则改一下 2023-04-23 10:17:44 +08:00
xiekaidong
c2bfaf937f 增加容错 2023-04-23 09:55:01 +08:00
chenxi
4e61053dcb 处理 2023-04-22 00:18:22 +08:00
chenxi
e4edcfcf69 被动技能 2023-04-22 00:05:49 +08:00
xiekaidong
7642dbc8f0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 23:16:44 +08:00
xiekaidong
e7c262c34b 死局随机棋盘 2023-04-21 23:16:41 +08:00
chenxi
902db9d49b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-21 22:15:01 +08:00
chenxi
af56d4b400 伤害统计 2023-04-21 22:14:57 +08:00
xiekaidong
a4951d9f89 bug修复 2023-04-21 21:45:03 +08:00
chenxi
6ecbce4127 技能 2023-04-21 20:22:27 +08:00
chenxi
a0b27ce82d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/monster_chapter.lua
#	lua/app/config/skill.lua
2023-04-21 17:12:31 +08:00
chenxi
2a9f4350b0 普攻改成数组 2023-04-21 17:11:59 +08:00
xiekaidong
c512d7f984 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 16:49:30 +08:00
xiekaidong
150e128135 关卡固定肉鸽技能、技能可以开始就任意链接 2023-04-21 16:49:27 +08:00
chenxi
9a0ebd1318 技能抖屏 2023-04-21 16:27:24 +08:00
chenxi
4d4bd0fc61 技能特效 2023-04-21 15:52:50 +08:00
xiekaidong
a2e20a7c37 技能解锁 2023-04-20 21:26:35 +08:00
chenxi
ad9dc7d8e2 修改字段名 2023-04-20 16:03:18 +08:00
xiekaidong
3c896cf339 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/config/strings/cn/buff.lua.meta
2023-04-20 15:17:23 +08:00
xiekaidong
06bc25c2d2 rogue技能显示修改 2023-04-20 15:17:14 +08:00
chenxi
bd57840816 buff tips 2023-04-20 12:06:33 +08:00
chenxi
a6b3df378f buff显示逻辑 2023-04-19 22:20:07 +08:00