780 Commits

Author SHA1 Message Date
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
xiekaidong
6f2edceb71 显示问题 2023-07-05 10:21:46 +08:00
xiekaidong
41e7e66d01 prefab资源检查,更新字体 2023-07-04 20:16:01 +08:00
xiekaidong
4f0174813a Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/atlas/ui/battle.asset
2023-07-04 20:13:58 +08:00
xiekaidong
1acaec8748 竞技场波次显示 2023-07-04 20:13:44 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
83b8dbe82d Merge branch 'dev' into arena
# Conflicts:
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/common/data_manager.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/module/chapter/chapter_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
#	Assets/lua/app/userdata/hero/hero_data.lua.bytes
#	Assets/proto/protocol.bytes
2023-07-04 15:33:45 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
c6bd34ace8 竞技场暂停界面 2023-07-04 15:06:20 +08:00
xiekaidong
5f4f9df282 Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-unity into arena
# Conflicts:
#	Assets/prefabs/ui/main_city/main_comp.prefab
2023-07-03 20:01:48 +08:00
xiekaidong
246783796b 竞技场弹窗礼包 2023-07-03 19:58:15 +08:00
CloudJ
ca2233e59a 替换战令图标 2023-07-03 19:19:12 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
007e810cf2 动效添加、替图 2023-07-03 17:17:36 +08:00
xiekaidong
680eeac913 更新pb 2023-07-03 16:23:27 +08:00
xiekaidong
b7fb8bff59 评价弹窗 2023-07-03 15:57:42 +08:00
Fang
813af1dff1 替图 2023-07-03 14:15:22 +08:00