977 Commits

Author SHA1 Message Date
chenxi
03e1e61fe5 merge 2023-05-08 11:23:52 +08:00
xiekaidong
925c8ffdea gm命令 2023-05-08 11:17:18 +08:00
chenxi
8196497626 联网 2023-05-08 11:11:07 +08:00
xiekaidong
18c83cfa0c 联网 2023-05-08 11:02:42 +08:00
xiekaidong
cb0e613e47 Merge branch 'dev' into net 2023-05-08 09:48:06 +08:00
xiekaidong
55ec0dd76c 联网 2023-05-08 09:47:58 +08:00
chenxi
ff6226a2df Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-06 11:34:43 +08:00
chenxi
04e6bdcfda 主城侧边栏 2023-05-06 11:34:41 +08:00
xiekaidong
2c341db47c 关卡修改 2023-05-06 10:37:02 +08:00
xiekaidong
5ee674bc60 界面宝箱调整 2023-05-06 10:04:32 +08:00
chenxi
5e2644ee6e 主城 2023-05-05 22:03:42 +08:00
chenxi
606ec1e5c0 缩进 2023-05-05 21:06:27 +08:00
chenxi
5e50f54e74 log使用不正确 2023-05-05 20:13:25 +08:00
xiekaidong
8801943ae3 整理一下代码,接入联网 2023-05-05 18:27:33 +08:00
xiekaidong
fc39a3487d 修改战斗逻辑 2023-05-05 17:05:38 +08:00
xiekaidong
e31bdec852 接入登录,但是暂时不接入数据 2023-05-05 16:37:12 +08:00
xiekaidong
476333add6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-05 16:17:16 +08:00
xiekaidong
bee5e556bf 服务器列表 2023-05-05 16:17:13 +08:00
chenxi
0fe15f3ba1 金猪 2023-05-05 15:39:06 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
d3b033ecd7 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-05 11:57:43 +08:00
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
4d2dd8a013 节奏 2023-05-04 17:41:52 +08:00
xiekaidong
71eaaecb56 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-04 17:32:56 +08:00
xiekaidong
8410ac0c78 调整一下下落动画节奏 2023-05-04 17:32:01 +08:00
chenxi
a430306743 整理时处理反了 2023-05-04 15:39:30 +08:00
chenxi
4727b573f1 整理 2023-05-04 15:19:55 +08:00
chenxi
8548033f82 注释 2023-05-04 14:23:57 +08:00
chenxi
bfbd039d08 删除不用的注释 2023-05-04 14:22:23 +08:00
chenxi
bef87baceb 货币获取上报总数量 2023-04-28 18:22:27 +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
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