diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray.png deleted file mode 100644 index 87f7a6a0..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_small.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_small.png deleted file mode 100644 index 4f7e3380..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_small.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_close_logo.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_close_logo.png deleted file mode 100644 index e09a664a..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_close_logo.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_stop_logo.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_stop_logo.png deleted file mode 100644 index 4bc01696..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_stop_logo.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/UI/old.meta b/popcorn/Assets/MyGame/Resource/UI/old.meta new file mode 100644 index 00000000..5c8dbc08 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f950a6a7b6edf846a8f11c426f443dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Failure.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Failure.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Failure.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Failure.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Failure.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Failure.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Failure.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Failure.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Perfect.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Perfect.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Perfect.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Perfect.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Perfect.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Perfect.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_Perfect.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_Perfect.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_background.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_background.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_background.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_background.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_background.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_background.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_background.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_background.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_burnt.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_burnt.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_burnt.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_burnt.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_burnt.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_burnt.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_burnt.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_burnt.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_jump.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_jump.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_jump.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_jump.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_jump.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_jump.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_FailureMeter_effect_jump.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_FailureMeter_effect_jump.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_cold.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_cold.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_cold.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_cold.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_cold.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_cold.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_cold.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_cold.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_hot.png b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_hot.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_hot.png rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_hot.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_hot.png.meta b/popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_hot.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter_icon_hot.png.meta rename to popcorn/Assets/MyGame/Resource/UI/old/ui_cooking_TemperatureMeter_icon_hot.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe.meta b/popcorn/Assets/MyGame/Resource/UI/recipe.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_MoneyFrame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_MoneyFrame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_MoneyFrame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_MoneyFrame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Background.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Background.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Background.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Background.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Background.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Background.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Background.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Background.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Handle.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Handle.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Handle.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Handle.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Handle.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Handle.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Handle.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_ScrollBar_Handle.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_PopcornStand.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_PopcornStand.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_PopcornStand.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_PopcornStand.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_PopcornStand.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_PopcornStand.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_PopcornStand.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_PopcornStand.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_Unreleased_key.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_Unreleased_key.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_Unreleased_key.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_Unreleased_key.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_Unreleased_key.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_Unreleased_key.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_Unreleased_key.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_Unreleased_key.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_Dither.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_Dither.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_Dither.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_Dither.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_FryingPan_Frame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_NumberFrame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_NumberFrame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_NumberFrame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_NumberFrame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_NumberFrame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_NumberFrame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_NumberFrame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_NumberFrame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_TitleFrame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_TitleFrame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_TitleFrame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_TitleFrame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_TitleFrame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_TitleFrame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_TitleFrame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_TitleFrame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detai_lTitleFrame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detail.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detail.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detail.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detail.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detail.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detail.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_detail.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_detail_pop_detail.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Blur.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Blur.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Blur.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Blur.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Blur.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Blur.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Blur.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Blur.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Dither.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Dither.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Dither.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_Dither.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_MaterialFrame.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_MaterialFrame.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_MaterialFrame.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_MaterialFrame.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_MaterialFrame.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_MaterialFrame.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_MaterialFrame.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_MaterialFrame.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Unreleased.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail_Unreleased.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Unreleased.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail_Unreleased.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Unreleased.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail_Unreleased.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Unreleased.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_pop_detail_Unreleased.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_title.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_title.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_title.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_title.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_title.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_title.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_title.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_Main_recipe_title.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Arrow.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Arrow.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Arrow.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Arrow.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Arrow.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Blue_small.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Blue_small.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Blue_small.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_Blue_small.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray.png new file mode 100644 index 00000000..802411c5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray_small.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray_small.png new file mode 100644 index 00000000..61fa3eae Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray_small.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_small.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray_small.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_gray_small.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_gray_small.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_close_logo.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_close_logo.png new file mode 100644 index 00000000..d3132313 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_close_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_close_logo.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_close_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_close_logo.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_close_logo.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_make_logo.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo.png rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_make_logo.png diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_make_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_make_logo.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_make_logo.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_stop_logo.png b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_stop_logo.png new file mode 100644 index 00000000..9ad4328c Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_stop_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_stop_logo.png.meta b/popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_stop_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_icon_stop_logo.png.meta rename to popcorn/Assets/MyGame/Resource/UI/recipe/ui_button_icon_stop_logo.png.meta diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 05052f01..907ccb21 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -337,6 +337,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 149181931} m_Modifications: + - target: {fileID: 334932330918419862, guid: 5e326851a49dc4fd9b51d54fb58f4e02, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.033 + objectReference: {fileID: 0} + - target: {fileID: 450955862584847016, guid: 5e326851a49dc4fd9b51d54fb58f4e02, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.13 + objectReference: {fileID: 0} - target: {fileID: 5984684976362293252, guid: 5e326851a49dc4fd9b51d54fb58f4e02, type: 3} propertyPath: m_RootOrder @@ -397,6 +407,21 @@ PrefabInstance: propertyPath: m_Name value: Center objectReference: {fileID: 0} + - target: {fileID: 7492351322203168974, guid: 5e326851a49dc4fd9b51d54fb58f4e02, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.03 + objectReference: {fileID: 0} + - target: {fileID: 7999896198779198817, guid: 5e326851a49dc4fd9b51d54fb58f4e02, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.06 + objectReference: {fileID: 0} + - target: {fileID: 8429967330658841282, guid: 5e326851a49dc4fd9b51d54fb58f4e02, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.28 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e326851a49dc4fd9b51d54fb58f4e02, type: 3} --- !u!4 &279224990 stripped @@ -2743,6 +2768,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 149181931} m_Modifications: + - target: {fileID: 334932330918419862, guid: 0949d70c1a73342ca8955c7f59c04fe0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.033 + objectReference: {fileID: 0} - target: {fileID: 5984684976362293252, guid: 0949d70c1a73342ca8955c7f59c04fe0, type: 3} propertyPath: m_RootOrder @@ -2803,6 +2833,11 @@ PrefabInstance: propertyPath: m_Name value: Top objectReference: {fileID: 0} + - target: {fileID: 7492351322203168974, guid: 0949d70c1a73342ca8955c7f59c04fe0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.03 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0949d70c1a73342ca8955c7f59c04fe0, type: 3} --- !u!4 &1589622940 stripped @@ -3030,6 +3065,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 149181931} m_Modifications: + - target: {fileID: 334932330918419862, guid: 0949d70c1a73342ca8955c7f59c04fe0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.033 + objectReference: {fileID: 0} - target: {fileID: 3767471200807653374, guid: 0949d70c1a73342ca8955c7f59c04fe0, type: 3} propertyPath: lineName @@ -3095,6 +3135,11 @@ PrefabInstance: propertyPath: m_Name value: Bottom objectReference: {fileID: 0} + - target: {fileID: 7492351322203168974, guid: 0949d70c1a73342ca8955c7f59c04fe0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.03 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0949d70c1a73342ca8955c7f59c04fe0, type: 3} --- !u!4 &1958951428 stripped