950 Commits

Author SHA1 Message Date
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
xiekaidong
f17eeb8e68 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-lua into arena 2023-06-26 15:28:43 +08:00
xiekaidong
a623c25f6f pvp战斗概念引入 2023-06-26 15:28:40 +08:00
CloudJ
fdc773df09 竞技场战令 2023-06-26 11:26:28 +08:00
xiekaidong
95c6377dbb bug修复 2023-06-21 17:15:18 +08:00
Fang
f47a35f2e7 显示fix 2023-06-21 15:17:14 +08:00
xiekaidong
a97447200d 审核模式下屏蔽兑换码按钮 2023-06-21 11:49:28 +08:00
chenxi
4c80f6ee3d 白名单和审核模式 2023-06-21 11:35:44 +08:00
xiekaidong
4d3f3834ca Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-20 21:18:26 +08:00
xiekaidong
d9ce4e162a 显示·问题 2023-06-20 21:18:23 +08:00
Fang
dbfbbc414d 超框 2023-06-20 21:07:21 +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
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
Fang
364cec49b5 添加头像背景品质 2023-06-20 14:22:55 +08:00
chenxi
fa7d250931 设置主城按钮的位置 2023-06-20 11:48:16 +08:00
Fang
6e3c2523a5 英雄编队拆分出来 2023-06-20 11:02:45 +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
Fang
700c007d73 添加容错 2023-06-19 11:41:16 +08:00
Fang
f3924368ce 头像昵称功能 2023-06-19 10:57:39 +08:00
Fang
29e2e33888 结算界面相同奖励合并 2023-06-19 10:25:40 +08:00
chenxi
13edfce314 界面调整 2023-06-16 17:32:01 +08:00
chenxi
15d01c9dde Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-16 17:16:01 +08:00
chenxi
bd6aa57fa1 界面调整 2023-06-16 17:15:58 +08:00
xiekaidong
35a4f25366 邮件容错 2023-06-16 16:59:54 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
xiekaidong
2f3bf147d1 修改显示 2023-06-16 11:33:20 +08:00
Fang
36b340003a 去掉文本冒号 2023-06-16 10:22:29 +08:00
xiekaidong
f2047f1833 战斗内相应安卓返回键 2023-06-16 10:14:20 +08:00
chenxi
c1b1d0748a 一些界面响应安卓返回键 2023-06-15 22:02:38 +08:00
xiekaidong
64498c02a6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-15 17:30:11 +08:00
xiekaidong
3723335174 每日挑战任务完成情况上报 2023-06-15 17:30:08 +08:00
Fang
a003b22ad4 副本刷新 2023-06-15 17:28:02 +08:00
Fang
e090ddf3a7 副本文本冒号fix 2023-06-15 17:24:19 +08:00
chenxi
c6361d035f Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-15 16:26:00 +08:00