From 37e7060f0b1ad3f4d67b7f88e3f786feb3a95337 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 8 Oct 2021 09:30:11 +0900 Subject: [PATCH] =?UTF-8?q?UI=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_Main_Mission_pop_Dither.png.meta | 2 +- ...anation_pop_frame_detail_Rarity_Dither.png | Bin 0 -> 1232 bytes ...on_pop_frame_detail_Rarity_Dither.png.meta | 92 ++++ ..._shopping_explanation_pop_Decoration_a.png | Bin 0 -> 4268 bytes ...ping_explanation_pop_Decoration_a.png.meta | 92 ++++ ..._shopping_explanation_pop_Decoration_b.png | Bin 0 -> 2407 bytes ...ping_explanation_pop_Decoration_b.png.meta | 92 ++++ .../Resources/Pans/pan_normal.prefab.meta | 2 +- .../package_pepper_cheese.prefab.meta | 7 + .../Cooking/Prefabs/PanSprite.prefab.meta | 7 + .../marketing/Prefabs/Description.prefab | 405 +++++++++++++++++- ...get.prefab.meta => FryingPanl.prefab.meta} | 0 .../MyGame/Scenes/recipe/RecipeChoice.unity | 2 +- .../Scenes/shopping/Prefabs/ItemDetail.prefab | 273 +++++++++++- 14 files changed, 950 insertions(+), 24 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png.meta create mode 100644 popcorn/Assets/MyGame/Resources/PopcornIcons/package_pepper_cheese.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/PanSprite.prefab.meta rename popcorn/Assets/MyGame/Scenes/recipe/Prefabs/{PanTarget.prefab.meta => FryingPanl.prefab.meta} (100%) diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta index eaf35a15..ac2229c6 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 80, y: 80, z: 80, w: 80} + spriteBorder: {x: 106, y: 100, z: 107, w: 100} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png new file mode 100644 index 0000000000000000000000000000000000000000..078318aec3a0a431dc6057268f09631834a663e9 GIT binary patch literal 1232 zcmeAS@N?(olHy`uVBq!ia0vp^`+#^C2OE$Sc>28?NJ*BsMwA5Sr)F(m2A6;7_?+KYEbwyb$NYYt z{XPE*^R`%4mdbQB-!1r36aS&-EVDs*uHhE3b?qxx8y|L?fBWhW>6stXw97Baf1B5O zc<=JESsP9Fml&Vfp3h_bGo1bSytJon`KvE3pIrO@_i?;r~@Pf3ynMZ?1Z-Z~s@JDoe6H%RKpW%#Wv&FRVNF z<@izV-5$D2%YqMIow&UI)p!3tyRQm9|K1$C+kNfQHe==UcMpCzfA(A5x)h-$ZNaCn zM*i3NQ}Jbe=>4CMuh;HA=5k`|oLT!wlQG$_>L_f zmZwLTwRTR*wrag^`~A>V&5y=`7nd*7-gVZkcxQC&*U9=~ZzY5kuNP(Qvwu~>c7Mk1 zZ8NI97Q_|T)u2Zil#uDJL0>Gkb37ne?p&j{WvS#N$%M&gI{)kyol z<{Jg(OMMJp{vvquOu^;BW^(6xt)A|f%yoZNpUug{_mLKNs{%rknzU3yw;gUM0~S#Xp00i_ I>zopr0AuT0y#N3J literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png.meta new file mode 100644 index 00000000..72c9ed7f --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 80d1c9e9b326898458982e5863f94bee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 80, y: 80, z: 80, w: 80} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png new file mode 100644 index 0000000000000000000000000000000000000000..44f11c08dbb5895636aeee613051d2b8b816fba1 GIT binary patch literal 4268 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 O0000b<$RJ( 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 Z3;<9{tMcEz!s-A3002ovPDHLkV1nguh$H|2 literal 0 HcmV?d00001 diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png.meta new file mode 100644 index 00000000..573c9d85 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 245d0ac586e54e44ab6495f3c075039f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Pans/pan_normal.prefab.meta b/popcorn/Assets/MyGame/Resources/Pans/pan_normal.prefab.meta index 5010fc8b..46895856 100644 --- a/popcorn/Assets/MyGame/Resources/Pans/pan_normal.prefab.meta +++ b/popcorn/Assets/MyGame/Resources/Pans/pan_normal.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9b7e191d22a840ff900b9fe4a00375d +guid: 5ba6c2765c65c4041aafb60a68f5c10e PrefabImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/MyGame/Resources/PopcornIcons/package_pepper_cheese.prefab.meta b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_pepper_cheese.prefab.meta new file mode 100644 index 00000000..0374b480 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_pepper_cheese.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dee05eaf79ca05f448eb207ef1330413 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/PanSprite.prefab.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/PanSprite.prefab.meta new file mode 100644 index 00000000..5010fc8b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/PanSprite.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c9b7e191d22a840ff900b9fe4a00375d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 6a9ea4ed..47ee38be 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -1,5 +1,301 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2424274026058026562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5921543939047703470} + - component: {fileID: 5183137526989206975} + - component: {fileID: 3478278178074830086} + m_Layer: 5 + m_Name: Decoration_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5921543939047703470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2424274026058026562} + m_LocalRotation: {x: -0, y: -0, z: 0.4193403, w: 0.90782917} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3856012874794846574} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 49.586002} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 254, y: -324} + m_SizeDelta: {x: 76, y: 182} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5183137526989206975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2424274026058026562} + m_CullTransparentMesh: 0 +--- !u!114 &3478278178074830086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2424274026058026562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 245d0ac586e54e44ab6495f3c075039f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3375734387781680871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4383640794170159703} + - component: {fileID: 4753495964141152955} + - component: {fileID: 9058419034224055093} + m_Layer: 5 + m_Name: Window_mat_explanation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4383640794170159703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3375734387781680871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3856012874794846574} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 60} + m_SizeDelta: {x: 500, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4753495964141152955 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3375734387781680871} + m_CullTransparentMesh: 0 +--- !u!114 &9058419034224055093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3375734387781680871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ced5f6dade5b3794e9d545b93d9a6202, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3679352908449038268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1504859057866268918} + - component: {fileID: 4835729983519013708} + - component: {fileID: 2275881168066182281} + m_Layer: 5 + m_Name: Decoration_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1504859057866268918 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3679352908449038268} + m_LocalRotation: {x: -0, y: -0, z: 0.15055302, w: 0.9886019} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3856012874794846574} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.318} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -266, y: 273} + m_SizeDelta: {x: 94, y: 270} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4835729983519013708 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3679352908449038268} + m_CullTransparentMesh: 0 +--- !u!114 &2275881168066182281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3679352908449038268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d2a0701e3c5905043abb15894ed12baa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3846129596065133818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4111097017210071838} + - component: {fileID: 1674871521371329343} + - component: {fileID: 1044516941948515797} + m_Layer: 5 + m_Name: Window_mat_Rarity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4111097017210071838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3846129596065133818} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3856012874794846574} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -181} + m_SizeDelta: {x: 640, y: 210} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1674871521371329343 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3846129596065133818} + m_CullTransparentMesh: 0 +--- !u!114 &1044516941948515797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3846129596065133818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 80d1c9e9b326898458982e5863f94bee, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3856012874473253802 GameObject: m_ObjectHideFlags: 0 @@ -209,6 +505,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3856012875614048344} + - {fileID: 1504859057866268918} + - {fileID: 5921543939047703470} + - {fileID: 2388270836938668330} + - {fileID: 4383640794170159703} + - {fileID: 4111097017210071838} - {fileID: 3856012874861365792} m_Father: {fileID: 3856012875358022748} m_RootOrder: 1 @@ -277,7 +578,7 @@ RectTransform: - {fileID: 3856012875694233263} - {fileID: 3856012875378235477} m_Father: {fileID: 3856012874794846574} - m_RootOrder: 1 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1062,8 +1363,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d8af3cc4dfdc1bc409ac888c7ea2e9d8, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 62ab6a34000eb0b4fb9823cf56d0914e, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2003,6 +2304,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7674592483829202956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2388270836938668330} + - component: {fileID: 5208639211492208993} + - component: {fileID: 3150227254182484106} + m_Layer: 5 + m_Name: Decoration_c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2388270836938668330 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674592483829202956} + m_LocalRotation: {x: -0, y: -0, z: 0.32324833, w: 0.9463142} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3856012874794846574} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.719} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -14, y: -10} + m_SizeDelta: {x: 76, y: 182} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5208639211492208993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674592483829202956} + m_CullTransparentMesh: 0 +--- !u!114 &3150227254182484106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674592483829202956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 245d0ac586e54e44ab6495f3c075039f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1001 &3271889073656297700 PrefabInstance: m_ObjectHideFlags: 0 @@ -2152,12 +2527,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} ---- !u!224 &3084478268397759140 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - m_PrefabInstance: {fileID: 3271889073656297700} - m_PrefabAsset: {fileID: 0} --- !u!114 &5228864552364374033 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, @@ -2170,6 +2539,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3084478268397759140 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3271889073656297700} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3856012874690155094 PrefabInstance: m_ObjectHideFlags: 0 @@ -2496,12 +2871,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} ---- !u!224 &3613327424014868448 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - m_PrefabInstance: {fileID: 3856012875392093600} - m_PrefabAsset: {fileID: 0} --- !u!114 &5799495138696269141 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, @@ -2514,6 +2883,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3613327424014868448 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012875392093600} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3856012875404040783 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab.meta b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab.meta rename to popcorn/Assets/MyGame/Scenes/recipe/Prefabs/FryingPanl.prefab.meta diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index faae8ee7..447693b2 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -3368,7 +3368,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -187.3, y: -23} + m_AnchoredPosition: {x: -117, y: -23} m_SizeDelta: {x: 185, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1826815493 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 7fc56bdb..7f024011 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -1,5 +1,153 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2323376334314441088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4923433404451704718} + - component: {fileID: 6457389456100410181} + - component: {fileID: 4312395616804913853} + m_Layer: 5 + m_Name: Decoration_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4923433404451704718 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323376334314441088} + m_LocalRotation: {x: -0, y: -0, z: 0.15055302, w: 0.9886019} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 518946834925531999} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.318} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -196, y: 206} + m_SizeDelta: {x: 94, y: 270} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6457389456100410181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323376334314441088} + m_CullTransparentMesh: 0 +--- !u!114 &4312395616804913853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2323376334314441088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d2a0701e3c5905043abb15894ed12baa, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2857599454489357223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8522598069191935288} + - component: {fileID: 7714467837840468085} + - component: {fileID: 7306155275871932498} + m_Layer: 5 + m_Name: Decoration_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8522598069191935288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2857599454489357223} + m_LocalRotation: {x: -0, y: -0, z: 0.4193403, w: 0.90782917} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 518946834925531999} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 49.586002} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 184, y: -158} + m_SizeDelta: {x: 76, y: 182} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7714467837840468085 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2857599454489357223} + m_CullTransparentMesh: 0 +--- !u!114 &7306155275871932498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2857599454489357223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 245d0ac586e54e44ab6495f3c075039f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3033445367999946807 GameObject: m_ObjectHideFlags: 0 @@ -461,16 +609,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3033445368657787316} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3033445369678895481} + m_Father: {fileID: 518946834925531999} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -52} + m_AnchoredPosition: {x: 0, y: -0.000022888184} m_SizeDelta: {x: 450, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368657787313 @@ -831,7 +979,7 @@ RectTransform: - {fileID: 3033445367999946806} - {fileID: 3033445369412931226} - {fileID: 3033445368367237338} - - {fileID: 3033445368657787319} + - {fileID: 518946834925531999} m_Father: {fileID: 3033445369043120722} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -916,8 +1064,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a3ecc66e42c500f4ba8cc10ceedfc0c5, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 62ab6a34000eb0b4fb9823cf56d0914e, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -926,3 +1074,116 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6939273566844610944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5503120062321213251} + - component: {fileID: 4339332656958528993} + - component: {fileID: 4088377521544033474} + m_Layer: 5 + m_Name: explanation_frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5503120062321213251 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939273566844610944} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 518946834925531999} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 1.0000763} + m_SizeDelta: {x: 480, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4339332656958528993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939273566844610944} + m_CullTransparentMesh: 0 +--- !u!114 &4088377521544033474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6939273566844610944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ced5f6dade5b3794e9d545b93d9a6202, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7036233309255592168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 518946834925531999} + m_Layer: 5 + m_Name: explanation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &518946834925531999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036233309255592168} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4923433404451704718} + - {fileID: 8522598069191935288} + - {fileID: 5503120062321213251} + - {fileID: 3033445368657787319} + m_Father: {fileID: 3033445369678895481} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -52} + m_SizeDelta: {x: 450, y: 180} + m_Pivot: {x: 0.5, y: 0.5}