1297 Commits

Author SHA1 Message Date
xiekaidong
cc77a77193 消除显示优化 2023-06-05 20:51:50 +08:00
xiekaidong
d4cf1c58fd 提示 2023-06-05 20:08:36 +08:00
xiekaidong
0c420e840b 特效 2023-06-05 20:06:51 +08:00
CloudJ
2a5d350837 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 19:41:12 +08:00
CloudJ
8f27d79134 配置表 2023-06-05 19:41:10 +08:00
chenxi
96e4d6b279 box tips里面的感叹号 2023-06-05 19:39:21 +08:00
chenxi
f4876233ae bug 2023-06-05 19:08:23 +08:00
chenxi
033d412551 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 19:07:43 +08:00
chenxi
74f91dabae 上报 2023-06-05 19:07:40 +08:00
Fang
9bead326d2 结算界面动画替换 2023-06-05 19:07:07 +08:00
chenxi
e4ebe8884e 英雄详情界面 2023-06-05 18:52:42 +08:00
chenxi
baa1c4280e Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 18:32:54 +08:00
chenxi
16975e700e 充值后没有绑定则提示绑定 2023-06-05 18:32:51 +08:00
Fang
404fa2ca30 结算界面金猪动画 2023-06-05 18:29:22 +08:00
xiekaidong
23a7504e80 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 18:24:10 +08:00
xiekaidong
0441e09d12 bug修复 2023-06-05 18:24:06 +08:00
chenxi
664607d1e1 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 18:07:46 +08:00
chenxi
a0da15d140 七天乐界面 2023-06-05 18:07:40 +08:00
xiekaidong
eb588d4e33 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 18:02:18 +08:00
xiekaidong
5d5ba37a4b 支付成功时没绑定账号,提示绑定账号 2023-06-05 18:02:12 +08:00
chenxi
38aa2b8ffa 七天乐替换界面 2023-06-05 17:56:35 +08:00
Fang
c5c36cbb86 更表 2023-06-05 17:29:36 +08:00
CloudJ
f3c035b5c4 替换礼包spine 2023-06-05 17:21:34 +08:00
Fang
d41a0f7744 战斗结算界面动画 2023-06-05 17:15:51 +08:00
chenxi
11c14276b9 英雄详情 2023-06-05 17:00:02 +08:00
chenxi
449139eaf3 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 16:52:46 +08:00
chenxi
6c738a5641 奖励界面 2023-06-05 16:52:40 +08:00
CloudJ
6c673d7977 调整召唤动画 2023-06-05 16:50:54 +08:00
CloudJ
ec58c080ad Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 16:27:44 +08:00
CloudJ
7f2704969e 商城标题刘海适配 2023-06-05 16:27:42 +08:00
chenxi
6e20c37abf Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 16:25:44 +08:00
chenxi
30d134ecc8 调整一下侧边栏的按钮顺序 2023-06-05 16:25:41 +08:00
xiekaidong
e3420eeb8a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 16:24:22 +08:00
xiekaidong
628da8aade 音效容错 2023-06-05 16:24:06 +08:00
chenxi
253ae25580 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 16:23:58 +08:00
chenxi
5216c8ff69 侧边栏优化 2023-06-05 16:23:55 +08:00
xiekaidong
9f6fbf2903 优化一下 2023-06-05 16:20:52 +08:00
xiekaidong
45ddce3dc3 向左遍历棋盘 2023-06-05 16:17:46 +08:00
xiekaidong
f081edb320 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 16:13:08 +08:00
xiekaidong
f8871a3109 加一个GM快速查看棋盘 2023-06-05 16:13:05 +08:00
CloudJ
b8a3e397a7 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 16:01:22 +08:00
CloudJ
2f1440bf74 UI调整 2023-06-05 16:01:19 +08:00
xiekaidong
d7e50de44d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-05 15:54:17 +08:00
xiekaidong
e85af27bf2 更新配置 2023-06-05 15:54:09 +08:00
chenxi
326cde1c4b Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 15:49:48 +08:00
chenxi
0037311647 英雄大cell 2023-06-05 15:49:43 +08:00
xiekaidong
d08bc4b2b2 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
#	lua/app/common/pay_manager.lua
2023-06-05 15:36:07 +08:00
xiekaidong
7acd32c46c 更改奖励上报 2023-06-05 15:35:05 +08:00
CloudJ
2342df9b36 首充礼包条件修改 2023-06-05 15:20:29 +08:00
chenxi
6dc6c75236 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-05 15:07:57 +08:00