1100 Commits

Author SHA1 Message Date
xiekaidong
e95d5d484c Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 21:13:37 +08:00
xiekaidong
ebb4a77f18 每日挑战bug修复 2023-05-31 21:13:35 +08:00
chenxi
dfd19f71f4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 20:54:00 +08:00
chenxi
51a60e0f1e 模块解锁 2023-05-31 20:53:57 +08:00
xiekaidong
3259281fe8 修复bug 2023-05-31 20:18:22 +08:00
xiekaidong
694ef22777 格子支持一下spine 2023-05-31 20:11:00 +08:00
xiekaidong
ededa19132 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 18:06:18 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
chenxi
4abd807b5f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 17:58:17 +08:00
chenxi
bd4672641a 作弊相关 2023-05-31 17:58:07 +08:00
Fang
7ff0afed6c 主界面按钮切换动画替换 2023-05-31 17:56:01 +08:00
chenxi
c996e1414e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 17:53:44 +08:00
chenxi
fe3c8849b8 删除账号 2023-05-31 17:53:41 +08:00
xiekaidong
12d73fc941 特效反转 2023-05-31 17:22:48 +08:00
xiekaidong
10bd5a422d bug修复 2023-05-31 16:43:46 +08:00
xiekaidong
85688b535c 调整表现 2023-05-31 16:30:40 +08:00
xiekaidong
9bfc156ad0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 16:04:49 +08:00
xiekaidong
8c779f826c bug修复 2023-05-31 16:04:46 +08:00
CloudJ
44a7937320 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 15:41:44 +08:00
CloudJ
298a0aaa1b 修复一些商城的bug 2023-05-31 15:41:42 +08:00
Fang
df7465a59c Merge branch 'fang/dev' into dev 2023-05-31 14:40:47 +08:00
Fang
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +08:00
chenxi
dadd9168ad Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 14:32:03 +08:00
chenxi
7569ae41d4 更新配置 2023-05-31 14:32:01 +08:00
xiekaidong
fabf2372d4 显示问题 2023-05-31 14:30:17 +08:00
xiekaidong
6571f6f480 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 14:23:51 +08:00
xiekaidong
89b35ce6aa 战斗相关bug修复 2023-05-31 14:23:48 +08:00
Fang
23bc8c3fae Merge branch 'fang/dev' into dev 2023-05-31 12:00:25 +08:00
Fang
325d906a3c 每日挑战跨天请求时机优化 2023-05-31 11:59:50 +08:00
CloudJ
14b1f256c9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 11:37:51 +08:00
CloudJ
87a178c50d 商城跨天重置逻辑调整 2023-05-31 11:37:48 +08:00
xiekaidong
19f2695c22 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 11:10:33 +08:00
xiekaidong
d4a1b5be93 描述修改 2023-05-31 11:10:29 +08:00
Fang
cf68aae601 Merge branch 'fang/dev' into dev 2023-05-31 10:27:47 +08:00
Fang
17b5f1129c 每日挑战界面调整、扣除次数修复 2023-05-31 10:24:51 +08:00
CloudJ
a9b115e2de Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 10:12:15 +08:00
CloudJ
521bcf9c1a 宝箱钥匙展示规则调整 2023-05-31 10:12:13 +08:00
chenxi
32857bc983 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 10:12:09 +08:00
chenxi
ce822360d2 七天乐界面调整 2023-05-31 10:11:45 +08:00
xiekaidong
02832f21f3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-31 09:49:37 +08:00
xiekaidong
6eee1909ad 网络接口 2023-05-31 09:49:29 +08:00
CloudJ
ff2fc67a42 礼包样式调整 2023-05-31 09:45:52 +08:00
CloudJ
eac7ce3f76 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-31 09:45:43 +08:00
xiekaidong
abc9c6af93 更新配置 2023-05-31 09:34:19 +08:00
chenxi
6736d2634e tips数量显示错误 2023-05-30 22:40:13 +08:00
chenxi
e86e750a1b 更新配置 2023-05-30 22:23:19 +08:00
chenxi
8aee4b4ed9 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 22:22:49 +08:00
chenxi
ad9f510a1e 七天乐 2023-05-30 22:22:46 +08:00
xiekaidong
c3c2e63ed6 层级调整 2023-05-30 22:04:32 +08:00
xiekaidong
981c440e5d 更新配置 2023-05-30 21:30:14 +08:00