280 Commits

Author SHA1 Message Date
chenxi
57dc62ef4d 登录 2023-04-25 14:13:30 +08:00
chenxi
f58563c1c3 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 11:58:18 +08:00
chenxi
01a5bf9e16 增加最大血量 2023-04-25 11:58:16 +08:00
xiekaidong
6c4da1d8ee Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 11:50:04 +08:00
xiekaidong
32c6f2824d 棋盘消除特效 2023-04-25 11:50:00 +08:00
chenxi
89cdcef44f 护盾buff 2023-04-25 10:42:16 +08:00
chenxi
5c4d0bf6b7 经验加成 2023-04-25 10:29:17 +08:00
xiekaidong
09e85e9dba 棋盘技能 2023-04-25 09:56:03 +08:00
chenxi
4516cc07ff Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-24 21:46:44 +08:00
chenxi
f01edc8f5a 暴击 2023-04-24 21:46:39 +08:00
xiekaidong
274552a558 bug修复 2023-04-24 21:46:16 +08:00
chenxi
7f3c65c7ef 体力恢复 2023-04-24 21:20:55 +08:00
xiekaidong
405aad10f7 消除bug修复 2023-04-24 20:49:53 +08:00
xiekaidong
6c9483b1aa 修复一些bug 2023-04-24 20:18:17 +08:00
xiekaidong
4bda42441f 死局问题修复 2023-04-24 19:29:07 +08:00
xiekaidong
bbcaeea573 bug修复 2023-04-24 18:08:15 +08:00
xiekaidong
31eabc884a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-24 18:01:42 +08:00
xiekaidong
d5f2c92d8a 烟雾特效 2023-04-24 18:01:39 +08:00
chenxi
1c774b711b fix bug 2023-04-24 17:47:57 +08:00
xiekaidong
090f5e549d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-24 17:38:30 +08:00
xiekaidong
188ff47265 修改主界面 2023-04-24 17:38:22 +08:00
chenxi
b96d0f5cdf Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-24 17:24:16 +08:00
chenxi
c4f0fa9afa 属性伤害bug 2023-04-24 17:24:13 +08:00
xiekaidong
78d37be3d4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-24 17:16:28 +08:00
xiekaidong
5844567d70 特效 2023-04-24 17:16:26 +08:00
chenxi
a5574d91d4 这一版先去掉援助攻击 2023-04-24 16:42:11 +08:00
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