1817 Commits

Author SHA1 Message Date
xiekaidong
de3c3aff19 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-20 21:02:16 +08:00
xiekaidong
63cfbbca68 bug修复 2023-06-20 21:02:13 +08:00
chenxi
8772cffbe4 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-20 20:33:52 +08:00
chenxi
855e94652f 响应安卓返回键 2023-06-20 20:33:48 +08:00
Fang
492f6bd8aa 超框 2023-06-20 20:19:12 +08:00
chenxi
1e8aebf944 注释和删除中文 2023-06-20 20:18:11 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
Fang
fe78b0db5d 超框处理 2023-06-20 18:42:10 +08:00
xiekaidong
bcf90d8834 显示bug修复 2023-06-20 18:30:33 +08:00
xiekaidong
f62e7bc79b bug修复 2023-06-20 18:08:35 +08:00
xiekaidong
d46fdec70a bug修复 2023-06-20 17:50:33 +08:00
xiekaidong
d9a6ccc527 bug修复 2023-06-20 16:28:51 +08:00
chenxi
55f72da67f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-20 15:44:34 +08:00
chenxi
9f8fff2cae 先屏蔽泰语 2023-06-20 15:44:31 +08:00
xiekaidong
749de33dae 更新配置 2023-06-20 15:29:34 +08:00
chenxi
ae544d1f3d 审核服上报 2023-06-20 14:52:35 +08:00
chenxi
6f33fc030a 更新配置 2023-06-20 14:43:14 +08:00
chenxi
93f580f1bf 资源白名单 2023-06-20 14:42:34 +08:00
Fang
364cec49b5 添加头像背景品质 2023-06-20 14:22:55 +08:00
chenxi
d4e717f392 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-20 11:48:18 +08:00
chenxi
fa7d250931 设置主城按钮的位置 2023-06-20 11:48:16 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
xiekaidong
4ea51dd7ec Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-20 11:35:26 +08:00
xiekaidong
5de785f28e bug修复 2023-06-20 11:35:23 +08:00
Fang
6e3c2523a5 英雄编队拆分出来 2023-06-20 11:02:45 +08:00
chenxi
eb3ec49d37 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-20 10:05:58 +08:00
chenxi
b57c80254b 西班牙语 2023-06-20 10:05:55 +08:00
xiekaidong
557475e3c4 参数 2023-06-19 17:46:06 +08:00
xiekaidong
33ba5c7ef1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 17:28:08 +08:00
xiekaidong
e573463879 增加网络通信失败的上报 2023-06-19 17:28:05 +08:00
Fang
ab4fbf3067 添加重命名与当前昵称相同提示 2023-06-19 16:25:18 +08:00
Fang
a008ab2282 fix 2023-06-19 16:07:31 +08:00
Fang
9a8a894b02 选择头像/头像框时,添加预览效果 2023-06-19 16:04:32 +08:00
Fang
45e6b4d856 跨天关闭副本关卡选择界面 2023-06-19 15:58:51 +08:00
xiekaidong
e7a0f46fcb 传参改一下 2023-06-19 15:14:56 +08:00
Fang
e5e12f9b0b 修改传参 2023-06-19 15:06:54 +08:00
Fang
cbec901af5 玩家头像抽象成独立cell 2023-06-19 14:58:15 +08:00
Fang
c2734a66fb 头像框显示fix 2023-06-19 14:38:39 +08:00
Fang
44c81c202d 副本入口显示fix 2023-06-19 14:17:13 +08:00
xiekaidong
2c9d262fee Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 12:03:20 +08:00
xiekaidong
ccab76a58b buff回合数等于1时也显示 2023-06-19 12:03:13 +08:00
Fang
579b7e0880 首通奖励显示fix 2023-06-19 11:57:44 +08:00
xiekaidong
c440197d57 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 11:55:16 +08:00
xiekaidong
f1b4a21ae6 免控 2023-06-19 11:55:10 +08:00
Fang
700c007d73 添加容错 2023-06-19 11:41:16 +08:00
chenxi
3c9a656192 获取firebasetoken 2023-06-19 11:18:15 +08:00
chenxi
d2f689e510 更新配置 2023-06-19 11:05:56 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
Fang
29e2e33888 结算界面相同奖励合并 2023-06-19 10:25:40 +08:00
xiekaidong
e8e17acbdf Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-19 10:13:08 +08:00