698 Commits

Author SHA1 Message Date
xiekaidong
02c18688f9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 20:38:20 +08:00
xiekaidong
3a4a6b4e0b 随机消除元素bug修复 2023-04-25 20:38:17 +08:00
chenxi
3caafceabd 更新配置 2023-04-25 20:19:09 +08:00
chenxi
84ee036fea fix bug 2023-04-25 20:18:17 +08:00
chenxi
cae53d753f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 19:51:54 +08:00
chenxi
4bf666b800 fix bug 2023-04-25 19:51:48 +08:00
xiekaidong
d71c41b40c bug修复 2023-04-25 18:46:24 +08:00
xiekaidong
3dc6d91f33 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 18:38:52 +08:00
xiekaidong
c30fe950b2 章节障碍物和棋盘地图 2023-04-25 18:38:49 +08:00
chenxi
96cd67123b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 18:17:42 +08:00
chenxi
41330be8c2 上报 2023-04-25 18:17:39 +08:00
xiekaidong
f8044eb0de Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 18:12:44 +08:00
xiekaidong
51f600d11c 增加一个生效对象 2023-04-25 18:12:37 +08:00
chenxi
b71b1df606 正式代码 2023-04-25 18:11:31 +08:00
chenxi
60f6b5c8ef 更新配置 2023-04-25 18:04:17 +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
9ae6d709e7 fix bug 2023-04-25 17:47:05 +08:00
chenxi
79b546d2f8 更新配置 2023-04-25 17:37:27 +08:00
chenxi
2600c22d08 更新配置 2023-04-25 16:21:21 +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
xiekaidong
c1ed407a0f 显示修改 2023-04-25 15:49:24 +08:00
xiekaidong
bbcf5c20ea Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 15:24:11 +08:00
xiekaidong
87929514ea 界面退出时清除状态 2023-04-25 15:24:02 +08:00
chenxi
2742782204 配置 2023-04-25 15:20:05 +08:00
xiekaidong
d00fd19352 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 15:08:35 +08:00
xiekaidong
9479a931f6 技能生成特效 2023-04-25 15:08:28 +08:00
chenxi
6f1792305a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 15:05:35 +08:00
chenxi
ad72230fce 胜利失败音效 2023-04-25 15:05:33 +08:00
xiekaidong
1e1d9cd913 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 14:51:25 +08:00
xiekaidong
6ae98b2b79 曲线 2023-04-25 14:51:21 +08:00
chenxi
1e99c43df8 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 14:40:34 +08:00
chenxi
b108325c9f 更新配置 2023-04-25 14:40:32 +08:00
xiekaidong
22f4a86946 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 14:40:16 +08:00
xiekaidong
2a047cd6a2 删除下落动画 2023-04-25 14:40:13 +08:00
chenxi
799835c9be 登录 2023-04-25 14:38:12 +08:00
chenxi
92bba160cc 登录 2023-04-25 14:15:30 +08:00
chenxi
19545bcb3d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 14:13:33 +08:00
chenxi
57dc62ef4d 登录 2023-04-25 14:13:30 +08:00
xiekaidong
216363c45c 特效 2023-04-25 13:01:22 +08:00
chenxi
78f0b9d91b 进度条规则 2023-04-25 12:08:46 +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
53475739c0 体力恢复 2023-04-25 11:08:24 +08:00
chenxi
89cdcef44f 护盾buff 2023-04-25 10:42:16 +08:00
chenxi
5c4d0bf6b7 经验加成 2023-04-25 10:29:17 +08:00