18 Commits

Author SHA1 Message Date
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
CloudJ
03424f4786 编译 2023-06-02 18:43:49 +08:00
Fang
5356a92634 功能解锁飞行动画 2023-06-02 18:36:05 +08:00
chenxi
18bbe0108f 编译 2023-06-01 11:14:34 +08:00
chenxi
a58c63a617 ab name 2023-05-30 21:15:29 +08:00
xiekaidong
1dbe6be188 禁锢效果 2023-05-26 18:09:46 +08:00
chenxi
1d27a51c7a 侧边栏红点 2023-05-26 17:02:16 +08:00
chenxi
7bfc35f9ab 七天乐 2023-05-26 15:40:44 +08:00
chenxi
0eaae0108e 编译 2023-05-26 12:52:15 +08:00
chenxi
b7f1dd92e0 金猪完成 2023-05-23 18:22:06 +08:00
chenxi
165eff0164 金猪和邮件 2023-05-23 17:05:47 +08:00
chenxi
02634ab2b9 金猪和邮件 2023-05-23 17:04:22 +08:00
chenxi
3894964322 编译 2023-05-22 21:25:43 +08:00
chenxi
c1f4013bb9 编译 2023-05-11 21:36:25 +08:00
chenxi
a517dbb7dc 删除多余的 2023-05-08 20:08:45 +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