254 Commits

Author SHA1 Message Date
chenxi
802a3670e2 护盾伤害 2023-04-24 15:37:04 +08:00
chenxi
fe492541a4 伤害反弹 2023-04-24 15:11:55 +08:00
chenxi
c02e769d4a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-24 14:56:05 +08:00
chenxi
12fcdaab85 fix bug 2023-04-24 14:56:00 +08:00
xiekaidong
63f4851117 界面调整 2023-04-24 14:21:10 +08:00
xiekaidong
43ef1a5a8d 显示优化 2023-04-24 14:16:19 +08:00
chenxi
b0f1945e59 fix bug 2023-04-24 11:19:05 +08:00
chenxi
9ac9f8cb10 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-24 10:30:43 +08:00
chenxi
7508f219d2 体力 2023-04-24 10:30:40 +08:00
xiekaidong
eb73f1b943 bug修复 2023-04-24 10:14:23 +08:00
chenxi
2ba4db58ae 持续buff特效 2023-04-23 22:08:34 +08:00
chenxi
ffe9c309fc 特效bug 2023-04-23 21:37:09 +08:00
chenxi
d45affb47f 伤害数字高度 2023-04-23 21:25:17 +08:00
chenxi
4e512c95db buff特效 2023-04-23 21:16:55 +08:00
chenxi
239132c0a6 fix bug 2023-04-23 19:24:51 +08:00
chenxi
88e64acf32 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 19:20:47 +08:00
chenxi
c0b2c67fdd 技能音效 2023-04-23 19:20:44 +08:00
xiekaidong
cd5ec5362a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 19:02:47 +08:00
xiekaidong
b250299dc4 消除技能特效 2023-04-23 19:02:44 +08:00
chenxi
2362bb2f59 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 18:45:07 +08:00
chenxi
984b4e2b50 伤害数字高度 2023-04-23 18:45:04 +08:00
xiekaidong
eb3dfd49e8 增加一个gm 2023-04-23 18:33:21 +08:00
xiekaidong
7ad4420ac4 死局bug修复 2023-04-23 17:39:01 +08:00
xiekaidong
664b2b2590 bug和显示优化 2023-04-23 17:22:11 +08:00
xiekaidong
6d535e1dc4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 16:18:09 +08:00
xiekaidong
50d47a33fe 引导特效消失得问题 2023-04-23 16:18:01 +08:00
chenxi
66542a24f9 被动技能 2023-04-23 16:09:53 +08:00
xiekaidong
5dd14eb4db Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 15:29:24 +08:00
xiekaidong
495f02084d 动画 2023-04-23 15:29:22 +08:00
chenxi
8575d48b37 护盾 2023-04-23 15:15:50 +08:00
xiekaidong
c4801087bd Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 12:07:45 +08:00
xiekaidong
153cf72fb2 优化排序 2023-04-23 12:07:42 +08:00
chenxi
087618ab84 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 11:44:02 +08:00
chenxi
15226b6b0e 伤害数字 2023-04-23 11:43:59 +08:00
xiekaidong
26fab280b3 随机棋盘bug修复 2023-04-23 11:35:20 +08:00
xiekaidong
56745e7a0f bug修复 2023-04-23 10:53:18 +08:00
xiekaidong
1a8007c8e6 资源替换 2023-04-23 09:56:05 +08:00
xiekaidong
f6b7f954c2 延迟结算 2023-04-22 00:58:27 +08:00
xiekaidong
34312754ef 修改特效,消除影响改为十字形 2023-04-22 00:46:36 +08:00
xiekaidong
965af02e94 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-22 00:26:57 +08:00
xiekaidong
92766aa8cd 动画修改 2023-04-22 00:26:54 +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
7851d2a5d2 2023-04-21 23:10:29 +08:00
chenxi
594d5ac6c6 伤害统计 2023-04-21 22:41:32 +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
xiekaidong
0be49bdc32 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-21 21:40:47 +08:00