Fang c5ca672020 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge ...

# Conflicts:
#	Assets/arts/atlas/ui/battle.spriteatlas
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_board_23.png.meta
#	Assets/arts/textures/ui/common/common_board_24.png.meta
#	Assets/arts/textures/ui/common/common_board_25.png.meta
#	Assets/arts/textures/ui/common/common_dec_12.png.meta
#	Assets/arts/textures/ui/common/common_title_9.png.meta
#	Assets/arts/textures/ui/common/common_toast_2.png.meta

2023-05-29 18:23:09 +08:00

..

base_tips_ui.prefab

删除不用的资源

2023-05-04 11:33:11 +08:00

base_tips_ui.prefab.meta

整理项目

2023-04-03 11:04:31 +08:00

battle_skill_tips.prefab

技能tips

2023-05-22 15:59:35 +08:00

battle_skill_tips.prefab.meta

boss入场动画

2023-05-22 20:32:26 +08:00

box_tips.prefab

宝箱tips

2023-05-19 16:37:44 +08:00

box_tips.prefab.meta

boss入场动画

2023-05-22 20:32:26 +08:00

desc_tips.prefab

界面调整

2023-04-24 14:21:23 +08:00

desc_tips.prefab.meta

整理项目

2023-04-03 11:04:31 +08:00

help_tips.prefab

编译

2023-05-19 21:58:07 +08:00

help_tips.prefab.meta

整理项目

2023-04-03 11:04:31 +08:00

hero_fragment_tips.prefab

调整界面

2023-05-26 19:01:36 +08:00

hero_fragment_tips.prefab.meta

boss入场动画

2023-05-22 20:32:26 +08:00

item_tips.prefab

界面调整

2023-04-24 14:21:23 +08:00

item_tips.prefab.meta

整理项目

2023-04-03 11:04:31 +08:00

rewards_tips.prefab

tips等预制体修改

2023-05-26 15:43:40 +08:00

rewards_tips.prefab.meta

整理项目

2023-04-03 11:04:31 +08:00