797 Commits

Author SHA1 Message Date
xiekaidong
e8e887d987 Merge branch 'dev_20230725' into dungeon 2023-07-20 21:47:31 +08:00
xiekaidong
69dfb8ca23 支线副本 2023-07-20 21:47:04 +08:00
xiekaidong
a58933e708 支线副本战斗中的任务 2023-07-20 20:41:40 +08:00
Fang
26f13850c3 活动副本列表高度修改 2023-07-20 20:25:21 +08:00
xiekaidong
2ac3c391a1 Merge branch 'dev_20230725' into dungeon 2023-07-20 19:45:03 +08:00
xiekaidong
2e3da36d8f 支线副本 2023-07-20 19:44:49 +08:00
Fang
047f17e6f3 装备系统 2023-07-20 19:35:17 +08:00
xiekaidong
b14c7ff9cc 更新资源合pb 2023-07-20 17:40:52 +08:00
xiekaidong
b589275d49 支线副本资源 2023-07-20 15:01:54 +08:00
xiekaidong
1d5e277d77 支线副本界面 2023-07-19 21:22:42 +08:00
xiekaidong
ed0e82f254 上传资源 2023-07-19 20:17:00 +08:00
xiekaidong
0f6ae346b8 武器副本的一些界面 2023-07-19 16:52:39 +08:00
xiekaidong
24ca5afc0b 通用扫荡弹窗 2023-07-19 10:39:28 +08:00
xiekaidong
e979f97f20 一些界面 2023-07-18 20:59:57 +08:00
xiekaidong
b620281b43 更新配置和优化 2023-07-17 17:21:20 +08:00
xiekaidong
0eb34ca23c 战报阵容 2023-07-17 15:52:22 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
xiekaidong
bbda3be68f 出包前资源检查和设置ABName 2023-07-12 14:56:43 +08:00
Fang
fad7069e88 入门礼包界面显示fix 2023-07-12 10:20:01 +08:00
Fang
2eae3a5817 首充礼包界面显示fix 2023-07-12 10:13:05 +08:00
Fang
db01fdc430 预制体修改 2023-07-11 18:37:00 +08:00
xiekaidong
6576bb731b Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712
# Conflicts:
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
2023-07-11 15:46:43 +08:00
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
eb54d58240 碎片副本奖励展示优化 2023-07-11 14:53:58 +08:00
xiekaidong
057b8e7a73 Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712 2023-07-10 18:44:44 +08:00
xiekaidong
1f204e3f0f 英雄试玩 2023-07-10 18:44:40 +08:00
Fang
28661c3f03 竞技场布阵优化 2023-07-10 18:27:35 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
Fang
6b151b7f98 ui适配 2023-07-07 20:30:08 +08:00
Fang
6e1c66bd22 竞技场界面处理刘海屏 2023-07-07 20:25:22 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
868213e321 首包界面和登录界面 2023-07-07 15:48:31 +08:00
Fang
82c3dba141 火旺你又超框 2023-07-07 14:16:04 +08:00
Fang
18c7c1557d 超框 2023-07-07 12:03:57 +08:00
Fang
7e0c87de1a 竞技场挑战前判断阵容、超框 2023-07-07 11:55:27 +08:00
xiekaidong
1e461a0926 竞技场暂停界面可滑动 2023-07-07 11:44:02 +08:00
CloudJ
e7fd259f13 针对泰语调整 2023-07-06 20:15:09 +08:00
CloudJ
fecad6fb58 针对泰语调整 2023-07-06 20:14:18 +08:00
Fang
404575894e 多语言超框 2023-07-06 19:08:39 +08:00
xiekaidong
d669300ebf 资源替换 2023-07-06 15:12:10 +08:00
xiekaidong
3525b85d57 界面处理 2023-07-06 15:09:44 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
xiekaidong
4a76de5b95 竞技场弹出礼包 2023-07-06 10:16:03 +08:00
xiekaidong
02f4f8e828 竞技场弹出礼包 2023-07-05 21:01:33 +08:00
Fang
4c45a9db92 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:49:39 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
xiekaidong
4d2830317a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 11:23:30 +08:00
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +08:00
Fang
55793b1177 添加段位变化特效 2023-07-05 11:15:24 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00