780 Commits

Author SHA1 Message Date
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
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
chenxi
8d9b16604b 资源修复 2023-06-16 21:53:59 +08:00
chenxi
7a82aff2db 界面调整 2023-06-16 17:36:27 +08:00
chenxi
0c06bb7b7e 界面调整 2023-06-16 17:16:39 +08:00
chenxi
bb1458d9f5 界面调整 2023-06-16 16:38:23 +08:00
chenxi
da087b9dff 维护公告 2023-06-16 16:17:09 +08:00
chenxi
e3d7fad227 公告 2023-06-16 15:11:05 +08:00
chenxi
569843691f 弹出框 2023-06-15 16:44:31 +08:00
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +08:00
xiekaidong
2b3f4255a0 buff显示修改 2023-06-15 14:18:22 +08:00
Fang
a5ca47d201 金币副本新增boss抗性 2023-06-15 10:47:11 +08:00
xiekaidong
a3a9ac1fb7 连携提示 2023-06-14 18:21:48 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/global.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
chenxi
0dd3747804 维护公告界面 2023-06-13 21:01:23 +08:00
chenxi
481af73ddb cdkey临时界面 2023-06-13 20:54:29 +08:00
Fang
0308d2f57d ui细节调整 2023-06-13 17:34:28 +08:00
Fang
656f096c03 ui资源补充替换 2023-06-13 16:16:29 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
chenxi
14167e5736 金猪倒计时 2023-06-13 12:00:06 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
chenxi
c64dcdf8f9 苹果账号绑定界面 2023-06-13 10:41:58 +08:00
Fang
9dc58eea91 奖励显示逻辑补充 2023-06-12 18:33:28 +08:00
Fang
f1f805feaf 修改预制体 2023-06-12 17:14:36 +08:00
Fang
6aa23549f5 活动副本 2023-06-12 15:40:03 +08:00
chenxi
92f0b087c9 编译 2023-06-08 21:38:54 +08:00
xiekaidong
36490e20fa Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 21:26:51 +08:00
xiekaidong
1996dbf284 界面处理 2023-06-06 21:26:48 +08:00
chenxi
0f1588059e 登录界面 2023-06-06 21:12:12 +08:00
chenxi
aef3b9834a 战令界面微调 2023-06-06 18:39:34 +08:00
chenxi
b88815d16f 战令界面 2023-06-06 17:32:58 +08:00
chenxi
19ebceb54b 刷新一下 2023-06-06 15:10:31 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
xiekaidong
c10a2e6b71 显示优化 2023-06-06 11:32:22 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +08:00
chenxi
b409ab7e86 资源 2023-06-06 10:35:12 +08:00
CloudJ
ee24231070 替换界面 2023-06-06 10:16:30 +08:00