From 58a1e674502c7bb76b4fd7914478fef245ef3b8f Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 30 Jul 2021 20:36:38 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94POP=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E8=BF=BD=E5=8A=A0=E3=81=A8=E3=83=AC=E3=82=B7=E3=83=94?= =?UTF-8?q?POP=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...n_recipe_detail_pop_MaterialFrame.png.meta | 2 +- .../MyGame/Resource/Material/stocking.meta | 8 + .../stocking/stocking_icon_FryingPan_a.png | Bin 0 -> 6406 bytes .../stocking_icon_FryingPan_a.png.meta | 92 + .../Main => Scenes}/recipe/Prefabs.meta | 0 .../recipe/Prefabs/Button_Arrow_left.prefab | 120 + .../Prefabs/Button_Arrow_left.prefab.meta | 7 + .../recipe/Prefabs/Frame.prefab | 0 .../recipe/Prefabs/Frame.prefab.meta | 0 .../Scenes/recipe/Prefabs/FryingPanl.prefab | 76 + .../recipe/Prefabs/FryingPanl.prefab.meta | 7 + .../recipe/Prefabs/MaterialFrame.prefab | 0 .../recipe/Prefabs/MaterialFrame.prefab.meta | 0 .../recipe/Prefabs/MaterialFrame_stock.prefab | 271 ++ .../Prefabs/MaterialFrame_stock.prefab.meta | 7 + .../recipe/Prefabs/NecessaryMaterial.prefab | 266 ++ .../Prefabs/NecessaryMaterial.prefab.meta | 7 + .../MyGame/Scenes/recipe/RecipeChoice.unity | 3542 +++++++++++++++++ .../Scenes/recipe/RecipeChoice.unity.meta | 7 + .../Assets/MyGame/Scenes/recipe/recipe.unity | 100 +- 20 files changed, 4461 insertions(+), 51 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/stocking.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/stocking/stocking_icon_FryingPan_a.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/stocking/stocking_icon_FryingPan_a.png.meta rename popcorn/Assets/MyGame/{Resource/Material/Main => Scenes}/recipe/Prefabs.meta (100%) create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Button_Arrow_left.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Button_Arrow_left.prefab.meta rename popcorn/Assets/MyGame/{Resource/Material/Main => Scenes}/recipe/Prefabs/Frame.prefab (100%) rename popcorn/Assets/MyGame/{Resource/Material/Main => Scenes}/recipe/Prefabs/Frame.prefab.meta (100%) create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab.meta rename popcorn/Assets/MyGame/{Resource/Material/Main => Scenes}/recipe/Prefabs/MaterialFrame.prefab (100%) rename popcorn/Assets/MyGame/{Resource/Material/Main => Scenes}/recipe/Prefabs/MaterialFrame.prefab.meta (100%) create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta index 5e73f685..0c93a5de 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_MaterialFrame.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 64, y: 2, z: 62, w: 39} + spriteBorder: {x: 73, y: 2, z: 7, w: 39} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/stocking.meta b/popcorn/Assets/MyGame/Resource/Material/stocking.meta new file mode 100644 index 00000000..7604dfcb --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/stocking.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9cfd6956d7c85b4694fe03f3330d810 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/stocking/stocking_icon_FryingPan_a.png b/popcorn/Assets/MyGame/Resource/Material/stocking/stocking_icon_FryingPan_a.png new file mode 100644 index 0000000000000000000000000000000000000000..ec755987c946cd07df35a3db92a5071c7c431819 GIT binary patch literal 6406 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