593 Commits

Author SHA1 Message Date
xiekaidong
165a4a3226 bug修复 v0.1.0_android 2023-04-28 00:07:38 +08:00
xiekaidong
e54db9c128 体力回复上报 2023-04-28 00:00:32 +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
chenxi
bee9746efb Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-27 19:31:07 +08:00
chenxi
add9c57de1 启动界面 2023-04-27 19:31:04 +08:00
xiekaidong
e5b0ad98bc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 19:25:49 +08:00
xiekaidong
c251d1c3cf 不冻结棋盘 2023-04-27 19:25:46 +08:00
chenxi
92771ae95d 更新配置 2023-04-27 19:19:25 +08:00
chenxi
212dfb79bd combo 2023-04-27 19:14:25 +08:00
chenxi
549e285299 修改配置 2023-04-27 19:08:14 +08:00
chenxi
ab9b933521 combo动画 2023-04-27 18:38:19 +08:00
xiekaidong
766e680d3b 日志上报修改 2023-04-27 18:05:17 +08:00
xiekaidong
59019d9cab Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 17:43:30 +08:00
xiekaidong
c0fea24029 技能回收最多3个 2023-04-27 17:43:27 +08:00
chenxi
e724a9e523 更新配置 2023-04-27 16:54:57 +08:00
xiekaidong
40179a3e67 暂停界面显示修改 2023-04-27 16:30:09 +08:00
xiekaidong
a0e87d83ec 时间bug修复 2023-04-27 16:16:10 +08:00
xiekaidong
c9955a7816 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 15:24:27 +08:00
xiekaidong
c01cc5c9db bug修复 2023-04-27 15:24:24 +08:00
chenxi
de85c2b85c 资源栏 2023-04-27 14:40:03 +08:00
chenxi
da4704db1e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-27 14:26:47 +08:00
chenxi
76615c949d 适配 2023-04-27 14:26:44 +08:00
xiekaidong
383c6ac0dc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-27 14:23:25 +08:00
xiekaidong
331eb9d3bd bug修复 2023-04-27 14:23:22 +08:00
chenxi
6d06898082 刘海屏 2023-04-27 14:09:52 +08:00
chenxi
fe39dbe13c 连击bug 2023-04-27 11:27:31 +08:00
chenxi
d62c7b8d54 震屏bug 2023-04-27 11:00:06 +08:00
chenxi
f4afa2e96c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-27 10:10:22 +08:00
chenxi
3364785c3c 刘海屏 2023-04-27 10:10:18 +08:00
xiekaidong
64826cfefb 改一下执行顺序 2023-04-27 09:49:03 +08:00
xiekaidong
442f75efab 调整一下bi打印逻辑 2023-04-27 09:45:16 +08:00
chenxi
783ade4a69 刘海屏适配 2023-04-26 23:06:03 +08:00
chenxi
47a75078dc 更新配置 2023-04-26 22:32:08 +08:00
chenxi
343c6bdcc9 连击效果 2023-04-26 22:24:08 +08:00
xiekaidong
0a68394c62 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-04-26 21:46:39 +08:00
xiekaidong
8d9a22c5f4 刘海屏 2023-04-26 21:46:36 +08:00
chenxi
f97813e910 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 21:35:27 +08:00
chenxi
ecd18170cc combo表现 2023-04-26 21:35:24 +08:00
xiekaidong
cf3ee52e68 刘海屏适配 2023-04-26 21:19:27 +08:00
chenxi
88e5f4b0df 节点 2023-04-26 21:00:29 +08:00
chenxi
5f8c7e2295 combo 2023-04-26 20:47:02 +08:00
chenxi
fe18d54aa7 gm工具 2023-04-26 19:43:12 +08:00
chenxi
467e775042 战斗清理 2023-04-26 19:33:25 +08:00
chenxi
d0c0b398bc fix bug 2023-04-26 19:22:10 +08:00
chenxi
c5c4acb569 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-04-26 19:01:30 +08:00
chenxi
a903fe2950 更新配置 2023-04-26 19:01:23 +08:00
xiekaidong
6541221ff5 特效丢失问题 2023-04-26 18:48:05 +08:00
xiekaidong
0de502ba07 gm修改 2023-04-26 18:41:24 +08:00