1017 Commits

Author SHA1 Message Date
xiekaidong
333df2ba7b 界面调整 2023-06-29 15:22:33 +08:00
xiekaidong
beeba7c094 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-unity into arena 2023-06-29 14:24:46 +08:00
xiekaidong
699a1aaa8f 竞技场战斗 2023-06-29 14:24:42 +08:00
CloudJ
c55f297bec 战令替换spine 2023-06-29 10:42:14 +08:00
xiekaidong
e3af176f17 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-unity into arena 2023-06-28 21:26:23 +08:00
xiekaidong
61ffa86b63 竞技场战斗界面 2023-06-28 21:26:20 +08:00
Fang
764645f4d5 逻辑补充 2023-06-28 18:36:07 +08:00
CloudJ
db4dcef851 战令 2023-06-28 14:22:48 +08:00
CloudJ
3010d6023e Merge branch 'arena' of git.juzugame.com:b6-client/b6-unity into arena
# Conflicts:
#	Assets/proto/protocol.bytes
2023-06-28 09:39:19 +08:00
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
CloudJ
7662d504d3 Merge branch 'dev' into arena 2023-06-27 17:25:54 +08:00
CloudJ
43dde38958 入门礼包 2023-06-27 17:24:53 +08:00
xiekaidong
4cd6868ac4 pvp 2023-06-26 15:29:06 +08:00
CloudJ
c444d3bea0 Merge branch 'arena_bounty' into arena 2023-06-26 11:27:10 +08:00
CloudJ
0b3ad13751 竞技场战令 2023-06-26 11:26:48 +08:00
Fang
38619144f6 显示fix 2023-06-21 15:17:57 +08:00
xiekaidong
0eb672b1e2 Merge branch 'dev' into arena 2023-06-21 15:07:00 +08:00
xiekaidong
a3bfc439fc Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-21 11:49:55 +08:00
xiekaidong
2f5501281c 审核模式下屏蔽兑换码按钮 2023-06-21 11:49:45 +08:00
chenxi
61bc84c827 针对底部导航栏上移一点 2023-06-21 11:48:56 +08:00
Fang
2ca53d8eb7 超框 2023-06-21 10:04:22 +08:00
chenxi
71c28be410 ab name 2023-06-20 22:21:42 +08:00
Fang
5ae07a4beb 超框 2023-06-20 21:40:25 +08:00
Fang
9810b012e0 超框 2023-06-20 21:08:40 +08:00
xiekaidong
dfd66067ec 更新配置 2023-06-20 21:03:38 +08:00
Fang
f702a32add ui调整 2023-06-20 20:42:04 +08:00
Fang
81bf681bf5 超框 2023-06-20 20:25:48 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
Fang
7c79623e92 超框处理 2023-06-20 18:43:08 +08:00
xiekaidong
5a66f35ef1 居中 2023-06-20 18:19:49 +08:00
xiekaidong
2ab208a361 兑换码弹窗,删除账号弹窗文本居中 2023-06-20 18:19:18 +08:00
xiekaidong
a1970cbbbb Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-20 18:10:08 +08:00
xiekaidong
5938486e5b bug修复 2023-06-20 18:09:54 +08:00
Fang
7afa4042e6 超框处理 2023-06-20 18:03:33 +08:00
Fang
e8a07e83d6 活动入口文本超框处理 2023-06-20 17:20:28 +08:00
xiekaidong
a2c06f8a11 多语言 2023-06-20 17:15:50 +08:00
Fang
b5087d80f1 ui还原 2023-06-20 15:00:41 +08:00
chenxi
622d9918d3 ab name 2023-06-20 14:32:36 +08:00
chenxi
6b89a68c12 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-20 14:31:18 +08:00
chenxi
505c25a640 资源检查 2023-06-20 14:31:12 +08:00
Fang
9792450158 ui结构还原 2023-06-20 14:28:40 +08:00
chenxi
2df3099570 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-20 14:25:46 +08:00
chenxi
578aa74b76 ui 2023-06-20 14:25:40 +08:00
Fang
0d624772e7 添加头像背景品质 2023-06-20 14:23:48 +08:00
Fang
ccd4276e6f 英雄编队拆分出来 2023-06-20 11:08:11 +08:00
chenxi
d9befbff7a 开几个语言 2023-06-20 10:08:24 +08:00
Fang
700b38d1fc 添加重命名与当前昵称相同提示 2023-06-19 16:25:25 +08:00
xiekaidong
2472a3e679 竞技场界面 2023-06-19 15:41:45 +08:00
Fang
dfa698542b 玩家头像抽象成独立cell 2023-06-19 14:59:02 +08:00
xiekaidong
9d609fd5c5 规范一下预制体 2023-06-19 14:43:22 +08:00