15 Commits

Author SHA1 Message Date
xiekaidong
1d657e3128 boss入场动画 2023-05-22 20:32:26 +08:00
chenxi
61ebfcf99f 空邮件的表现 2023-05-22 12:01:21 +08:00
chenxi
54af22fa60 邮箱 2023-05-22 11:37:14 +08:00
xiekaidong
ee9f6680b9 更新资源 2023-05-19 20:00:57 +08:00
chenxi
d880ae0f51 多语言 2023-05-17 16:26:56 +08:00
chenxi
9fb7063c1e 语言 2023-05-09 11:05:35 +08:00
chenxi
74ef9a6069 主城UI 2023-05-09 09:44:58 +08:00
chenxi
f055493dff 设置界面 2023-05-08 21:46:27 +08:00
chenxi
5ab1e11c6b 设置界面 2023-05-08 21:11:13 +08:00
chenxi
b781f3a483 设置 2023-05-08 20:40:33 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +08:00
xiekaidong
33cad880c9 联网 2023-05-08 11:03:17 +08:00
chenxi
b6c15f641d 编译 2023-05-05 15:39:51 +08:00
chenxi
4809253845 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/textures/ui/common.meta
#	Assets/arts/textures/ui/common/common_alpha.png.meta
#	Assets/arts/textures/ui/common/common_arrow_3.png
#	Assets/arts/textures/ui/common/common_arrow_3.png.meta
#	Assets/arts/textures/ui/common/common_arrow_4.png
#	Assets/arts/textures/ui/common/common_arrow_4.png.meta
#	Assets/arts/textures/ui/common/common_bg_0.png.meta
#	Assets/arts/textures/ui/common/common_bg_3.png
#	Assets/arts/textures/ui/common/common_bg_3.png.meta
#	Assets/arts/textures/ui/common/common_board_10.png
#	Assets/arts/textures/ui/common/common_board_10.png.meta
#	Assets/arts/textures/ui/common/common_board_6.png
#	Assets/arts/textures/ui/common/common_board_6.png.meta
#	Assets/arts/textures/ui/common/common_board_7.png
#	Assets/arts/textures/ui/common/common_board_7.png.meta
#	Assets/arts/textures/ui/common/common_btn_2.png
#	Assets/arts/textures/ui/common/common_btn_2.png.meta
#	Assets/arts/textures/ui/common/common_btn_3.png
#	Assets/arts/textures/ui/common/common_btn_3.png.meta
#	Assets/arts/textures/ui/common/common_check_1.png
#	Assets/arts/textures/ui/common/common_check_1.png.meta
#	Assets/arts/textures/ui/common/common_chest_1.png
#	Assets/arts/textures/ui/common/common_chest_1.png.meta
#	Assets/arts/textures/ui/common/common_dec_1.png
#	Assets/arts/textures/ui/common/common_dec_1.png.meta
#	Assets/arts/textures/ui/common/common_hp.png
#	Assets/arts/textures/ui/common/common_hp.png.meta
#	Assets/arts/textures/ui/common/common_inf.png
#	Assets/arts/textures/ui/common/common_inf.png.meta
#	Assets/arts/textures/ui/common/common_lock_2.png
#	Assets/arts/textures/ui/common/common_lock_2.png.meta
#	Assets/arts/textures/ui/common/common_progress_4.png
#	Assets/arts/textures/ui/common/common_progress_4.png.meta
2023-04-07 15:27:09 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00