209 Commits

Author SHA1 Message Date
xiekaidong
f3a6a84fea 资源替换 2023-07-21 18:12:45 +08:00
xiekaidong
8bf2ff1968 界面调整 2023-07-21 16:16:46 +08:00
xiekaidong
13754e2505 更新资源和资源检查 2023-07-20 21:51:04 +08:00
xiekaidong
2e3da36d8f 支线副本 2023-07-20 19:44:49 +08:00
xiekaidong
1d5e277d77 支线副本界面 2023-07-19 21:22:42 +08:00
xiekaidong
e979f97f20 一些界面 2023-07-18 20:59:57 +08:00
xiekaidong
0c47811ea5 上传一波资源 2023-07-18 16:35:35 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
868213e321 首包界面和登录界面 2023-07-07 15:48:31 +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
02f4f8e828 竞技场弹出礼包 2023-07-05 21:01:33 +08:00
xiekaidong
2f01e53cba 资源问题 2023-07-04 15:41:12 +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
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
xiekaidong
b7fb8bff59 评价弹窗 2023-07-03 15:57:42 +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
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
chenxi
622d9918d3 ab name 2023-06-20 14:32:36 +08:00
chenxi
ea2eb1778f 更新战斗资源 2023-06-19 18:52:28 +08:00
chenxi
175db26854 更新资源 2023-06-19 17:53:56 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
chenxi
7e46295e7f 重连逻辑 2023-06-16 21:33:43 +08:00
chenxi
0c06bb7b7e 界面调整 2023-06-16 17:16:39 +08:00
Fang
656f096c03 ui资源补充替换 2023-06-13 16:16:29 +08:00
chenxi
1fcad3fab3 ab 2023-06-06 21:37:55 +08:00
xiekaidong
1996dbf284 界面处理 2023-06-06 21:26:48 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
chenxi
0e93f635ba 红点位置 2023-06-05 20:41:57 +08:00
xiekaidong
9040c5d2ae 特效 2023-06-05 20:07:09 +08:00
CloudJ
a004ed6065 替换贴图 2023-06-05 19:40:34 +08:00
chenxi
d1ec620837 资源自动处理和ab name 2023-06-05 19:19:17 +08:00
Fang
229690f71b 结算界面动画替换、每日挑战背景替换 2023-06-05 19:08:31 +08:00
chenxi
7963b91bbd 七天乐换界面 2023-06-05 17:57:32 +08:00
chenxi
2f6f2861b8 金猪动画 2023-06-05 15:08:25 +08:00
CloudJ
4661996247 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 14:10:59 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
Fang
4d914f84b0 每日挑战替图 2023-06-05 11:47:32 +08:00
CloudJ
4d5ad2f87a 替换UI 2023-06-05 10:58:24 +08:00
chenxi
d286327501 资源处理 2023-06-05 10:03:45 +08:00
chenxi
54916a961e tips 2023-06-04 22:56:16 +08:00
chenxi
33edfece08 替换战令界面 2023-06-04 22:38:12 +08:00
chenxi
e879baf47b 替换ui 2023-06-04 22:19:28 +08:00
chenxi
253fa7f308 待机界面 2023-06-03 20:50:00 +08:00
chenxi
900bea3586 英雄列表界面 2023-06-03 19:59:22 +08:00