763 Commits

Author SHA1 Message Date
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
xiekaidong
d4828dc537 评价弹窗 2023-07-03 11:34:53 +08:00
CloudJ
4adea4f216 更换战令图片 2023-07-03 10:28:11 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
Fang
f25b6ceb6c fix 2023-06-30 18:46:11 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
Fang
f8a386d933 ui动画、结算界面逻辑 2023-06-30 16:50:29 +08:00
xiekaidong
c2a5538386 战斗处理 2023-06-30 16:04:06 +08:00
xiekaidong
ad57cef6ea 竞技场节奏调整 2023-06-30 14:46:02 +08:00
xiekaidong
cbca95b111 战斗bug修复 2023-06-29 21:25:44 +08:00
xiekaidong
09b9d170bb 竞技场敌方自动战斗 2023-06-29 20:52:15 +08:00
Fang
b9132c8cd5 动画文件修改 2023-06-29 16:29:04 +08:00
Fang
54d0156a08 anim 2023-06-29 16:14:05 +08:00
Fang
aae1ec0c8c 完善逻辑 2023-06-29 16:10:22 +08:00
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