diff --git a/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim b/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim index 393a1ef1..e32b3062 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim @@ -239,6 +239,13 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: + - time: 0 + functionName: OnPlayVibrationOnce + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 - time: 0.016666668 functionName: OnPlaySE data: se_CornField_machine diff --git a/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim b/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim index 7919a689..6c23db31 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim @@ -751,3 +751,10 @@ AnimationClip: floatParameter: 0 intParameter: 0 messageOptions: 0 + - time: 0.033333335 + functionName: OnPlayVibrationOnce + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png index 437f7e86..68541b33 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta index 4b7b2c28..49592bd7 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.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: 290, y: 0, z: 48, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png index 5c9de055..c685794a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta index 59dfa86a..4319f06f 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.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: 93, y: 0, z: 33, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png index 5841d6a6..8ab3a506 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta index e77567f0..dfadb7d5 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_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: 123, z: 0, w: 79} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png new file mode 100644 index 00000000..af7cb4aa Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png.meta new file mode 100644 index 00000000..15963a1c --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e92598e171a04834897b190153055214 +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: 321, z: 0, w: 48} + 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/Main/Mission/ui_Main_Mission_pop_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png index 9cd9ae5e..94ec82f1 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png differ 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 c00e2f70..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,8 +46,8 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 249, z: 0, w: 300} - spriteGenerateFallbackPhysicsShape: 1 + spriteBorder: {x: 106, y: 100, z: 107, w: 100} + 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/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png new file mode 100644 index 00000000..13a01f42 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png.meta new file mode 100644 index 00000000..e68a7949 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 59d6a2ebb2c0cbc44ad8d93d10029d58 +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: 111, y: 0, z: 111, 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/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png new file mode 100644 index 00000000..87654db4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png.meta new file mode 100644 index 00000000..a202c96a --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: eb5e5db8989e480449c34d6520a88a98 +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: 30, z: 0, w: 184} + 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/Main/recipe/ui_Main_recipe_pop_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png index d6c87801..fdc7898b 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta index 4fb4e5e9..8d0dc529 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_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: 184, z: 0, w: 101} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png new file mode 100644 index 00000000..a07ce0fd Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png.meta new file mode 100644 index 00000000..4e042935 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 378448de62cf2ef45aef2a088bf13a1e +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/Main/recipe/ui_Main_recipe_pop_detail.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png deleted file mode 100644 index 0ef44a9e..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png new file mode 100644 index 00000000..61e2c0e9 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png.meta similarity index 97% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png.meta index 03721922..d3d4fdd9 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 430, y: 13, z: 9, w: 13} + spriteBorder: {x: 377, y: 13, z: 22, w: 13} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray.png new file mode 100644 index 00000000..0e252f28 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray.png.meta new file mode 100644 index 00000000..1f1ddd9a --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 25e87dbf8c9dca34884b8267401b0a2a +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/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png index 2b8cdef2..504f4bd8 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png.meta index 8930457e..1bd05718 100644 --- a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_frame.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: 72, y: 72, z: 72, w: 72} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png index 22fe00fe..2d388801 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png new file mode 100644 index 00000000..d011b567 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png.meta new file mode 100644 index 00000000..020dd6e9 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 46c1d436fb8e9c940a30c24d2f65dd01 +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/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png new file mode 100644 index 00000000..e5c049bd Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png.meta new file mode 100644 index 00000000..d149791e --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 51bf3127ef9cd934a9f55165b75a6d91 +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/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png new file mode 100644 index 00000000..bd8198c6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png.meta new file mode 100644 index 00000000..cc594780 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b8ec9ac9caba009469308299304b4062 +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: 100, y: 100, z: 100, w: 100} + 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/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 00000000..078318ae Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_pop_frame_detail_Rarity_Dither.png differ 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 00000000..44f11c08 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png.meta new file mode 100644 index 00000000..741fd86f --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d2a0701e3c5905043abb15894ed12baa +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/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png new file mode 100644 index 00000000..6e9aacbe Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_explanation_pop_Decoration_b.png differ 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/Resources/Sounds/BGM.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM.meta new file mode 100644 index 00000000..af3a24a0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14a48cdd5a4b2ac4e8b3b196da474204 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_Main.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_Main.wav new file mode 100644 index 00000000..4776d2c5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_Main.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_Main.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_Main.wav.meta new file mode 100644 index 00000000..b5ad7349 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_Main.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 15cb8b0f36881564f895e293813fa8b4 +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/BGM/bgm_cooking.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_cooking.wav new file mode 100644 index 00000000..940ad24f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_cooking.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_cooking.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_cooking.wav.meta new file mode 100644 index 00000000..574db5d4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_cooking.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 379a5be21c390f548be663fddf126802 +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/BGM/bgm_fertilizer.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_fertilizer.wav new file mode 100644 index 00000000..524cdf2d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_fertilizer.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_fertilizer.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_fertilizer.wav.meta new file mode 100644 index 00000000..18fdb39a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_fertilizer.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d107e888d3eb81443b07a01fda1a2dc4 +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/BGM/bgm_marketing.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_marketing.wav new file mode 100644 index 00000000..a9d0872d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_marketing.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_marketing.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_marketing.wav.meta new file mode 100644 index 00000000..89dde048 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_marketing.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4e2395c4bd630e04eb3237963ab476ed +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/BGM/bgm_publicity.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_publicity.wav new file mode 100644 index 00000000..265b55c9 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_publicity.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_publicity.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_publicity.wav.meta new file mode 100644 index 00000000..6b5ff26d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_publicity.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1b33376da7bdd0244b13a2d3bb54f6f6 +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/BGM/bgm_shopping.wav b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_shopping.wav new file mode 100644 index 00000000..1c95563e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_shopping.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_shopping.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_shopping.wav.meta new file mode 100644 index 00000000..f7b9aadd --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/BGM/bgm_shopping.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 612331f09e3805a46b5792e99e47c5b3 +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/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/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index a6cfa8d2..614a940c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -1506,6 +1506,7 @@ GameObject: - component: {fileID: 359927433} - component: {fileID: 359927432} - component: {fileID: 359927431} + - component: {fileID: 359927434} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -1613,6 +1614,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 359927429} m_CullTransparentMesh: 0 +--- !u!114 &359927434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359927429} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &387626331 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 51229c5d..36846780 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -30,11 +30,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082915278031755625} - m_RootOrder: 3 + 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: 691} + m_AnchoredPosition: {x: 0, y: 779} m_SizeDelta: {x: 366, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277424874094 @@ -109,7 +109,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: 922, y: 1498} + m_SizeDelta: {x: 922, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277521603128 CanvasRenderer: @@ -139,7 +139,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9816e10bc2e71ae42a20e3ef6e107d19, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -668,6 +668,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1108653143504097850} + - {fileID: 5030323268344160145} - {fileID: 4082915278229527154} - {fileID: 4082915279116682333} - {fileID: 4082915278864071265} @@ -675,7 +677,7 @@ RectTransform: - {fileID: 4082915278280054884} - {fileID: 4082915278992014894} m_Father: {fileID: 4082915278546610718} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -877,11 +879,11 @@ RectTransform: - {fileID: 7325254816105691106} - {fileID: 7325254816271539690} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 0 + m_RootOrder: 2 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -119} m_SizeDelta: {x: 1000, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4082915278229527152 @@ -913,7 +915,7 @@ MonoBehaviour: m_Padding: m_Left: -500 m_Right: 0 - m_Top: -740 + m_Top: -914 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: -100 @@ -955,11 +957,11 @@ RectTransform: - {fileID: 4082915278942985864} - {fileID: 4082915279019759820} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 4 + m_RootOrder: 6 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: -413} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 354} m_SizeDelta: {x: 0, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4082915278280054938 @@ -1029,14 +1031,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4082915277521603130} + - {fileID: 9178891399397225713} - {fileID: 4082915278031755625} m_Father: {fileID: 4082915279371560212} 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: 922, y: 1498} + m_AnchoredPosition: {x: 0, y: 52} + m_SizeDelta: {x: 922, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915278807493231 GameObject: @@ -1217,11 +1220,11 @@ RectTransform: - {fileID: 4082915277900228848} - {fileID: 4082915278008547937} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 2 + 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: 1, y: -259} + m_AnchoredPosition: {x: 1, y: -338} m_SizeDelta: {x: 730, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915278879672978 @@ -1467,11 +1470,11 @@ RectTransform: m_Children: - {fileID: 4082915279112502090} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 5 + 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} - m_AnchoredPosition: {x: 0, y: 156} + m_AnchoredPosition: {x: 0, y: 168} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278992014883 @@ -1963,11 +1966,11 @@ RectTransform: - {fileID: 4082915279204653795} - {fileID: 4082915277970689978} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 1 + 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: 547} + m_AnchoredPosition: {x: 0, y: 635} m_SizeDelta: {x: 720, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915279204653804 @@ -2035,7 +2038,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 2a7bf22a7dc92d242b6e7dcd6647cc6f, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2238,6 +2241,228 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &5089618811158251263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9178891399397225713} + - component: {fileID: 5023734004673988866} + - component: {fileID: 3097705197763176933} + m_Layer: 5 + m_Name: Window_mat_detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9178891399397225713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089618811158251263} + 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: 4082915278546610718} + 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: 66} + m_SizeDelta: {x: 818, y: 1310} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5023734004673988866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089618811158251263} + m_CullTransparentMesh: 0 +--- !u!114 &3097705197763176933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089618811158251263} + 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: e92598e171a04834897b190153055214, 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 &5269593934005782374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5030323268344160145} + - component: {fileID: 1744485631078531303} + - component: {fileID: 7721293545209984243} + m_Layer: 5 + m_Name: lineUnder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5030323268344160145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5269593934005782374} + 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: 4082915278031755625} + 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: -267.5} + m_SizeDelta: {x: 760, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1744485631078531303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5269593934005782374} + m_CullTransparentMesh: 0 +--- !u!114 &7721293545209984243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5269593934005782374} + 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: befe49c03955d3642a335e511312e1ba, type: 3} + m_Type: 2 + 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 &8469412328290291956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108653143504097850} + - component: {fileID: 4878617007304336867} + - component: {fileID: 7576376462711902748} + m_Layer: 5 + m_Name: lineUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1108653143504097850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8469412328290291956} + 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: 4082915278031755625} + 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: 563} + m_SizeDelta: {x: 760, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4878617007304336867 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8469412328290291956} + m_CullTransparentMesh: 0 +--- !u!114 &7576376462711902748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8469412328290291956} + 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: befe49c03955d3642a335e511312e1ba, type: 3} + m_Type: 2 + 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 &751013265656328038 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index 25744783..3de335f5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -129,8 +129,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: 234} - m_SizeDelta: {x: 900, y: 850} + m_AnchoredPosition: {x: 0, y: 145} + m_SizeDelta: {x: 900, y: 1020} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2377818823009469882 GameObject: @@ -517,7 +517,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818823262257511} - 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: [] @@ -526,7 +526,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: -239} + m_AnchoredPosition: {x: 0, y: -149.99994} m_SizeDelta: {x: 705, y: 680} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823262257506 @@ -1564,7 +1564,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818824260807142} - 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: @@ -1576,7 +1576,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: -158.00005} + m_AnchoredPosition: {x: 0, y: -68.999985} m_SizeDelta: {x: 704, y: 794} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &2377818824260807140 @@ -1764,7 +1764,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818824381547239} - 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: @@ -1776,7 +1776,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: 293} + m_AnchoredPosition: {x: 0, y: 381.99994} m_SizeDelta: {x: 876, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824381547234 @@ -1807,7 +1807,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 047c28dcec3cfef4b83693f782e71e6e, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index f7fd77c3..403fb592 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -1037,7 +1037,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 047c28dcec3cfef4b83693f782e71e6e, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 20160476..a3c3f477 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -522,8 +522,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: -55.799988, y: -23} - m_SizeDelta: {x: 260, y: 130} + m_AnchoredPosition: {x: -29.5, y: -16.3} + m_SizeDelta: {x: 200, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3658417434518209424 GameObject: @@ -637,7 +637,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: 200, y: 98} + m_SizeDelta: {x: 200, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3658417434522814402 CanvasRenderer: @@ -847,7 +847,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: 200, y: 98} + m_SizeDelta: {x: 200, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3658417434859902286 CanvasRenderer: @@ -922,7 +922,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -147, y: 1} + m_AnchoredPosition: {x: -133, y: -23} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3658417435668626830 @@ -1182,7 +1182,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7130003} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -272, y: 11.5} + m_AnchoredPosition: {x: -231, y: -10} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890202353341283 @@ -1256,8 +1256,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: -53.299988, y: 68} - m_SizeDelta: {x: 250, y: 50} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890202664346919 CanvasRenderer: @@ -1288,18 +1288,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 23 - m_FontStyle: 0 + m_FontSize: 25 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 23 + m_MaxSize: 25 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3" + m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &6701890202804983462 GameObject: m_ObjectHideFlags: 0 @@ -1333,7 +1333,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: -271.8, y: -66} + m_AnchoredPosition: {x: -230.79999, y: -87.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6701890202901161254 @@ -1845,7 +1845,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: 161, y: -98.8} + m_AnchoredPosition: {x: 32.2, y: -162.5} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8120304310888387125 @@ -2040,7 +2040,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 500, y: -376} - m_SizeDelta: {x: 720, y: 200} + m_SizeDelta: {x: 660, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2702520058299168695 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 1e500c5b..6d4b8a3c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -183,7 +183,7 @@ RectTransform: - {fileID: 118497225} - {fileID: 2041305254} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -282,7 +282,7 @@ RectTransform: - {fileID: 1462604263} - {fileID: 1453424321} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1190,6 +1190,154 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1527155573937108630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2931499691381414806} + - component: {fileID: 4809247392571370159} + - component: {fileID: 7315224665257597391} + m_Layer: 0 + m_Name: title_logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2931499691381414806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527155573937108630} + 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: 7085694195965496252} + 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.04, y: 8.51} + m_SizeDelta: {x: 466, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4809247392571370159 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527155573937108630} + m_CullTransparentMesh: 0 +--- !u!114 &7315224665257597391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1527155573937108630} + 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: 84efab5b8d1b5274cb7510ddcb5b2187, 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 &2322867894675920669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4165507556220274367} + - component: {fileID: 3938661921053585489} + - component: {fileID: 8725745405852610645} + m_Layer: 0 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4165507556220274367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322867894675920669} + 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: 2946332702762786804} + 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: 1766, y: 2208} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3938661921053585489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322867894675920669} + m_CullTransparentMesh: 0 +--- !u!114 &8725745405852610645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2322867894675920669} + 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: 6c0266f7f3e85d64496c8609d25d4bfc, type: 3} + m_Type: 2 + 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 &2835369144934501534 GameObject: m_ObjectHideFlags: 0 @@ -1220,13 +1368,50 @@ RectTransform: - {fileID: 655651630893765691} - {fileID: 8136363072906095234} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 43, y: 473} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3213111080442531914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7010126276251737949} + m_Layer: 0 + m_Name: shopping + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7010126276251737949 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3213111080442531914} + 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: 1674431630079185179} + - {fileID: 7085694195965496252} + m_Father: {fileID: 3664916832844628215} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -1020, y: -2208} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3664916832564167473 GameObject: m_ObjectHideFlags: 0 @@ -1354,6 +1539,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7010126276251737949} + - {fileID: 2946332702762786804} - {fileID: 3664916834242367713} - {fileID: 3664916833752817997} - {fileID: 3664916834121473268} @@ -1492,7 +1679,7 @@ RectTransform: m_Children: - {fileID: 3664916833050583563} m_Father: {fileID: 3664916832844628215} - m_RootOrder: 2 + 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} @@ -1595,6 +1782,80 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 +--- !u!1 &4233181358770764633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1674431630079185179} + - component: {fileID: 6377654529412332931} + - component: {fileID: 7212131415134415334} + m_Layer: 0 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1674431630079185179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4233181358770764633} + 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: 7010126276251737949} + 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: 1765.9999, y: 2208.039} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6377654529412332931 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4233181358770764633} + m_CullTransparentMesh: 0 +--- !u!114 &7212131415134415334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4233181358770764633} + 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: 28a88afc3eafafd46836fc0a92d784ca, 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 &4527791912016219838 GameObject: m_ObjectHideFlags: 0 @@ -1669,6 +1930,265 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5012399981726268641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5138547402979269831} + - component: {fileID: 8204138689447267973} + - component: {fileID: 662253337938615779} + m_Layer: 0 + m_Name: title_logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5138547402979269831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5012399981726268641} + 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: 2946332702762786804} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -264.00012} + m_SizeDelta: {x: 358, y: 104} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8204138689447267973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5012399981726268641} + m_CullTransparentMesh: 0 +--- !u!114 &662253337938615779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5012399981726268641} + 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: eca622205a7dc214384aad3d918584bd, 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 &5070743987604947773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311602816611592951} + - component: {fileID: 7673289268068951158} + - component: {fileID: 2780640450373363062} + m_Layer: 5 + m_Name: roof_up + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &311602816611592951 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5070743987604947773} + 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: 2946332702762786804} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -104} + m_SizeDelta: {x: 1766, y: 218} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7673289268068951158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5070743987604947773} + m_CullTransparentMesh: 0 +--- !u!114 &2780640450373363062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5070743987604947773} + 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: 46c1d436fb8e9c940a30c24d2f65dd01, 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 &6308156613143906323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7085694195965496252} + m_Layer: 0 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7085694195965496252 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6308156613143906323} + 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: 5584497718062398763} + - {fileID: 2931499691381414806} + m_Father: {fileID: 7010126276251737949} + 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: 823} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6455975542244611677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8795892939542330791} + - component: {fileID: 510438966564529224} + - component: {fileID: 5884404844740604112} + m_Layer: 5 + m_Name: roof + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8795892939542330791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6455975542244611677} + 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: 2946332702762786804} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -268} + m_SizeDelta: {x: 1344, y: 192} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &510438966564529224 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6455975542244611677} + m_CullTransparentMesh: 0 +--- !u!114 &5884404844740604112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6455975542244611677} + 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: 51bf3127ef9cd934a9f55165b75a6d91, 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 &7050402347435650235 GameObject: m_ObjectHideFlags: 0 @@ -1744,6 +2264,45 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7758062554450272377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2946332702762786804} + m_Layer: 5 + m_Name: Window_ProductManagement + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2946332702762786804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758062554450272377} + 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: 4165507556220274367} + - {fileID: 311602816611592951} + - {fileID: 8795892939542330791} + - {fileID: 5138547402979269831} + m_Father: {fileID: 3664916832844628215} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8030878599565506995 GameObject: m_ObjectHideFlags: 0 @@ -1822,6 +2381,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 00:00 +--- !u!1 &8241562427572723412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5584497718062398763} + - component: {fileID: 4302358617439404518} + - component: {fileID: 8551326360146391195} + m_Layer: 0 + m_Name: title_Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5584497718062398763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241562427572723412} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_Children: [] + m_Father: {fileID: 7085694195965496252} + 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: 8.47} + m_SizeDelta: {x: 700, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4302358617439404518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241562427572723412} + m_CullTransparentMesh: 0 +--- !u!114 &8551326360146391195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241562427572723412} + 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: 3536ca1b52bdfa142a0d2dea94b66b8a, 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 &8559323780514547720 GameObject: m_ObjectHideFlags: 0 @@ -1967,7 +2600,7 @@ PrefabInstance: - target: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} @@ -2147,7 +2780,7 @@ PrefabInstance: - target: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} @@ -2288,7 +2921,7 @@ PrefabInstance: - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4554347650268844882, guid: 2403d69753829416a83b8cfa00108d38, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 1774f6ec..db2c15a5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -2817,7 +2817,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 111} + m_AnchoredPosition: {x: 0, y: 104} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639677226913018 @@ -2950,7 +2950,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: 411} + m_AnchoredPosition: {x: 0, y: 412} m_SizeDelta: {x: 800, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639677480706702 @@ -2983,7 +2983,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -3459,7 +3459,7 @@ RectTransform: - {fileID: 2660639677480706696} - {fileID: 2660639678889033266} m_Father: {fileID: 2660639678456833894} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3806,6 +3806,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2660639678600407771} + - {fileID: 2799355392464177233} + - {fileID: 3875781502700277686} - {fileID: 2660639677971123135} m_Father: {fileID: 2660639679028779574} m_RootOrder: 1 @@ -4162,7 +4164,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: -62} + m_AnchoredPosition: {x: 0, y: -69} m_SizeDelta: {x: 900, y: 880} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5142847172670219607 @@ -6256,6 +6258,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 10000 +--- !u!1 &5526035085733857660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3875781502700277686} + - component: {fileID: 2369406120133834676} + - component: {fileID: 4136380041265909428} + m_Layer: 5 + m_Name: Window_mat_Decoration + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3875781502700277686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526035085733857660} + 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: 2660639678456833894} + 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: 648} + m_SizeDelta: {x: 750, y: 114} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2369406120133834676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526035085733857660} + m_CullTransparentMesh: 0 +--- !u!114 &4136380041265909428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526035085733857660} + 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: 59d6a2ebb2c0cbc44ad8d93d10029d58, 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 &5720778789336431229 GameObject: m_ObjectHideFlags: 0 @@ -7670,6 +7746,80 @@ RectTransform: m_AnchoredPosition: {x: -7.0000105, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8142119222429364452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2799355392464177233} + - component: {fileID: 6047797878840319401} + - component: {fileID: 4459002468787055795} + m_Layer: 5 + m_Name: Window_mat_detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2799355392464177233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8142119222429364452} + 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: 2660639678456833894} + 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: 41} + m_SizeDelta: {x: 935, y: 1180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6047797878840319401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8142119222429364452} + m_CullTransparentMesh: 0 +--- !u!114 &4459002468787055795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8142119222429364452} + 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: eb5e5db8989e480449c34d6520a88a98, 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 &8173313593566145802 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab index 7ff30b5f..bfffc280 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab @@ -433,6 +433,7 @@ GameObject: - component: {fileID: 6878252345190694867} - component: {fileID: 6878252345190694866} - component: {fileID: 6878252345190694869} + - component: {fileID: 4727775471500652942} m_Layer: 0 m_Name: Button m_TagString: Untagged @@ -539,6 +540,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4727775471500652942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878252345190694871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &6878252345214281169 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index ac17d80d..55096bb7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -838,6 +838,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1432281556} + - component: {fileID: 1432281557} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -866,6 +867,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 43} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1432281557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1432281555} + 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_Achievement + maxCount: 0 --- !u!1001 &1586462891 PrefabInstance: m_ObjectHideFlags: 0 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/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 94749a06..2bc9c996 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -191,9 +191,9 @@ RectTransform: m_Father: {fileID: 6124127957362852678} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 225, y: 7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957076174809 @@ -317,8 +317,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6124127957362852678} - - component: {fileID: 6124127957362852792} - - component: {fileID: 6124127957362852679} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -342,50 +340,11 @@ RectTransform: m_Father: {fileID: 6124127957792349541} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -353.1} - m_SizeDelta: {x: 0, y: 1642} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -413} + m_SizeDelta: {x: 900, y: 150} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6124127957362852792 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6124127957362852677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 450 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!114 &6124127957362852679 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6124127957362852677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &6124127957792349540 GameObject: m_ObjectHideFlags: 0 @@ -425,7 +384,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -900, y: -946} + m_SizeDelta: {x: -242, y: -1642} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4115935509581831060 MonoBehaviour: @@ -632,9 +591,9 @@ RectTransform: m_Father: {fileID: 6124127957792349541} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -439} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 423} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957932188849 @@ -783,9 +742,9 @@ RectTransform: m_Father: {fileID: 6124127957362852678} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -225, y: 7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127958085519808 @@ -1796,6 +1755,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!224 &6124127957488033513 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 2705466137574694683} + m_PrefabAsset: {fileID: 0} --- !u!114 &1703305198614521804 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, @@ -1808,12 +1773,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &6124127957488033513 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, - type: 3} - m_PrefabInstance: {fileID: 2705466137574694683} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6124127957283136057 PrefabInstance: m_ObjectHideFlags: 0 @@ -2799,12 +2758,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} ---- !u!224 &2705466137867714208 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, - type: 3} - m_PrefabInstance: {fileID: 6124127958334701394} - m_PrefabAsset: {fileID: 0} --- !u!114 &7410006873414403973 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, @@ -2817,6 +2770,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &2705466137867714208 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127958334701394} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6124127958473786029 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index ee1d816b..5b0ed4c9 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -758,7 +758,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 152cbc9f77d2f3744b0cb4f38fe7ab2b, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 10ea23e6..2e3e0b31 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -121,38 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &5420118 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5420119} - m_Layer: 0 - m_Name: ProductManagement - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5420119 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5420118} - 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: 900187653} - - {fileID: 1883353299} - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &70115382 GameObject: m_ObjectHideFlags: 0 @@ -183,11 +151,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 817571840} - m_RootOrder: 3 + 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: -620} + m_AnchoredPosition: {x: 0, y: 128} m_SizeDelta: {x: 784, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &70115384 @@ -301,6 +269,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 189791791} m_CullTransparentMesh: 0 +--- !u!1 &208268596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 208268597} + - component: {fileID: 208268599} + - component: {fileID: 208268598} + m_Layer: 5 + m_Name: Image_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &208268597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 208268596} + 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: 1001931508} + 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: 4} + m_SizeDelta: {x: 208, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &208268598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 208268596} + 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: 25e87dbf8c9dca34884b8267401b0a2a, 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!222 &208268599 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 208268596} + m_CullTransparentMesh: 0 --- !u!1001 &219610911 PrefabInstance: m_ObjectHideFlags: 0 @@ -504,7 +546,7 @@ PrefabInstance: - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3664916832564167477, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -671,6 +713,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} + - target: {fileID: 7758062554450272377, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -858,7 +905,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &533409545 PrefabInstance: @@ -870,7 +917,7 @@ PrefabInstance: - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} @@ -970,11 +1017,11 @@ RectTransform: m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 817571840} - m_RootOrder: 1 + 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: -438, y: -732} + m_AnchoredPosition: {x: -438, y: 0} m_SizeDelta: {x: 186, y: 196} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &541190666 @@ -1043,7 +1090,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &586451196 MonoBehaviour: @@ -1088,7 +1135,7 @@ RectTransform: m_Children: - {fileID: 1611898339} m_Father: {fileID: 219610915} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1646,31 +1693,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6124127957076174823, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6124127957076174823, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6124127957076174823, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6124127957362852678, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6124127957362852678, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -1176 - objectReference: {fileID: 0} - target: {fileID: 6124127957792349540, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Name @@ -1788,17 +1810,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} - propertyPath: m_AnchoredPosition.y - value: 376.00027 - objectReference: {fileID: 0} - - target: {fileID: 6124127958085519822, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6124127958085519822, guid: b24d8537ddbd94882ad379e4b679f044, - type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 6134734927453340133, guid: b24d8537ddbd94882ad379e4b679f044, @@ -2107,101 +2119,21 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2013648489} - {fileID: 2097050093} - {fileID: 541190665} - {fileID: 1954136209} - {fileID: 70115383} - - {fileID: 1280872480} + - {fileID: 1403936349} - {fileID: 1414621472} m_Father: {fileID: 1611898339} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -900, y: -946} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -697} + m_SizeDelta: {x: 1766, y: 260} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &900187652 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 900187653} - - component: {fileID: 900187654} - m_Layer: 0 - m_Name: BackGround - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &900187653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900187652} - 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: 5420119} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &900187654 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 900187652} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 6c0266f7f3e85d64496c8609d25d4bfc, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 17.66, y: 22.08039} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &935850165 GameObject: m_ObjectHideFlags: 0 @@ -2276,6 +2208,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 +--- !u!1 &1001931507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1001931508} + - component: {fileID: 1001931512} + - component: {fileID: 1001931511} + - component: {fileID: 1001931510} + - component: {fileID: 1001931509} + m_Layer: 5 + m_Name: Button_Tasting _off + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1001931508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001931507} + 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: 208268597} + m_Father: {fileID: 1403936349} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -3, y: -2} + m_SizeDelta: {x: 300, y: 138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1001931509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001931507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!114 &1001931510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001931507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1001931511} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1001931511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001931507} + 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: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10e3190c1e1a2fc44859100040f3310c, 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 &1001931512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001931507} + m_CullTransparentMesh: 0 --- !u!1 &1280872479 GameObject: m_ObjectHideFlags: 0 @@ -2308,12 +2376,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1582909266} - m_Father: {fileID: 817571840} - m_RootOrder: 4 + m_Father: {fileID: 1403936349} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 337, y: -690} + m_AnchoredPosition: {x: -3, y: -2} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1280872481 @@ -2486,6 +2554,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322368921} m_CullTransparentMesh: 0 +--- !u!1 &1403936348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1403936349} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1403936349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403936348} + 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: 1280872480} + - {fileID: 1001931508} + m_Father: {fileID: 817571840} + 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: 340, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1405932574 GameObject: m_ObjectHideFlags: 0 @@ -2590,11 +2695,11 @@ RectTransform: m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 817571840} - 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: 0} - m_AnchoredPosition: {x: -94, y: -685} + m_AnchoredPosition: {x: -94, y: 127.99997} m_SizeDelta: {x: 800, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1414621473 @@ -2749,87 +2854,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1883353298 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1883353299} - - component: {fileID: 1883353300} - m_Layer: 0 - m_Name: title_logo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1883353299 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1883353298} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.04, y: 8.51, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5420119} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1883353300 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1883353298} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 4.66, y: 0.54} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -2943,11 +2967,11 @@ RectTransform: m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 817571840} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -17.291} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 462, y: -675} + m_AnchoredPosition: {x: 462, y: 55} m_SizeDelta: {x: 200, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1954136210 @@ -2987,6 +3011,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1954136208} m_CullTransparentMesh: 0 +--- !u!1 &2013648488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013648489} + - component: {fileID: 2013648491} + - component: {fileID: 2013648490} + m_Layer: 5 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2013648489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013648488} + 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: 817571840} + 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: 1766, y: 260} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2013648490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013648488} + 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: b8ec9ac9caba009469308299304b4062, 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 &2013648491 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013648488} + m_CullTransparentMesh: 0 --- !u!1 &2097050092 GameObject: m_ObjectHideFlags: 0 @@ -3017,11 +3115,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 817571840} - m_RootOrder: 0 + 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: -38, y: -769} + m_AnchoredPosition: {x: -38, y: -37} m_SizeDelta: {x: 700, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2097050094 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index f79de36b..db08e075 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -34,7 +34,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: -95.8, y: -22.3} + m_AnchoredPosition: {x: -68.500015, y: -44.700024} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6556948699061727839 @@ -116,7 +116,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: 444, y: 200} + m_SizeDelta: {x: 410, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5776310992788139834 CanvasRenderer: @@ -321,7 +321,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -135.2, y: 20.8} + m_AnchoredPosition: {x: -107.9, y: -1.6} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2929932626624286251 @@ -357,7 +357,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: -135, y: -66} + m_AnchoredPosition: {x: -107.70001, y: -88.400024} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2929932626752093613 @@ -394,8 +394,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: 83.5, y: 68} - m_SizeDelta: {x: 250, y: 50} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 380, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932626752093610 CanvasRenderer: @@ -426,18 +426,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 23 - m_FontStyle: 0 + m_FontSize: 25 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 23 + m_MaxSize: 25 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3" + m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &2929932626910560294 GameObject: m_ObjectHideFlags: 0 @@ -628,7 +628,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: 444, y: 200} + m_SizeDelta: {x: 410, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5490177795204899762 MonoBehaviour: @@ -690,7 +690,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -100} + m_AnchoredPosition: {x: 0, y: -129.2} m_SizeDelta: {x: 172, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3788395727770399120 @@ -768,7 +768,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: 444, y: 200} + m_SizeDelta: {x: 410, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3458940277878489447 CanvasRenderer: @@ -842,8 +842,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: 81, y: -23} - m_SizeDelta: {x: 260, y: 130} + m_AnchoredPosition: {x: 91.8, y: -24} + m_SizeDelta: {x: 180, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6592824682905068701 GameObject: @@ -1117,7 +1117,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -98.80005 + value: -93 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1431,12 +1431,12 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.x - value: 161 + value: 33.199997 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -98.8 + value: -158.4 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1631,7 +1631,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -34.2 + value: -29.4 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} 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 7da3b273..efb4becb 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -2075,7 +2075,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: 450, y: 180} + m_SizeDelta: {x: 550, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1116792172 MonoBehaviour: @@ -3329,7 +3329,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/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 799bd0e3..0c26b1a9 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -152,14 +152,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 28991872} - - {fileID: 1578250478} m_Father: {fileID: 203585998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -11.799988, y: 0} - m_SizeDelta: {x: -42.699986, y: 0} + m_AnchoredPosition: {x: -11.799988, y: 17.899994} + m_SizeDelta: {x: -42.69995, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &25421136 MonoBehaviour: @@ -259,8 +258,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 13, y: 0} + m_SizeDelta: {x: -4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &28991873 MonoBehaviour: @@ -282,8 +281,8 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 490, y: 300} - m_Spacing: {x: -20, y: -80.5} + m_CellSize: {x: 505.6, y: 100} + m_Spacing: {x: -81.8, y: 180} m_Constraint: 1 m_ConstraintCount: 2 --- !u!114 &28991874 @@ -717,6 +716,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!1 &199954320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199954321} + - component: {fileID: 199954323} + - component: {fileID: 199954322} + m_Layer: 0 + m_Name: Window_mat_detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &199954321 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199954320} + 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: 329292690} + 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: 50} + m_SizeDelta: {x: 930, y: 930} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &199954322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199954320} + 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: 378448de62cf2ef45aef2a088bf13a1e, 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 &199954323 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199954320} + m_CullTransparentMesh: 0 --- !u!1 &203585997 GameObject: m_ObjectHideFlags: 0 @@ -749,6 +822,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 25421135} + - {fileID: 1578250478} - {fileID: 409545282} m_Father: {fileID: 1455181832} m_RootOrder: 1 @@ -756,7 +830,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 34, y: 48} - m_SizeDelta: {x: 998.8, y: 780} + m_SizeDelta: {x: 998.8, y: 844.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &203585999 MonoBehaviour: @@ -873,7 +947,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 47} m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 0} --- !u!114 &277152054 @@ -941,13 +1015,14 @@ RectTransform: m_LocalScale: {x: 0.85, y: 0.85, z: 0.85} m_Children: - {fileID: 1594398330} + - {fileID: 199954321} - {fileID: 1455181832} m_Father: {fileID: 111842754} 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: 49} + m_AnchoredPosition: {x: 0, y: 75} m_SizeDelta: {x: 1186, y: 1310} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &384598190 stripped @@ -988,11 +1063,11 @@ RectTransform: m_Children: - {fileID: 1062067456} m_Father: {fileID: 203585998} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -20, y: 0} m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!114 &409545283 @@ -1112,7 +1187,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1122,17 +1197,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1172,12 +1247,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 676.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -330 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1479,7 +1554,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1489,17 +1564,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1539,12 +1614,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 252.8 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -330 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1661,7 +1736,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: -477} + m_AnchoredPosition: {x: 0, y: -507} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &968322477 @@ -2353,7 +2428,7 @@ RectTransform: - {fileID: 203585998} - {fileID: 968322476} m_Father: {fileID: 329292690} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2575,7 +2650,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -153} + m_AnchoredPosition: {x: 0, y: -99} m_SizeDelta: {x: 404, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 @@ -2645,7 +2720,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2655,17 +2730,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2705,12 +2780,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 676.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2815,17 +2890,17 @@ RectTransform: m_GameObject: {fileID: 1578250477} 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_LocalScale: {x: 0.89998996, y: 1, z: 1} m_Children: - {fileID: 1706201272} - {fileID: 277152053} - m_Father: {fileID: 25421135} + m_Father: {fileID: 203585998} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -33.149994, y: -2.1000366} + m_SizeDelta: {x: -42.69995, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1594398329 GameObject: @@ -2982,7 +3057,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 11} m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1706201273 @@ -3221,7 +3296,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3231,17 +3306,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3281,12 +3356,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 252.8 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -610 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3891,7 +3966,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3901,17 +3976,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3951,12 +4026,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 252.8 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 7fc56bdb..466270c8 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,17 +609,17 @@ 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_SizeDelta: {x: 450, y: 180} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 480, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368657787313 CanvasRenderer: @@ -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} + m_SizeDelta: {x: 510, 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} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index ce40c7ab..5afadf6e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -197,6 +197,8 @@ GameObject: m_Component: - component: {fileID: 102114746} - component: {fileID: 102114747} + - component: {fileID: 102114749} + - component: {fileID: 102114748} m_Layer: 0 m_Name: title_Frame m_TagString: Untagged @@ -204,8 +206,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &102114746 -Transform: +--- !u!224 &102114746 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -218,6 +220,11 @@ Transform: m_Father: {fileID: 1578305212} 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: 8.47} + m_SizeDelta: {x: 700, y: 150} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &102114747 SpriteRenderer: m_ObjectHideFlags: 0 @@ -268,6 +275,43 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &102114748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 102114745} + 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: 3536ca1b52bdfa142a0d2dea94b66b8a, 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!222 &102114749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 102114745} + m_CullTransparentMesh: 0 --- !u!1 &336140365 GameObject: m_ObjectHideFlags: 0 @@ -278,6 +322,8 @@ GameObject: m_Component: - component: {fileID: 336140366} - component: {fileID: 336140367} + - component: {fileID: 336140369} + - component: {fileID: 336140368} m_Layer: 0 m_Name: title_logo m_TagString: Untagged @@ -285,20 +331,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &336140366 -Transform: +--- !u!224 &336140366 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 336140365} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.04, y: 0.04, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1578305212} 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.04, y: 8.51} + m_SizeDelta: {x: 466, y: 54} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &336140367 SpriteRenderer: m_ObjectHideFlags: 0 @@ -349,6 +400,43 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &336140368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336140365} + 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: 84efab5b8d1b5274cb7510ddcb5b2187, 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!222 &336140369 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336140365} + m_CullTransparentMesh: 0 --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -486,6 +574,8 @@ GameObject: m_Component: - component: {fileID: 1016485909} - component: {fileID: 1016485910} + - component: {fileID: 1016485912} + - component: {fileID: 1016485911} m_Layer: 0 m_Name: BackGround m_TagString: Untagged @@ -493,8 +583,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1016485909 -Transform: +--- !u!224 &1016485909 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -507,6 +597,11 @@ Transform: m_Father: {fileID: 1381610493} 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: 1765.9999, y: 2208.039} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &1016485910 SpriteRenderer: m_ObjectHideFlags: 0 @@ -557,6 +652,43 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1016485911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016485908} + 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: 28a88afc3eafafd46836fc0a92d784ca, 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!222 &1016485912 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1016485908} + m_CullTransparentMesh: 0 --- !u!1001 &1098091307 PrefabInstance: m_ObjectHideFlags: 0 @@ -642,6 +774,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -22 objectReference: {fileID: 0} + - target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -832,6 +969,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 260.69922 objectReference: {fileID: 0} + - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -915,37 +1057,37 @@ PrefabInstance: - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_SizeDelta.x - value: 1028 + value: 8 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_SizeDelta.y - value: 1150 + value: -1058 objectReference: {fileID: 0} - target: {fileID: 2912042418274684491, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3}