2337 Commits

Author SHA1 Message Date
xiekaidong
7000ea6f30 bug修复 2023-04-24 10:51:22 +08:00
xiekaidong
a2001646f2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-24 10:37:44 +08:00
xiekaidong
f83b482908 引导条件判断修改 2023-04-24 10:37:36 +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
xiekaidong
a6489466e9 第二次刷新棋盘时,不下落空元素的bug修复 2023-04-24 09:46:42 +08:00
chenxi
3785afdf9c 更新配置 2023-04-24 09:39:09 +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
b14ca15ad2 更新配置 2023-04-23 21:26:22 +08:00
chenxi
d45affb47f 伤害数字高度 2023-04-23 21:25:17 +08:00
chenxi
4e512c95db buff特效 2023-04-23 21:16:55 +08:00
chenxi
eeb822a6ec 血条bug 2023-04-23 20:59:31 +08:00
chenxi
4277a4d116 fix bug 2023-04-23 19:33:59 +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
e88e056b50 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 17:39:04 +08:00
xiekaidong
7ad4420ac4 死局bug修复 2023-04-23 17:39:01 +08:00
chenxi
1f44d96a32 更新配置 2023-04-23 17:30:17 +08:00
xiekaidong
664b2b2590 bug和显示优化 2023-04-23 17:22:11 +08:00
xiekaidong
be0dcdb5b7 报错修复 2023-04-23 16:50:27 +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
cd28891fbe Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 16:09:56 +08:00
chenxi
66542a24f9 被动技能 2023-04-23 16:09:53 +08:00
xiekaidong
d4250cee32 bug修复 2023-04-23 15:57:53 +08:00
xiekaidong
69fc9ac72d 更新配置 2023-04-23 15:55:23 +08:00
xiekaidong
9f8b1faff1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 15:48:56 +08:00
xiekaidong
cc0eebfad8 英雄排序bug修复 2023-04-23 15:48:52 +08:00
chenxi
c4bf753d46 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 15:40:08 +08:00
chenxi
214d4c3494 技能 2023-04-23 15:40:05 +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
d8bf6274d8 动画 2023-04-23 14:19:44 +08:00
xiekaidong
73ad9f50f3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-23 12:10:27 +08:00
xiekaidong
106a3b4065 删除冗余代码 2023-04-23 12:10:20 +08:00
chenxi
e9d797c582 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-23 12:09:46 +08:00
chenxi
53d639cc3f 主城底部动画 2023-04-23 12:09:43 +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