diff --git a/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim b/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim index 90d0ea2d..c50c3d2a 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim @@ -1020,4 +1020,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png index a15ca6d3..564880ba 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png.meta index 7b2a8c87..5178f24c 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 0, y: 276, z: 0, w: 65} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Dither.png new file mode 100644 index 00000000..827f690c Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Dither.png.meta new file mode 100644 index 00000000..473bab0c --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ced5f6dade5b3794e9d545b93d9a6202 +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: 76, y: 76, z: 76, w: 76} + 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/marketing/ui_button_icon_Footer_publicity_logo.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_button_icon_Footer_publicity_logo.png.meta index e560727f..623b0b97 100644 --- a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_button_icon_Footer_publicity_logo.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_button_icon_Footer_publicity_logo.png.meta @@ -47,7 +47,7 @@ TextureImporter: spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -71,6 +71,42 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + 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: [] diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE.meta new file mode 100644 index 00000000..7b5d3473 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f33405ad715c8be43b11150bbde6aaf7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Burn.mp3 b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Burn.mp3 new file mode 100644 index 00000000..82d76231 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Burn.mp3 differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Burn.mp3.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Burn.mp3.meta new file mode 100644 index 00000000..2298e8b3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Burn.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c6c4ef497951205459ac347e9617754f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/se_Button.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button.wav similarity index 100% rename from popcorn/Assets/MyGame/Resources/Sounds/se_Button.wav rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button.wav diff --git a/popcorn/Assets/MyGame/Resources/Sounds/se_Button.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button.wav.meta similarity index 100% rename from popcorn/Assets/MyGame/Resources/Sounds/se_Button.wav.meta rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button.wav.meta diff --git a/popcorn/Assets/MyGame/Resources/Sounds/se_Button_a.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button_a.wav similarity index 100% rename from popcorn/Assets/MyGame/Resources/Sounds/se_Button_a.wav rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button_a.wav diff --git a/popcorn/Assets/MyGame/Resources/Sounds/se_Button_a.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button_a.wav.meta similarity index 100% rename from popcorn/Assets/MyGame/Resources/Sounds/se_Button_a.wav.meta rename to popcorn/Assets/MyGame/Resources/Sounds/SE/se_Button_a.wav.meta diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/tofu_fail.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/tofu_fail.wav new file mode 100644 index 00000000..32d8ccc4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/tofu_fail.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/tofu_fail.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/tofu_fail.wav.meta new file mode 100644 index 00000000..a2c6ceac --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/tofu_fail.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 14da8e0e15ac5924c8caeabc3870918e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index 763c9ca9..aed90161 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -12350,6 +12350,7 @@ GameObject: - component: {fileID: 947177465739795016} - component: {fileID: 947177465739795022} - component: {fileID: 947177465739795017} + - component: {fileID: 947177465739795020} m_Layer: 5 m_Name: ef_smoke m_TagString: Untagged @@ -12357,6 +12358,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &947177465739795020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947177465739795019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3} + m_Name: + m_EditorClassIdentifier: + seInfoArray: + - delay: 0 + time: 0 + interval: 0 + filename: se_Burn + maxCount: 0 --- !u!198 &947177465739795022 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index bb8c03a9..89066ddb 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -629,7 +629,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &389422779 RectTransform: m_ObjectHideFlags: 0 @@ -914,6 +914,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 546807793} m_CullTransparentMesh: 0 +--- !u!1 &649320302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 649320303} + - component: {fileID: 649320305} + - component: {fileID: 649320304} + m_Layer: 5 + m_Name: 'frame ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &649320303 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649320302} + 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: 1404308667} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 600, y: 208} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &649320304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649320302} + 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!222 &649320305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649320302} + m_CullTransparentMesh: 0 --- !u!1001 &670639508 PrefabInstance: m_ObjectHideFlags: 0 @@ -1828,6 +1902,7 @@ RectTransform: - {fileID: 1037294271} - {fileID: 731319771} - {fileID: 1626721124} + - {fileID: 1404308667} - {fileID: 2135558976} - {fileID: 1160535647} - {fileID: 1464412874} @@ -1910,8 +1985,8 @@ RectTransform: 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: 20, y: 0} - m_SizeDelta: {x: 836, y: 1054} + m_AnchoredPosition: {x: 20, y: 50} + m_SizeDelta: {x: 836, y: 1250} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1037294270 GameObject: @@ -2110,6 +2185,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1109202677} m_CullTransparentMesh: 0 +--- !u!1 &1116792170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1116792171} + - component: {fileID: 1116792173} + - component: {fileID: 1116792172} + m_Layer: 5 + m_Name: Text_explanation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1116792171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116792170} + 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: 1404308667} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 450, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1116792172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116792170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_FontSize: 27 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1.3 + m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\u7279\u7523\u306E\u5869\r\n\u3068\u3066\u3082\u307E\u308D\u3084\u304B\u306A\u5869\u3067\r\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306B\u5408\u3046\u3053\u3068\u9593\u9055\u3044\u306A\u3057" +--- !u!222 &1116792173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1116792170} + m_CullTransparentMesh: 0 --- !u!1 &1125711447 GameObject: m_ObjectHideFlags: 0 @@ -2219,7 +2372,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 836, y: 1054} + m_SizeDelta: {x: 836, y: 1250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1157984680 MonoBehaviour: @@ -2241,7 +2394,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9648f7d23fbd66e4db44131ce3579772, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2292,7 +2445,7 @@ RectTransform: - {fileID: 2045825933} - {fileID: 1782089965} m_Father: {fileID: 1001521034} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2425,10 +2578,10 @@ RectTransform: m_Father: {fileID: 2135558976} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 212, y: 0} - m_SizeDelta: {x: 356, y: 252} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 680, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1197864698 MonoBehaviour: @@ -2450,7 +2603,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ad305bc75e53add488410a7400246330, type: 3} - m_Type: 2 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2473,6 +2626,43 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5352886969301700757} m_PrefabAsset: {fileID: 0} +--- !u!1 &1404308666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1404308667} + m_Layer: 5 + m_Name: explanation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1404308667 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1404308666} + 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: 649320303} + - {fileID: 1116792171} + m_Father: {fileID: 1001521034} + 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: -9, y: 152} + m_SizeDelta: {x: 600, y: 220} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1408233925 PrefabInstance: m_ObjectHideFlags: 0 @@ -2523,22 +2713,22 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -2588,12 +2778,12 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.x - value: 95.6 + value: 579 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.y - value: -46.1 + value: -116.30002 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -2667,11 +2857,11 @@ RectTransform: - {fileID: 1125711448} - {fileID: 255490369} m_Father: {fileID: 1001521034} - m_RootOrder: 7 + m_RootOrder: 8 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: -7.600019, y: -212.99998} + m_AnchoredPosition: {x: -7.600019, y: -310} m_SizeDelta: {x: 710, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1484296443 @@ -3669,8 +3859,8 @@ RectTransform: 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: -22.3} - m_SizeDelta: {x: 350, y: 180} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 700, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &2086901980 stripped RectTransform: @@ -3782,12 +3972,12 @@ RectTransform: - {fileID: 1197864697} - {fileID: 389422779} m_Father: {fileID: 1001521034} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7, y: 54} - m_SizeDelta: {x: 700, y: -794} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7, y: -70.00004} + m_SizeDelta: {x: 700, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &318270869295207907 MonoBehaviour: @@ -4274,7 +4464,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8.800003, y: -24.8} + m_AnchoredPosition: {x: 41, y: -90.3} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0, y: 1} --- !u!1001 &5352886969301700757 @@ -4322,22 +4512,22 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -4387,12 +4577,12 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.x - value: -75 + value: 360 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.y - value: -46.09995 + value: -116.3 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 94c475a4..8a07e262 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -947,7 +947,7 @@ RectTransform: 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: 0} + m_AnchoredPosition: {x: 0, y: 49} m_SizeDelta: {x: 1186, y: 1310} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &384598190 stripped