435 Commits

Author SHA1 Message Date
chenxi
be01873d54 金猪 2023-05-05 11:57:41 +08:00
xiekaidong
7de12f99e5 搬运一下b5的网络模块 2023-05-05 10:42:56 +08:00
chenxi
d37872ad7b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-05 10:32:54 +08:00
chenxi
47cd13f4ad 一些系统代码 2023-05-05 10:32:50 +08:00
xiekaidong
07b11eea6f 节奏调整 2023-05-04 18:06:03 +08:00
xiekaidong
f9f5587e0c 多指操作的bug修复 2023-04-28 09:57:11 +08:00
xiekaidong
165a4a3226 bug修复 2023-04-28 00:07:38 +08:00
xiekaidong
dfdd798a0a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 20:15:28 +08:00
xiekaidong
8ef8955972 棋盘死局 2023-04-27 20:15:25 +08:00
chenxi
e45900ee6f 删除不用的代码 2023-04-27 20:06:36 +08:00
xiekaidong
c251d1c3cf 不冻结棋盘 2023-04-27 19:25:46 +08:00
xiekaidong
c0fea24029 技能回收最多3个 2023-04-27 17:43:27 +08:00
xiekaidong
a0e87d83ec 时间bug修复 2023-04-27 16:16:10 +08:00
xiekaidong
c01cc5c9db bug修复 2023-04-27 15:24:24 +08:00
chenxi
fe39dbe13c 连击bug 2023-04-27 11:27:31 +08:00
chenxi
ecd18170cc combo表现 2023-04-26 21:35:24 +08:00
chenxi
5f8c7e2295 combo 2023-04-26 20:47:02 +08:00
chenxi
467e775042 战斗清理 2023-04-26 19:33:25 +08:00
chenxi
d0c0b398bc fix bug 2023-04-26 19:22:10 +08:00
xiekaidong
ce5d8a9832 日志打点 2023-04-26 18:12:49 +08:00
chenxi
9b28cded0f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 14:17:11 +08:00
chenxi
54174019ee 技能加速 2023-04-26 14:17:08 +08:00
xiekaidong
e232a344cc 关闭一些特效,节省一下性能 2023-04-26 12:05:43 +08:00
xiekaidong
9e4db809a7 英雄升级红点 2023-04-26 11:43:16 +08:00
chenxi
8fc0090b76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 10:20:35 +08:00
chenxi
e60f269767 fix bug 2023-04-26 10:20:30 +08:00
xiekaidong
5a97438c08 怪物丢棋盘技能的动画 2023-04-26 09:47:56 +08:00
xiekaidong
1ced149768 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 23:27:21 +08:00
xiekaidong
a6bf141658 技能选择界面改到战斗界面中 2023-04-25 23:27:19 +08:00
chenxi
89bcd8ab01 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 23:02:14 +08:00
chenxi
0a6aab4681 护盾bufficon 没有消除的bug 2023-04-25 23:02:07 +08:00
xiekaidong
323d61ecd4 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-25 22:24:04 +08:00
xiekaidong
d52d40d741 显示优化 2023-04-25 22:24:01 +08:00
chenxi
21c9a1c13c 血量被动的bug 2023-04-25 22:13:23 +08:00
chenxi
9489cf9a6f fix bug 2023-04-25 22:01:19 +08:00
chenxi
399cfbfe92 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-25 21:30:42 +08:00
chenxi
65db643867 防守方buff消除 2023-04-25 21:30:36 +08:00
xiekaidong
6d4e23616d bug修复 2023-04-25 21:10:28 +08:00
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
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
c30fe950b2 章节障碍物和棋盘地图 2023-04-25 18:38:49 +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
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