diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_ShortenedArrow_movie.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_ShortenedArrow_movie.png new file mode 100644 index 00000000..bfe48554 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_ShortenedArrow_movie.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_ShortenedArrow_movie.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_ShortenedArrow_movie.png.meta new file mode 100644 index 00000000..bd91affe --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_ShortenedArrow_movie.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 95b78347887235547944e937a86d74ad +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/CornField/CornField_salesclerk_Blue_body.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_Blue_body.png new file mode 100644 index 00000000..590389e7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_Blue_body.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_Blue_body.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_Blue_body.png.meta new file mode 100644 index 00000000..ecc378e2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_Blue_body.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 794f5ca3059c09d4bb90ec2fc2e7bc6a +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/CornField/CornField_salesclerk_fertilizer.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_fertilizer.png new file mode 100644 index 00000000..69677582 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_fertilizer.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_fertilizer.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_fertilizer.png.meta new file mode 100644 index 00000000..e991d17f --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_salesclerk_fertilizer.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bd2c85ebf06d10a42961abb8676755d4 +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/CornField/ui_button_icon_Footer_fertilizer.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer.png new file mode 100644 index 00000000..64b2a9f4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer.png.meta new file mode 100644 index 00000000..864533b1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1bcc1052602279045b0a01520df4728b +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/CornField/ui_button_icon_Footer_fertilizer_logo.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer_logo.png new file mode 100644 index 00000000..b8a39ca9 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer_logo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer_logo.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer_logo.png.meta new file mode 100644 index 00000000..ae9f8e99 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_icon_Footer_fertilizer_logo.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b9dba4f783fd158408455c008aa8696b +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/Main/Movie/ui_Main_movie_Achievement_icon_coin.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png index 73e35f17..a980dd6c 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_a.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_a.png new file mode 100644 index 00000000..ed646fff Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_a.png.meta new file mode 100644 index 00000000..0866cbe4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b1697d2bd23bcd0418ef61ec722d8b56 +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/Main/Movie/ui_button_icon_movie_fertilizer_b.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_b.png new file mode 100644 index 00000000..1d12b4b1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_b.png.meta new file mode 100644 index 00000000..b0fe0d0d --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_fertilizer_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 47484cbb1931a13429f3a62e0876ede9 +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/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 27d59d93..913d8c99 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -311,6 +311,126 @@ MonoBehaviour: type: 3} thrust: 40 machineTarget: {fileID: 1491597820} +--- !u!1 &313196410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 313196411} + - component: {fileID: 313196414} + - component: {fileID: 313196413} + - component: {fileID: 313196412} + m_Layer: 5 + m_Name: Button_fertilizer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &313196411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313196410} + 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: + - {fileID: 2136060763} + - {fileID: 443195451} + m_Father: {fileID: 387414334} + 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: 685} + m_SizeDelta: {x: 300, y: 202} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &313196412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313196410} + 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: 313196413} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &313196413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313196410} + 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: 07b37f98942beee44ad83b3152265db4, 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 &313196414 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313196410} + m_CullTransparentMesh: 0 --- !u!1001 &387414332 PrefabInstance: m_ObjectHideFlags: 0 @@ -334,6 +454,18 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 320398124, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_LocalScale.x + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 320398124, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_LocalScale.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 320398124, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_LocalScale.z + value: 0.9 + objectReference: {fileID: 0} - target: {fileID: 320398124, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -675,6 +807,80 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 387414332} m_PrefabAsset: {fileID: 0} +--- !u!1 &443195450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 443195451} + - component: {fileID: 443195453} + - component: {fileID: 443195452} + 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 &443195451 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443195450} + 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: 313196411} + 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: 42, y: -29.000061} + m_SizeDelta: {x: 92, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &443195452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443195450} + 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: b9dba4f783fd158408455c008aa8696b, 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 &443195453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443195450} + m_CullTransparentMesh: 0 --- !u!1 &536970157 GameObject: m_ObjectHideFlags: 0 @@ -1686,6 +1892,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2136060762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2136060763} + - component: {fileID: 2136060765} + - component: {fileID: 2136060764} + m_Layer: 5 + m_Name: icon_fertilizer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2136060763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136060762} + 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: 313196411} + 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: 42, y: 47} + m_SizeDelta: {x: 114, y: 114} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2136060764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136060762} + 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: 1bcc1052602279045b0a01520df4728b, 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 &2136060765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136060762} + m_CullTransparentMesh: 0 --- !u!4 &2138129848 stripped Transform: m_CorrespondingSourceObject: {fileID: 47850826084813397, guid: 178fc213f1f0b465daddb592038c9210, diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingOne.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingOne.prefab index 999489a3..8d9c5734 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingOne.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingOne.prefab @@ -113,6 +113,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7663159526704253362, guid: 29ad64acc5cd34684bb30b97ddc077ae, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} - target: {fileID: 8025491985220828092, guid: 29ad64acc5cd34684bb30b97ddc077ae, type: 3} propertyPath: m_Name @@ -144,6 +149,11 @@ PrefabInstance: propertyPath: m_Name value: Corn_one_lv4 objectReference: {fileID: 0} + - target: {fileID: 3235344611300204384, guid: 3d9074ff9e2da4fca8b472ae71154e17, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} - target: {fileID: 7955334935270667293, guid: 3d9074ff9e2da4fca8b472ae71154e17, type: 3} propertyPath: m_RootOrder @@ -220,6 +230,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6409876887569556127} m_Modifications: + - target: {fileID: 1353503507147965572, guid: 69479a942167f499382e0114aed64476, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} - target: {fileID: 1725398491288811146, guid: 69479a942167f499382e0114aed64476, type: 3} propertyPath: m_Name @@ -306,6 +321,11 @@ PrefabInstance: propertyPath: m_Name value: Corn_one_lv3 objectReference: {fileID: 0} + - target: {fileID: 397615292954623128, guid: 2c7c89d1c9c7a4ddab79278effae1bee, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} - target: {fileID: 5117737557916342245, guid: 2c7c89d1c9c7a4ddab79278effae1bee, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingThree.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingThree.prefab index 93899af3..a5215cf6 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingThree.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingThree.prefab @@ -113,11 +113,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1337658685694684511, guid: 35540a5732ca5430192ae3708e9635ec, + type: 3} + propertyPath: m_SortingOrder + value: 25 + objectReference: {fileID: 0} - target: {fileID: 4807779552185829177, guid: 35540a5732ca5430192ae3708e9635ec, type: 3} propertyPath: m_Name value: Corn_Three_lv1 objectReference: {fileID: 0} + - target: {fileID: 5152661725813880119, guid: 35540a5732ca5430192ae3708e9635ec, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35540a5732ca5430192ae3708e9635ec, type: 3} --- !u!4 &2586354293841631305 stripped @@ -139,11 +149,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1551117631514267271} m_Modifications: + - target: {fileID: 85588844946871242, guid: 21a49493746c846819e7181a99ff3f84, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} - target: {fileID: 290858296238416324, guid: 21a49493746c846819e7181a99ff3f84, type: 3} propertyPath: m_Name value: Corn_Three_lv4 objectReference: {fileID: 0} + - target: {fileID: 3550598041532600022, guid: 21a49493746c846819e7181a99ff3f84, + type: 3} + propertyPath: m_SortingOrder + value: 25 + objectReference: {fileID: 0} - target: {fileID: 4877772955831941303, guid: 21a49493746c846819e7181a99ff3f84, type: 3} propertyPath: m_RootOrder @@ -225,6 +245,16 @@ PrefabInstance: propertyPath: m_Name value: Corn_Three_lv2 objectReference: {fileID: 0} + - target: {fileID: 2304750524778999713, guid: 43bff98228ba3425f8c91a11d2880816, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 6310016587354062198, guid: 43bff98228ba3425f8c91a11d2880816, + type: 3} + propertyPath: m_SortingOrder + value: 25 + objectReference: {fileID: 0} - target: {fileID: 6736637740144461020, guid: 43bff98228ba3425f8c91a11d2880816, type: 3} propertyPath: m_RootOrder @@ -306,6 +336,16 @@ PrefabInstance: propertyPath: m_Name value: Corn_Three_lv3 objectReference: {fileID: 0} + - target: {fileID: 2703951087400088895, guid: fe3c97f9f1cf64d939e03a38ec63f20a, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 5930866696512914229, guid: fe3c97f9f1cf64d939e03a38ec63f20a, + type: 3} + propertyPath: m_SortingOrder + value: 25 + objectReference: {fileID: 0} - target: {fileID: 7423932202558594626, guid: fe3c97f9f1cf64d939e03a38ec63f20a, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingTwo.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingTwo.prefab index 210accbf..c9e59f0f 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingTwo.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/SeedlingTwo.prefab @@ -63,6 +63,16 @@ PrefabInstance: propertyPath: m_Name value: Corn_two_lv2 objectReference: {fileID: 0} + - target: {fileID: 2304750524778999713, guid: db1be0552ba754068a7adfadab81c23a, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 6310016587354062198, guid: db1be0552ba754068a7adfadab81c23a, + type: 3} + propertyPath: m_SortingOrder + value: 24 + objectReference: {fileID: 0} - target: {fileID: 6736637740144461020, guid: db1be0552ba754068a7adfadab81c23a, type: 3} propertyPath: m_RootOrder @@ -194,11 +204,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1337658685694684511, guid: f81d40beff41c4950a567c1d82f243d0, + type: 3} + propertyPath: m_SortingOrder + value: 24 + objectReference: {fileID: 0} - target: {fileID: 4807779552185829177, guid: f81d40beff41c4950a567c1d82f243d0, type: 3} propertyPath: m_Name value: Corn_two_lv1 objectReference: {fileID: 0} + - target: {fileID: 5152661725813880119, guid: f81d40beff41c4950a567c1d82f243d0, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f81d40beff41c4950a567c1d82f243d0, type: 3} --- !u!4 &4227616761447240443 stripped @@ -220,11 +240,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4054214130413066182} m_Modifications: + - target: {fileID: 85588844946871242, guid: dab91f354954c4b7bb7587f11a331185, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} - target: {fileID: 290858296238416324, guid: dab91f354954c4b7bb7587f11a331185, type: 3} propertyPath: m_Name value: Corn_two_lv4 objectReference: {fileID: 0} + - target: {fileID: 3550598041532600022, guid: dab91f354954c4b7bb7587f11a331185, + type: 3} + propertyPath: m_SortingOrder + value: 24 + objectReference: {fileID: 0} - target: {fileID: 4877772955831941303, guid: dab91f354954c4b7bb7587f11a331185, type: 3} propertyPath: m_RootOrder @@ -306,6 +336,16 @@ PrefabInstance: propertyPath: m_Name value: Corn_two_lv3 objectReference: {fileID: 0} + - target: {fileID: 2703951087400088895, guid: 1ba7e3a9f4f4f431c92cbf0aefa6244a, + type: 3} + propertyPath: m_SortingOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 5930866696512914229, guid: 1ba7e3a9f4f4f431c92cbf0aefa6244a, + type: 3} + propertyPath: m_SortingOrder + value: 24 + objectReference: {fileID: 0} - target: {fileID: 7423932202558594626, guid: 1ba7e3a9f4f4f431c92cbf0aefa6244a, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index bccf955c..4fd6dbbc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -368,12 +368,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 504822411} + m_Father: {fileID: 1081810293} 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: 91, y: -42} + m_AnchoredPosition: {x: 91, y: -92.00004} m_SizeDelta: {x: 116, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &164370258 @@ -658,6 +658,43 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &471677967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 471677968} + m_Layer: 5 + m_Name: icon_fertilizer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &471677968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 471677967} + 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: 1113904306} + - {fileID: 1949495566} + m_Father: {fileID: 504822411} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &504822410 GameObject: m_ObjectHideFlags: 0 @@ -685,8 +722,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1931111336} - - {fileID: 164370257} + - {fileID: 471677968} + - {fileID: 1081810293} - {fileID: 251547153} m_Father: {fileID: 361105480} m_RootOrder: 2 @@ -696,6 +733,117 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 293} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1081810292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1081810293} + m_Layer: 5 + m_Name: icon_coin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1081810293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081810292} + 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: 1931111336} + - {fileID: 164370257} + m_Father: {fileID: 504822411} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1113904305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1113904306} + - component: {fileID: 1113904308} + - component: {fileID: 1113904307} + m_Layer: 5 + m_Name: icon_fertilizer (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1113904306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113904305} + 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: 471677968} + m_RootOrder: 0 + 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: -82.1, y: -108.7} + m_SizeDelta: {x: 94, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1113904307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113904305} + 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: b1697d2bd23bcd0418ef61ec722d8b56, 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 &1113904308 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113904305} + m_CullTransparentMesh: 0 --- !u!1 &1298517017 GameObject: m_ObjectHideFlags: 0 @@ -1084,12 +1232,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 504822411} + m_Father: {fileID: 1081810293} m_RootOrder: 0 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: -93, y: -45} + m_AnchoredPosition: {x: -93, y: -94.99992} m_SizeDelta: {x: 116, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1931111337 @@ -1129,6 +1277,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1931111335} m_CullTransparentMesh: 0 +--- !u!1 &1949495565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1949495566} + - component: {fileID: 1949495568} + - component: {fileID: 1949495567} + m_Layer: 5 + m_Name: icon_fertilizer (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1949495566 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949495565} + 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: 471677968} + 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: 82.3, y: -101.4} + m_SizeDelta: {x: 100, y: 112} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1949495567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949495565} + 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: 47484cbb1931a13429f3a62e0876ede9, 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 &1949495568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1949495565} + m_CullTransparentMesh: 0 --- !u!1 &1957464492 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index bbdf9443..f3d03615 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -2034,6 +2034,21 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalScale.x + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalScale.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalScale.z + value: 0.9 + objectReference: {fileID: 0} - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_fontColor.a @@ -5337,6 +5352,7 @@ MonoBehaviour: walkSideBottomPos: -8 pinkWalkSpeed: 4 coolTime: 20 + fewerBorder: 5 --- !u!210 &1749782977 SortingGroup: m_ObjectHideFlags: 0