736 Commits

Author SHA1 Message Date
chenxi
fd8151dfa6 成就可以领的时候的处理 2023-06-01 11:57:21 +08:00
Fang
22fa971494 spine动画报错fix 2023-06-01 11:46:45 +08:00
Fang
77a15a260f 主界面成长礼包图标动画添加 2023-06-01 11:08:44 +08:00
xiekaidong
b4c4d01312 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-01 10:06:01 +08:00
xiekaidong
f76520f9e5 显示问题修复 2023-06-01 10:05:58 +08:00
CloudJ
e2f2f8ca70 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 10:00:13 +08:00
CloudJ
83753326b6 抽卡表现 先临时提一波 2023-06-01 10:00:10 +08:00
chenxi
35a6bc5fa7 账号绑定 2023-05-31 22:23:04 +08:00
chenxi
2d22311031 金猪购买后提示异常的bug 2023-05-31 21:16:30 +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
85688b535c 调整表现 2023-05-31 16:30:40 +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
2b92ed0909 main界面模块切换逻辑重构 2023-05-31 14:40:08 +08:00
xiekaidong
fabf2372d4 显示问题 2023-05-31 14:30:17 +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
Fang
17b5f1129c 每日挑战界面调整、扣除次数修复 2023-05-31 10:24:51 +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
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
chenxi
6736d2634e tips数量显示错误 2023-05-30 22:40:13 +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
CloudJ
0b6af4320d Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/module_manager.lua
2023-05-30 19:35:22 +08:00
CloudJ
3baef020b0 替换首充界面 2023-05-30 19:34:37 +08:00
chenxi
afc0b58e39 七天乐天数没解锁的表现 2023-05-30 19:14:14 +08:00
chenxi
3121b7b59a 功能开启 2023-05-30 19:01:04 +08:00
chenxi
9feb05f0e6 解锁动画 2023-05-30 18:49:18 +08:00
chenxi
44085f6c23 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 18:47:19 +08:00
chenxi
54eaa39e85 解锁动画 2023-05-30 18:47:16 +08:00
xiekaidong
063df7972b 显示优化 2023-05-30 18:40:48 +08:00
xiekaidong
ba51eee559 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-05-30 18:32:49 +08:00
xiekaidong
5213236c5c boss出场动画 2023-05-30 18:32:46 +08:00
chenxi
3d47f56f9c Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-05-30 18:17:57 +08:00
chenxi
284f7ce3c7 设置界面里的邮箱加一个开启限制 2023-05-30 18:17:51 +08:00