549 Commits

Author SHA1 Message Date
chenxi
b031da285f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 17:42:28 +08:00
chenxi
8aaa2565cf 删除无用代码 2023-06-01 17:42:25 +08:00
xiekaidong
9429f79a1e bug修复 2023-06-01 16:35:23 +08:00
xiekaidong
30908425ca Merge branch 'battle' into dev 2023-06-01 16:31:14 +08:00
xiekaidong
2bc46d2d30 优化战斗中的table 2023-06-01 16:29:01 +08:00
Fang
4f34c587ba 【玩家升级】界面表现动效 2023-06-01 16:09:21 +08:00
chenxi
03d2625a0c 侧边栏 2023-06-01 15:35:38 +08:00
chenxi
7fccb1c162 merge 2023-06-01 15:03:43 +08:00
chenxi
7ddcbad7fa 侧边栏spine逻辑调整 2023-06-01 15:03:22 +08:00
Fang
83143a0933 报错fix 2023-06-01 14:38:15 +08:00
CloudJ
859fb30001 抽卡表现 2023-06-01 14:34:50 +08:00
chenxi
d0108424b1 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 11:58:41 +08:00
chenxi
8f23516ad4 成就spine 2023-06-01 11:58:35 +08:00
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