356 Commits

Author SHA1 Message Date
chenxi
df3a225ebd 任务 2023-05-09 17:41:27 +08:00
chenxi
4b6ee24312 购买体力 2023-05-09 14:52:36 +08:00
chenxi
d930b3ded7 设置 2023-05-08 21:45:28 +08:00
chenxi
eb1d1b9fbf 联网 2023-05-08 14:39:11 +08:00
chenxi
1a117affae Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-08 11:38:53 +08:00
chenxi
d0687f7d37 数据 2023-05-08 11:35:35 +08:00
xiekaidong
925c8ffdea gm命令 2023-05-08 11:17:18 +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
04e6bdcfda 主城侧边栏 2023-05-06 11:34:41 +08:00
xiekaidong
2c341db47c 关卡修改 2023-05-06 10:37:02 +08:00
chenxi
5e2644ee6e 主城 2023-05-05 22:03:42 +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
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
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