diff --git a/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.anim b/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.anim index 18fbd09c..382a75e0 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Button_FieldSummary.anim @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -660 + value: -668 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -87,7 +87,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -660 + value: -668 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png deleted file mode 100644 index 03e4c75a..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_a.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_a.png new file mode 100644 index 00000000..af1978c3 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_a.png.meta similarity index 98% rename from popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png.meta rename to popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_a.png.meta index 5ca9a2e3..43ab67a7 100644 --- a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_a.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a72d2b5d8cb90d149be2d15cc646011d +guid: 2081be9cdca0565408f74cac50a734cc TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_b.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_b.png new file mode 100644 index 00000000..f7d61637 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_b.png.meta new file mode 100644 index 00000000..a59db940 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9c97716a67f28004d9f3a4583e164630 +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/minigame/stage/minigame_stage_background_Ground_c.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_c.png new file mode 100644 index 00000000..82feb70b Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_c.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_c.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_c.png.meta new file mode 100644 index 00000000..8f5fa088 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_c.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ed6394d582c755c4ca65e638a5a81061 +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/minigame/stage/minigame_stage_background_Ground_d.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_d.png new file mode 100644 index 00000000..e639bf09 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_d.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_d.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_d.png.meta new file mode 100644 index 00000000..ccf5fc53 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_d.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 7fa351551286dc148a3023f5bba7971b +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/minigame/stage/minigame_stage_background_Ground_e.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_e.png new file mode 100644 index 00000000..bec39d29 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_e.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_e.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_e.png.meta new file mode 100644 index 00000000..53a53ae0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_e.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: cb1597f3767b9d3419f8916185898ea3 +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/minigame/stage/minigame_stage_background_Ground_f.png b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_f.png new file mode 100644 index 00000000..93587569 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_f.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_f.png.meta b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_f.png.meta new file mode 100644 index 00000000..8306d40a --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Ground_f.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9fbde169ada49434e95cf5ef93dbdc02 +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/Material_en.meta b/popcorn/Assets/MyGame/Resources/Material_en.meta new file mode 100644 index 00000000..e51d1901 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8926530155ae1c744b20b4b7e262cc02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField.meta new file mode 100644 index 00000000..bf2fb04d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5ddfbcabd2c9ac4a80b3457e1f8d691 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement.meta new file mode 100644 index 00000000..13821474 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15b9047e03ceb6245b7fd653afcc5267 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_GrainFrame_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_GrainFrame_en.png new file mode 100644 index 00000000..f9c9244c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_GrainFrame_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_GrainFrame_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_GrainFrame_en.png.meta new file mode 100644 index 00000000..11af045b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_GrainFrame_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9d8b7eeea01eb2e438dfac06bb61af65 +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/Material_en/CornField/Reinforcement/ui_ComField_pop_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_title_logo_en.png new file mode 100644 index 00000000..e42daa25 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_title_logo_en.png.meta new file mode 100644 index 00000000..9afef979 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_ComField_pop_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c390477b4fbc6074698e6cfd4463f9ea +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/Material_en/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo_en.png new file mode 100644 index 00000000..0a0c2588 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo_en.png.meta new file mode 100644 index 00000000..4d61dec6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_ReinforcementMax_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 01e9c701c8d844e47952d22cf715dc5e +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/Material_en/CornField/Reinforcement/ui_button_icon_Footer_Reinforcement_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_Reinforcement_logo_en.png new file mode 100644 index 00000000..f6548eed Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_Reinforcement_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_Reinforcement_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_Reinforcement_logo_en.png.meta new file mode 100644 index 00000000..228b5cbc --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_Footer_Reinforcement_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f0e107abf5ab87d4cb79e289197aea93 +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/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_en.png new file mode 100644 index 00000000..3fdc5f11 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_en.png.meta new file mode 100644 index 00000000..09d361ad --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: af08f912ee6d85f4595c2fe8f85c6507 +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/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_gray_en.png new file mode 100644 index 00000000..66fbe490 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_gray_en.png.meta new file mode 100644 index 00000000..b92df000 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_release_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 89ea0df8f37a2334a95f4fb29e2ea231 +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/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_en.png new file mode 100644 index 00000000..58e6bbf5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_en.png.meta new file mode 100644 index 00000000..4a2483f5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4a2a9482dd8671844813d7eb2978e059 +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/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray_en.png new file mode 100644 index 00000000..8be8f162 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray_en.png.meta new file mode 100644 index 00000000..f8c76f06 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/Reinforcement/ui_button_icon_strengthening_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 29098744b1af3364ab6600316ce9e9ae +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/Material_en/CornField/ui_CornField_corn_text_grain_addition_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_addition_en.png new file mode 100644 index 00000000..c4eaa460 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_addition_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_addition_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_addition_en.png.meta new file mode 100644 index 00000000..9b72530b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_addition_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3e6395a0cda798a47a6ddcc17370e27a +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: 78, y: 0, z: 88, 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/Material_en/CornField/ui_CornField_corn_text_grain_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_en.png new file mode 100644 index 00000000..8c110e2e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_en.png.meta new file mode 100644 index 00000000..bbda9109 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_CornField_corn_text_grain_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 33965d17844ba2f4a813cf42bf932db0 +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: 102, y: 36, z: 93, w: 36} + 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/Material_en/CornField/ui_button_Blue_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_Blue_logo_en.png new file mode 100644 index 00000000..d077595b Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_Blue_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_Blue_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_Blue_logo_en.png.meta new file mode 100644 index 00000000..9f6eee45 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_Blue_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 51e9c0c2590d51740bd47383d0348d04 +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/Material_en/CornField/ui_button_icon_Footer_fertilizer_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_icon_Footer_fertilizer_logo_en.png new file mode 100644 index 00000000..3408b319 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_icon_Footer_fertilizer_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_icon_Footer_fertilizer_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_icon_Footer_fertilizer_logo_en.png.meta new file mode 100644 index 00000000..906c4e16 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/CornField/ui_button_icon_Footer_fertilizer_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c1b4c7d4cfe573243a1dc161efcc15b8 +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/Material_en/Main.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main.meta new file mode 100644 index 00000000..46130344 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fc2d40f6db4f056469555e2f46cc2d55 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking.meta new file mode 100644 index 00000000..a1d2bb7d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7d5d72158978ab4f90df8c5d0005e28 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_en.png new file mode 100644 index 00000000..2447ee88 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_en.png.meta new file mode 100644 index 00000000..35848918 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8aea6767956ae9342abeb93a801218c5 +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/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_en.png new file mode 100644 index 00000000..2cc6ed20 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_en.png.meta new file mode 100644 index 00000000..8f1796fd --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bc7417fb533e06640a505755bf3b4d86 +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/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_en.png new file mode 100644 index 00000000..409a702a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_en.png.meta new file mode 100644 index 00000000..0f97432b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d57dc601b5a0e9b4d96650a3d878673f +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/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_en.png new file mode 100644 index 00000000..2e2b295c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_en.png.meta new file mode 100644 index 00000000..8d365301 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 131c154b52b5f4043aaecbcd66473abe +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/Material_en/Main/AutomaticCooking/ui_button_icon_empty_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_empty_logo_en.png new file mode 100644 index 00000000..5d53861c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_empty_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_empty_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_empty_logo_en.png.meta new file mode 100644 index 00000000..1a9b1015 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_empty_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4bbbf0927dd59b6429b67fed20321636 +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/Material_en/Main/AutomaticCooking/ui_button_icon_receive_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_receive_logo_en.png new file mode 100644 index 00000000..3d8e921c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_receive_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_receive_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_receive_logo_en.png.meta new file mode 100644 index 00000000..31369eac --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/AutomaticCooking/ui_button_icon_receive_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 859db30fafea43a49b6f7440affcf4ca +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/Material_en/Main/BulkOrder.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder.meta new file mode 100644 index 00000000..96d39233 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 807e9fe43fc593d469053b7b3ea6c149 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Achievement_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Achievement_title_en.png new file mode 100644 index 00000000..43f570fa Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Achievement_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Achievement_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Achievement_title_en.png.meta new file mode 100644 index 00000000..e0c2f320 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Achievement_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5c6d3bd70b7c3f545ae2673c91ba5e35 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Client_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Client_text_en.png new file mode 100644 index 00000000..c5f1964b Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Client_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Client_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Client_text_en.png.meta new file mode 100644 index 00000000..d299d4a2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_Client_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4011d10062c94334d84399c8519e3ed1 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_en.png new file mode 100644 index 00000000..ae7bd750 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_en.png.meta new file mode 100644 index 00000000..2def259a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_White_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3039f511366494148bc836ca960a11e7 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_en.png new file mode 100644 index 00000000..524a2659 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_en.png.meta new file mode 100644 index 00000000..1de647c1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_POP_Quantity_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 345ce00602f58074fbb6c0d965ed427a +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_en.png new file mode 100644 index 00000000..140420cb Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_en.png.meta new file mode 100644 index 00000000..a65f069b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bc6530bc2e452114983904ff37892878 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_en.png new file mode 100644 index 00000000..c00492dd Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_en.png.meta new file mode 100644 index 00000000..20c76cb5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_cancel_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ef629d99a80507944968acb66e51b307 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_en.png new file mode 100644 index 00000000..ed3e82ac Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_en.png.meta new file mode 100644 index 00000000..a4abf34d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_explanation_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a5e177dea40081446b2dc78070034c04 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_en.png new file mode 100644 index 00000000..ed5d1210 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_en.png.meta new file mode 100644 index 00000000..7022d82a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_AchievementReward_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e0e63c471a2a05a4f8a3b9e5de25db4f +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_en.png new file mode 100644 index 00000000..88d13be8 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_en.png.meta new file mode 100644 index 00000000..a95533db --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_text_GreatSccessBonus_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c26ae926ef1c05f4fa308d0685afaf34 +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/Material_en/Main/BulkOrder/ui_Main_BulkOrder_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_title_logo_en.png new file mode 100644 index 00000000..c2fb78e5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_title_logo_en.png.meta new file mode 100644 index 00000000..7380b2dc --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_Main_BulkOrder_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 90d9bcf861b8f8446a37f440f410c45e +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/Material_en/Main/BulkOrder/ui_button_icon_Cooked_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_Cooked_logo_en.png new file mode 100644 index 00000000..eb139ee6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_Cooked_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_Cooked_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_Cooked_logo_en.png.meta new file mode 100644 index 00000000..348e79d5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_Cooked_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 50daa64ef03816f449465e8d26b1ecdd +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/Material_en/Main/BulkOrder/ui_button_icon_DoNot_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_DoNot_logo_en.png new file mode 100644 index 00000000..c80d9bd0 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_DoNot_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_DoNot_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_DoNot_logo_en.png.meta new file mode 100644 index 00000000..dfefc633 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_DoNot_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a867e1ff59aedbf48a8693fbf531ccb7 +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/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_a_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_a_en.png new file mode 100644 index 00000000..c95aa9f1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_a_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_a_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_a_en.png.meta new file mode 100644 index 00000000..0a22ae9a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_a_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9ec2253249fd8b043b5676e0b0acd740 +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/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_en.png new file mode 100644 index 00000000..fc70a489 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_en.png.meta new file mode 100644 index 00000000..8b66655a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_cancel_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6e94a28848db9ab44947f43b082812ce +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/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_en.png new file mode 100644 index 00000000..06972810 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_en.png.meta new file mode 100644 index 00000000..42175d83 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1b21c61c7670bb845aad6daba2d6e317 +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/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_gray_en.png new file mode 100644 index 00000000..b9c22c10 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_gray_en.png.meta new file mode 100644 index 00000000..16c240f6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_delivery_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c7aa1bd789aa20543849305b9e75e5bb +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/Material_en/Main/BulkOrder/ui_button_icon_ok_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_ok_logo_en.png new file mode 100644 index 00000000..be6e2d90 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_ok_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_ok_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_ok_logo_en.png.meta new file mode 100644 index 00000000..a5762cf6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/BulkOrder/ui_button_icon_ok_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5fa8aa825aa4e4b4c913721fc94933f0 +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/Material_en/Main/Mission.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission.meta new file mode 100644 index 00000000..e7db9c6f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54dd94eddbf2f0f479d13574616fefaa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_en.png new file mode 100644 index 00000000..f6de2c2f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_en.png.meta new file mode 100644 index 00000000..3f5df09d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_daily_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 73e0f8e8e6edccf439cd0a364c197223 +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/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_en.png new file mode 100644 index 00000000..905632a4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_en.png.meta new file mode 100644 index 00000000..87809409 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_Achievement_title_text_mission_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f97d0bf1b6ebd5f4794838b9577e2925 +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/Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en.png new file mode 100644 index 00000000..aa669103 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en.png.meta new file mode 100644 index 00000000..dc2dada5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ae89d010f4b0c9c48a4f9022c2d87d7f +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/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_daily_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_daily_en.png new file mode 100644 index 00000000..3550d660 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_daily_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_daily_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_daily_en.png.meta new file mode 100644 index 00000000..8db5a076 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_daily_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 49fd28526ab9a8c428a93e66a2bf760d +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/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_mission_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_mission_en.png new file mode 100644 index 00000000..4950963a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_mission_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_mission_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_mission_en.png.meta new file mode 100644 index 00000000..905e9007 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_Main_Mission_pop_button_text_mission_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8313e9dcb68d05b48a314fcb0ed387fd +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/Material_en/Main/Mission/ui_button_icon_completion_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_completion_logo_en.png new file mode 100644 index 00000000..b1db375b Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_completion_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_completion_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_completion_logo_en.png.meta new file mode 100644 index 00000000..e752232f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_completion_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1db3b35adbf917b4289e1d0b5c38dc76 +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/Material_en/Main/Mission/ui_button_icon_progress_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_progress_logo_en.png new file mode 100644 index 00000000..e1e52510 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_progress_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_progress_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_progress_logo_en.png.meta new file mode 100644 index 00000000..613f44f0 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Mission/ui_button_icon_progress_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ff32278fa02ebbe4aab807a618d780f1 +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/Material_en/Main/Movie.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie.meta new file mode 100644 index 00000000..dc0bb58a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2445b9fcb73f92439bd1e310f862a67 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png new file mode 100644 index 00000000..f92dc616 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png.meta new file mode 100644 index 00000000..d8da9c36 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4e16c84395ba5d84f9f4069bc908ab1d +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/Material_en/Main/Movie/ui_button_icon_GreatSuccess_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_GreatSuccess_logo_en.png new file mode 100644 index 00000000..449bf265 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_GreatSuccess_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_GreatSuccess_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_GreatSuccess_logo_en.png.meta new file mode 100644 index 00000000..b9b128eb --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_GreatSuccess_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f884f53aa39dffb4897d365fcdaefadf +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/Material_en/Main/Movie/ui_button_icon_movie_coin_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_coin_logo_en.png new file mode 100644 index 00000000..24aefd4d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_coin_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_coin_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_coin_logo_en.png.meta new file mode 100644 index 00000000..ad98ad3b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_coin_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5fd2665a31f914647be770facd5e156f +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/Material_en/Main/Movie/ui_button_icon_movie_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_logo_en.png new file mode 100644 index 00000000..851b8d27 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_logo_en.png.meta new file mode 100644 index 00000000..9cb15fea --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_button_icon_movie_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b6575785a082f8543bd6d9aa7906155b +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/Material_en/Main/Settings.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings.meta new file mode 100644 index 00000000..f62f4ed5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a841f8289c1f59e41843599c2e1d8f1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_button_icon_explanation_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_button_icon_explanation_logo_en.png new file mode 100644 index 00000000..695882f5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_button_icon_explanation_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_button_icon_explanation_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_button_icon_explanation_logo_en.png.meta new file mode 100644 index 00000000..acf644d1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_button_icon_explanation_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f741dc3c53e723947a77164154a746f5 +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/Material_en/Main/Settings/ui_Settings_explanation_HowToPlay_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_HowToPlay_en_Dither.png new file mode 100644 index 00000000..7cdb3a9a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_HowToPlay_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_HowToPlay_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_HowToPlay_en_Dither.png.meta new file mode 100644 index 00000000..04c51ef3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_HowToPlay_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 7f9708db240270d4fb39959ada4d959d +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/Material_en/Main/Settings/ui_Settings_explanation_popcorn_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_popcorn_en_Dither.png new file mode 100644 index 00000000..d88ae6f7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_popcorn_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_popcorn_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_popcorn_en_Dither.png.meta new file mode 100644 index 00000000..94d5fc90 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_popcorn_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 902be6f490ad23b49adbe6acd5edec63 +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/Material_en/Main/Settings/ui_Settings_explanation_stock_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_stock_en_Dither.png new file mode 100644 index 00000000..f48da7d5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_stock_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_stock_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_stock_en_Dither.png.meta new file mode 100644 index 00000000..2580822e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_explanation_stock_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 99219736c069974409334468f93cef39 +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/Material_en/Main/Settings/ui_Settings_icon_sound_bgm_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_bgm_en.png new file mode 100644 index 00000000..38df4427 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_bgm_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_bgm_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_bgm_en.png.meta new file mode 100644 index 00000000..547d1ef5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_bgm_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 374760d4400fdb7499407a91c0861cf8 +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/Material_en/Main/Settings/ui_Settings_icon_sound_se_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_se_en.png new file mode 100644 index 00000000..f63c72c4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_se_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_se_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_se_en.png.meta new file mode 100644 index 00000000..3f01b873 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_icon_sound_se_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 791818e298ddfa4409cacae99c6b4efd +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/Material_en/Main/Settings/ui_Settings_rogo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_rogo_en.png new file mode 100644 index 00000000..66bb895f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_rogo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_rogo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_rogo_en.png.meta new file mode 100644 index 00000000..de5be8c1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/Settings/ui_Settings_rogo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3c84112a54b2bef4081e716c2cdee58d +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/Material_en/Main/information.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/information.meta new file mode 100644 index 00000000..83180ef2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/information.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b786c8d3f4e7bb4cb54ffb22788cac0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_a_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_a_en.png new file mode 100644 index 00000000..1f9ca430 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_a_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_a_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_a_en.png.meta new file mode 100644 index 00000000..dc60ff9a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_a_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 642d7890c10bfa0478e326098a66b501 +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/Material_en/Main/information/ui_Main_information_pop_button_text_b_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_b_en.png new file mode 100644 index 00000000..b40b3897 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_b_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_b_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_b_en.png.meta new file mode 100644 index 00000000..2e5e9615 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_b_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 092db4cbbfd9f4541bef11fc1880ff8f +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/Material_en/Main/information/ui_Main_information_pop_button_text_c_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_c_en.png new file mode 100644 index 00000000..42c1b246 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_c_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_c_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_c_en.png.meta new file mode 100644 index 00000000..9f7dcd7a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_information_pop_button_text_c_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 997a70be2f15a674aacffb513bda0a48 +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/Material_en/Main/information/ui_Main_informationr_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_informationr_title_logo_en.png new file mode 100644 index 00000000..a227fb34 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_informationr_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_informationr_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_informationr_title_logo_en.png.meta new file mode 100644 index 00000000..69fe1feb --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/information/ui_Main_informationr_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d80ae6dbbc9b0654f8da51babec80fd4 +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/Material_en/Main/recipe.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe.meta new file mode 100644 index 00000000..b19e59c2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35f2b653d946b844bb2d9db420d2aeab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_en.png new file mode 100644 index 00000000..69d6d978 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_en.png.meta new file mode 100644 index 00000000..04d98b0b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9b56ff2cbd4dac14ca3ae288dd794b5b +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/Material_en/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_en.png new file mode 100644 index 00000000..575ad491 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_en.png.meta new file mode 100644 index 00000000..a95d2755 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_detail_pop_FlameCaution_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 944ad8bff39ab4946aa459307ada9307 +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/Material_en/Main/recipe/ui_Main_recipe_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_title_en.png new file mode 100644 index 00000000..82a4f671 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_title_en.png.meta new file mode 100644 index 00000000..3e35d059 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_Main_recipe_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c8bd01d6018fc2b439a187ad82fc1c13 +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/Material_en/Main/recipe/ui_button_icon_close_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_close_logo_en.png new file mode 100644 index 00000000..06d3a429 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_close_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_close_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_close_logo_en.png.meta new file mode 100644 index 00000000..b02de2db --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_close_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: eca7336de7c3f644599b5015fe89f168 +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/Material_en/Main/recipe/ui_button_icon_make_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_en.png new file mode 100644 index 00000000..b6ba5b0d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_en.png.meta new file mode 100644 index 00000000..cf892cff --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: edd6f2b9154125d41a7f5e9177e2aa47 +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/Material_en/Main/recipe/ui_button_icon_make_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_gray_en.png new file mode 100644 index 00000000..e1a2d96f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_gray_en.png.meta new file mode 100644 index 00000000..c54f2f54 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_make_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b5492bd078fe6614098c7216380c6559 +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/Material_en/Main/recipe/ui_button_icon_stop_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_stop_logo_en.png new file mode 100644 index 00000000..db384e64 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_stop_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_stop_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_stop_logo_en.png.meta new file mode 100644 index 00000000..aa7d339d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/recipe/ui_button_icon_stop_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5b791b29becec62468fa706ff3a6749a +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/Material_en/Main/ui_button_icon_no_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_no_logo_en.png new file mode 100644 index 00000000..bb55793c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_no_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_no_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_no_logo_en.png.meta new file mode 100644 index 00000000..d7fce589 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_no_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 793eace680144034bb2ec4e51d9c3f21 +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/Material_en/Main/ui_button_icon_yes_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_yes_logo_en.png new file mode 100644 index 00000000..794a3ec5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_yes_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_yes_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_yes_logo_en.png.meta new file mode 100644 index 00000000..a966194c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/ui_button_icon_yes_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1788def0e1c7af449ac496c56cc8c98c +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/Material_en/Main/update.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/update.meta new file mode 100644 index 00000000..0c95eeda --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/update.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2d86b2d59093b049841b9526a287246 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/update/ui_Main_update_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/Main/update/ui_Main_update_title_en.png new file mode 100644 index 00000000..3528badd Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/Main/update/ui_Main_update_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/Main/update/ui_Main_update_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/Main/update/ui_Main_update_title_en.png.meta new file mode 100644 index 00000000..1fb15ccf --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/Main/update/ui_Main_update_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: abb6600531042114a9a2bb2d370f4663 +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/Material_en/UI.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI.meta new file mode 100644 index 00000000..a59eaaba --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a508a1d3222d7d146918e6a51fb97c47 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_SpeechBalloon_order_receive_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_SpeechBalloon_order_receive_en.png new file mode 100644 index 00000000..2500d838 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_SpeechBalloon_order_receive_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_SpeechBalloon_order_receive_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_SpeechBalloon_order_receive_en.png.meta new file mode 100644 index 00000000..67efdbc6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_SpeechBalloon_order_receive_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 64781a74ed1e92947b5bbc0bc212efd5 +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/Material_en/UI/ui_button_icon_Footer_FryingPan_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_FryingPan_logo_en.png new file mode 100644 index 00000000..522ae839 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_FryingPan_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_FryingPan_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_FryingPan_logo_en.png.meta new file mode 100644 index 00000000..c0348842 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_FryingPan_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f654f9996bad76242bf6cbd9f4aeac0a +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/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en.png new file mode 100644 index 00000000..70c14d15 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en.png.meta new file mode 100644 index 00000000..de318578 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6e3b952e60a778c4497e7d9809d64788 +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/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en.png new file mode 100644 index 00000000..ad9d4367 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en.png.meta new file mode 100644 index 00000000..8a594112 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a254b67bd0dd1a540940ee4fe5972017 +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/Material_en/UI/ui_button_icon_Footer_ProductManagement_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_ProductManagement_logo_en.png new file mode 100644 index 00000000..1cbf01fd Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_ProductManagement_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_ProductManagement_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_ProductManagement_logo_en.png.meta new file mode 100644 index 00000000..8c444a12 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_ProductManagement_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 343e01e697ec23142a0a67e3fe7a64fb +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/Material_en/UI/ui_button_icon_Footer_Purchasing_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_Purchasing_logo_en.png new file mode 100644 index 00000000..c8cbc6cf Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_Purchasing_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_Purchasing_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_Purchasing_logo_en.png.meta new file mode 100644 index 00000000..7ee39896 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_Purchasing_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8d057aeccdaf2954fa93317e0161aa35 +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/Material_en/UI/ui_button_icon_Footer_corn_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_corn_logo_en.png new file mode 100644 index 00000000..378cfba6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_corn_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_corn_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_corn_logo_en.png.meta new file mode 100644 index 00000000..e4edb29c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_corn_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e766bd96310300745ba8882e4162303b +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/Material_en/UI/ui_button_icon_Footer_shop_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_shop_logo_en.png new file mode 100644 index 00000000..e3b526ed Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_shop_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_shop_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_shop_logo_en.png.meta new file mode 100644 index 00000000..3ed73001 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_button_icon_Footer_shop_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 55825402a9256f144ab0de2dec192dd1 +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/Material_en/UI/ui_cooking_rogo_GreatSuccess_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_GreatSuccess_en.png new file mode 100644 index 00000000..03ae8326 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_GreatSuccess_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_GreatSuccess_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_GreatSuccess_en.png.meta new file mode 100644 index 00000000..78b43aff --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_GreatSuccess_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 65be449a0380d104c82ed302e29aa713 +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/Material_en/UI/ui_cooking_rogo_failure_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_failure_en.png new file mode 100644 index 00000000..b23cae88 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_failure_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_failure_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_failure_en.png.meta new file mode 100644 index 00000000..830dd819 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_failure_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4b3ac5acec2b4104598d38497c208e47 +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/Material_en/UI/ui_cooking_rogo_success_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_success_en.png new file mode 100644 index 00000000..84a46b40 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_success_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_success_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_success_en.png.meta new file mode 100644 index 00000000..005c37c7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_cooking_rogo_success_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6aeb33274cd98b943a8d911bfff95839 +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/Material_en/UI/ui_meter_heart_text_max_en.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_meter_heart_text_max_en.png new file mode 100644 index 00000000..a127d277 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_meter_heart_text_max_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_meter_heart_text_max_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_meter_heart_text_max_en.png.meta new file mode 100644 index 00000000..e2571c5c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_meter_heart_text_max_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d04f0f8822f67774b99b1fbd42caf5b8 +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/Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither.png new file mode 100644 index 00000000..11b95e2a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither.png.meta new file mode 100644 index 00000000..6412cfe7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8d3f42819a9145248802ee5eb3f317e7 +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/Material_en/cooking.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking.meta new file mode 100644 index 00000000..6593c40a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b183240576510bc4fadf8cf42852be75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/result.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result.meta new file mode 100644 index 00000000..57415b98 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e0a2bcebe5cfbb49b63245520e54ee0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_destruction_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_destruction_logo_en.png new file mode 100644 index 00000000..692a7464 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_destruction_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_destruction_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_destruction_logo_en.png.meta new file mode 100644 index 00000000..1eb78006 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_destruction_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 894a453fd1b97e242a858447235b894d +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/Material_en/cooking/result/ui_button_icon_ok_logo_big_en.png b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_ok_logo_big_en.png new file mode 100644 index 00000000..27ebc101 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_ok_logo_big_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_ok_logo_big_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_ok_logo_big_en.png.meta new file mode 100644 index 00000000..2711ae48 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking/result/ui_button_icon_ok_logo_big_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f292524fd33ea9248859b3b1ef5e1c46 +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/Material_en/cooking/ui_button_icon_make_one_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_make_one_logo_en.png new file mode 100644 index 00000000..84f00023 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_make_one_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_make_one_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_make_one_logo_en.png.meta new file mode 100644 index 00000000..1c47414c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_make_one_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: faae0ecceaaa97c4ab8229ff3c277034 +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/Material_en/cooking/ui_button_icon_stop_big_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_stop_big_logo_en.png new file mode 100644 index 00000000..c72e9a44 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_stop_big_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_stop_big_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_stop_big_logo_en.png.meta new file mode 100644 index 00000000..4f103f66 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_button_icon_stop_big_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 35aabeab3f292ef44b4d838fa381e42a +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/Material_en/cooking/ui_cooking_explanation_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_cooking_explanation_text_en.png new file mode 100644 index 00000000..f535d077 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_cooking_explanation_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_cooking_explanation_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_cooking_explanation_text_en.png.meta new file mode 100644 index 00000000..9eac7970 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/cooking/ui_cooking_explanation_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 29d0926d57e0e434c85b74e2b4e34201 +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/Material_en/marketing.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing.meta new file mode 100644 index 00000000..4bb54c88 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f56fe99a9ca8e9439150c8671e84151 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize.meta new file mode 100644 index 00000000..dfb1eb74 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0dbb8bf67126684c8d37012fa8c7f47 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon.meta new file mode 100644 index 00000000..fcf1dc45 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d4361013a4d8714cab0fbfb2663bb38 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en.png new file mode 100644 index 00000000..c87ba158 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en.png.meta new file mode 100644 index 00000000..21a8aff2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b18237152f5dcc247ba3888684852551 +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/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en.png new file mode 100644 index 00000000..c63320ab Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en.png.meta new file mode 100644 index 00000000..01ab7925 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5a34ab138961adb43ac313a508386727 +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/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en.png new file mode 100644 index 00000000..861b0a82 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en.png.meta new file mode 100644 index 00000000..939156b2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 17d783028e6e8584f8a327e58ae5d5fb +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/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en.png new file mode 100644 index 00000000..a6030b67 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en.png.meta new file mode 100644 index 00000000..0adcced9 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0f76ff24cd998354bbbc7b65ab2716d1 +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/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en.png new file mode 100644 index 00000000..f698b3fd Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en.png.meta new file mode 100644 index 00000000..a9deeee9 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e3bf728a19aadb14e92ef9d7243f7b5a +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/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en.png new file mode 100644 index 00000000..d49426be Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en.png.meta new file mode 100644 index 00000000..ffab6406 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5fb6f6defe7b8cb49954ff37b5d88e74 +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/Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en.png new file mode 100644 index 00000000..9ff13523 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en.png.meta new file mode 100644 index 00000000..de89056a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3d3b5cd8c4cd56a45be86e76fc6b4eba +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/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png new file mode 100644 index 00000000..1ca9e1ef Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png.meta new file mode 100644 index 00000000..daf24711 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 60fe4adf2d46cef4a94749bae8d9da66 +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/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en.png new file mode 100644 index 00000000..940f24c3 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en.png.meta new file mode 100644 index 00000000..3011cf37 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 75e05b805ed6a0d49bd58266cfabf3b5 +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/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en.png new file mode 100644 index 00000000..dc4c8760 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en.png.meta new file mode 100644 index 00000000..76e6fbf4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 091482721da1dda4ea0e1652593ac76e +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/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en.png new file mode 100644 index 00000000..401eff2b Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en.png.meta new file mode 100644 index 00000000..62658da3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a0ed564d06bcade45aca7a3fa98d604a +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/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en.png new file mode 100644 index 00000000..70d93054 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en.png.meta new file mode 100644 index 00000000..4b1f54b5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 693b96dd70896f94e8dc10f672d95dfe +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/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en.png new file mode 100644 index 00000000..4783a663 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en.png.meta new file mode 100644 index 00000000..1584d189 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9af10152ad2725e4a864d3161d04beac +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/Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither.png new file mode 100644 index 00000000..45163a69 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither.png.meta new file mode 100644 index 00000000..fc520798 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a55e3686a65a4f041806756c0ac1802f +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/Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en.png new file mode 100644 index 00000000..ba373259 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en.png.meta new file mode 100644 index 00000000..2ed9fd51 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3473d177df7162c4c970c5695334adee +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/Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en.png new file mode 100644 index 00000000..13c19968 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en.png.meta new file mode 100644 index 00000000..4d423e3e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 35a865d30a4b7894fb326fac2163c868 +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/Material_en/marketing/Customize/ui_marketing_Customize_text_release_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_release_en.png new file mode 100644 index 00000000..8d8ee988 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_release_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_release_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_release_en.png.meta new file mode 100644 index 00000000..f7f103f6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_text_release_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 7808a1d1a5234ba4cad6c9623fc111e1 +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/Material_en/marketing/Customize/ui_marketing_Customize_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_title_en.png new file mode 100644 index 00000000..031f9924 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_title_en.png.meta new file mode 100644 index 00000000..39422a78 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_Customize_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d65b58b99312eed418f41ce9c8a5c3e9 +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/Material_en/marketing/ProductManagement.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement.meta new file mode 100644 index 00000000..f18a9d9c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d3514b458ff42a408f7e5790e82dfdb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_en.png new file mode 100644 index 00000000..bce4a144 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_en.png.meta new file mode 100644 index 00000000..387974f3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ce6b0855c1bd2444b978789370886494 +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/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_gray_en.png new file mode 100644 index 00000000..dd522be4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_gray_en.png.meta new file mode 100644 index 00000000..2cd2d426 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_SellAll_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1dc0c182c0ac25b4dbac19b15ee2e043 +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/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_en.png new file mode 100644 index 00000000..f6d3d744 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_en.png.meta new file mode 100644 index 00000000..4c4a3de3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f77db180669d8d8498c46fd384ec7eb5 +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/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_en.png new file mode 100644 index 00000000..7a88f4fb Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_en.png.meta new file mode 100644 index 00000000..25a32635 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6061bfd9050f0cb45ae2048806344bc9 +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/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_en.png new file mode 100644 index 00000000..61e14208 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_en.png.meta new file mode 100644 index 00000000..2ec979ab --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: fd988f0315a9e0b4199b77d68ecec81d +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/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_gray_en.png new file mode 100644 index 00000000..abb5db25 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_gray_en.png.meta new file mode 100644 index 00000000..a12d7c73 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_button_icon_sell_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9a303fa5c88e7514899e198b7ab9f3c7 +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/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text_en.png new file mode 100644 index 00000000..1891a8a1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text_en.png.meta new file mode 100644 index 00000000..61a6ad72 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b076997e576de06458f8b751a3e0de4b +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/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_en.png new file mode 100644 index 00000000..8dfaf1a4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_en.png.meta new file mode 100644 index 00000000..9871f09b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c800e5dc66b627440baae66a99b1b7af +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/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_en.png new file mode 100644 index 00000000..0ca6829c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_en.png.meta new file mode 100644 index 00000000..0ffb2ade --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 453f23d8b60e90c49ba4ee8dce2ed6a4 +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/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_en.png new file mode 100644 index 00000000..fb80a673 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_en.png.meta new file mode 100644 index 00000000..5e484e2b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1c7e8cdb0de6a264f97b8293ae966aaa +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/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_title_logo_en.png new file mode 100644 index 00000000..0ec67d80 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_title_logo_en.png.meta new file mode 100644 index 00000000..964f1e16 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ProductManagement/ui_marketing_ProductManagement_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 24a163350f08e6d4882db9553b6b61be +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/Material_en/marketing/StoreLevel.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel.meta new file mode 100644 index 00000000..f6cd5414 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b85abc738c927da4f9fe08bb4154ac9e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_explanation_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_explanation_text_en.png new file mode 100644 index 00000000..9a46b50e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_explanation_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_explanation_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_explanation_text_en.png.meta new file mode 100644 index 00000000..4fd6852c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_explanation_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6b4a74b8fd5d2014d8ec65b1a5409968 +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/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_Trophy_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_Trophy_en.png new file mode 100644 index 00000000..8294ce84 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_Trophy_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_Trophy_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_Trophy_en.png.meta new file mode 100644 index 00000000..d630eb7a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_Trophy_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 972da0c5fe38e1342b310c2c0135e7e2 +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/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_recipe_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_recipe_en.png new file mode 100644 index 00000000..cc399e1f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_recipe_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_recipe_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_recipe_en.png.meta new file mode 100644 index 00000000..c06445c9 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_icon_recipe_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6b6efef2cf83267428f7d8999e15c2a0 +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/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_rogo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_rogo_en.png new file mode 100644 index 00000000..95fe7607 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_rogo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_rogo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_rogo_en.png.meta new file mode 100644 index 00000000..78186743 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/StoreLevel/ui_marketing_StoreLevel_rogo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b44836fda8a89fe43a2b49d4476720e5 +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/Material_en/marketing/marketing_background_Signboard_EarlyType_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_EarlyType_en.png new file mode 100644 index 00000000..859eb831 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_EarlyType_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_EarlyType_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_EarlyType_en.png.meta new file mode 100644 index 00000000..713151ff --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_EarlyType_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d2cc259d6ff4be2418eafa68328a9f05 +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/Material_en/marketing/marketing_background_Signboard_Second_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Second_en.png new file mode 100644 index 00000000..c79b9214 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Second_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Second_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Second_en.png.meta new file mode 100644 index 00000000..e222b31f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Second_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4d36338c511029848bdbbcd071a56637 +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/Material_en/marketing/marketing_background_Signboard_Tasting_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Tasting_en.png new file mode 100644 index 00000000..2ce1a332 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Tasting_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Tasting_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Tasting_en.png.meta new file mode 100644 index 00000000..edd5dccb --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_Tasting_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b7887932b9d2e01448ef0c2f5cadb447 +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/Material_en/marketing/marketing_background_Signboard_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_en.png new file mode 100644 index 00000000..644a1da3 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_en.png.meta new file mode 100644 index 00000000..0255e25b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_background_Signboard_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 397ebffa94b246d438fdfccc77d33232 +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/Material_en/marketing/marketing_cart_closed_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_closed_en.png new file mode 100644 index 00000000..d010a0e6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_closed_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_closed_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_closed_en.png.meta new file mode 100644 index 00000000..6c54fc89 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_closed_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 771157843812a184fa95c7715caddcce +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/Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither.png new file mode 100644 index 00000000..d5908209 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither.png.meta new file mode 100644 index 00000000..0f693ce4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6f3480e15e42b2e4b8635127f62f70b1 +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/Material_en/marketing/marketing_cart_logo_Second_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_Second_en_Dither.png new file mode 100644 index 00000000..dfe3210a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_Second_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_Second_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_Second_en_Dither.png.meta new file mode 100644 index 00000000..8805d8c5 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_Second_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c5b9ab0a54804a648a2f24b09a626af1 +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/Material_en/marketing/marketing_cart_logo_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_en_Dither.png new file mode 100644 index 00000000..083af2cb Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_en_Dither.png.meta new file mode 100644 index 00000000..6e5f2276 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/marketing_cart_logo_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 23b66146fd8aeda4aa5d2ad7deb2db39 +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/Material_en/marketing/ui_button_icon_Footer_publicityVip_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicityVip_logo_en.png new file mode 100644 index 00000000..4c0c9180 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicityVip_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicityVip_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicityVip_logo_en.png.meta new file mode 100644 index 00000000..d295de4a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicityVip_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 503e1dac51f0f89449adfda161422448 +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/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png new file mode 100644 index 00000000..694294cb Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png.meta new file mode 100644 index 00000000..3af5363e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d093b97838f7bee4589f5b9dac23ddb4 +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/Material_en/marketing/ui_conversation_name_OlderBrother_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_OlderBrother_en.png new file mode 100644 index 00000000..d57d1703 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_OlderBrother_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_OlderBrother_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_OlderBrother_en.png.meta new file mode 100644 index 00000000..0523c11c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_OlderBrother_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bad8c1ad7d7a7fd43a3a8c0c85988dba +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/Material_en/marketing/ui_conversation_name_YoungerBrother_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_YoungerBrother_en.png new file mode 100644 index 00000000..49dd6801 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_YoungerBrother_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_YoungerBrother_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_YoungerBrother_en.png.meta new file mode 100644 index 00000000..1657282c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_conversation_name_YoungerBrother_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6b2cfbea393cef842aa106de7b7bc476 +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/Material_en/marketing/ui_marketing_StockMeter_StocktText_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_marketing_StockMeter_StocktText_en.png new file mode 100644 index 00000000..a0d1b90c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_marketing_StockMeter_StocktText_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_marketing_StockMeter_StocktText_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_marketing_StockMeter_StocktText_en.png.meta new file mode 100644 index 00000000..b9e4b4a3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_marketing_StockMeter_StocktText_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d34a42fae8361314fbe36511c05a1b18 +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/Material_en/minigame.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame.meta new file mode 100644 index 00000000..2ef41f5c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d9e2c876eed4df45b9b21280a20be57 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Advanced_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Advanced_en.png new file mode 100644 index 00000000..52f6eac2 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Advanced_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Advanced_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Advanced_en.png.meta new file mode 100644 index 00000000..89bada96 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Advanced_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b3cb6e69de972544b98cbb4007ec1359 +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/Material_en/minigame/minigame_Selection_detail_title_Beginner_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Beginner_en.png new file mode 100644 index 00000000..c9c2f6e4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Beginner_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Beginner_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Beginner_en.png.meta new file mode 100644 index 00000000..f3144c9b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Beginner_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 2cbcf01a8ca007b40b50f05c76723fd7 +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/Material_en/minigame/minigame_Selection_detail_title_Intermediate_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Intermediate_en.png new file mode 100644 index 00000000..d58c47bb Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Intermediate_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Intermediate_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Intermediate_en.png.meta new file mode 100644 index 00000000..ddc297f4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_detail_title_Intermediate_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 27208e7cc90230c40bf97bb787a635d9 +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/Material_en/minigame/minigame_Selection_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_title_logo_en.png new file mode 100644 index 00000000..9cfdd122 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_title_logo_en.png.meta new file mode 100644 index 00000000..78963f3f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_Selection_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5f008475ba648c747a53271ed92851dc +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/Material_en/minigame/minigame_explanation_en_Dither.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_explanation_en_Dither.png new file mode 100644 index 00000000..f801fac7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_explanation_en_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_explanation_en_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_explanation_en_Dither.png.meta new file mode 100644 index 00000000..8906f172 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_explanation_en_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 65e1724862f7dde46804df934571785a +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/Material_en/minigame/minigame_main_Score_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_Score_en.png new file mode 100644 index 00000000..c28c011e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_Score_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_Score_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_Score_en.png.meta new file mode 100644 index 00000000..77126416 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_Score_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 40629b0556657ca4685f32303b71f171 +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: 172, y: 0, z: 54, 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/Material_en/minigame/minigame_main_explanation_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_explanation_text_en.png new file mode 100644 index 00000000..e404b1d6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_explanation_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_explanation_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_explanation_text_en.png.meta new file mode 100644 index 00000000..888ee205 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_explanation_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f238f145958172d428942802c02fc39c +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/Material_en/minigame/minigame_main_frame_time_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_frame_time_en.png new file mode 100644 index 00000000..b1a749f0 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_frame_time_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_frame_time_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_frame_time_en.png.meta new file mode 100644 index 00000000..d46c9c5b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_main_frame_time_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6cafaf4bcaf9b324d851fd727ce1185a +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/Material_en/minigame/minigame_result_material_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_material_title_en.png new file mode 100644 index 00000000..98b6dc54 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_material_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_material_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_material_title_en.png.meta new file mode 100644 index 00000000..faad8130 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_material_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: eb6c2349548a3fc4bb540f1c2636b52c +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/Material_en/minigame/minigame_result_meter_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_meter_title_en.png new file mode 100644 index 00000000..64d7150a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_meter_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_meter_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_meter_title_en.png.meta new file mode 100644 index 00000000..7d8d9736 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_meter_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b05019c1d89a4024aa029e6b7d85d456 +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/Material_en/minigame/minigame_result_score_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_score_title_en.png new file mode 100644 index 00000000..1aa6b314 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_score_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_score_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_score_title_en.png.meta new file mode 100644 index 00000000..700ca02f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_score_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 699c7ff89d4e3764ca9957fa25ac1cd8 +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/Material_en/minigame/minigame_result_title_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_title_en.png new file mode 100644 index 00000000..e343b291 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_title_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_title_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_title_en.png.meta new file mode 100644 index 00000000..1ebcb3c2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/minigame_result_title_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ca835b59366633f4fbe741a33152a54c +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/Material_en/minigame/ui_button_icon_movie_logo_Procurement_en.png b/popcorn/Assets/MyGame/Resources/Material_en/minigame/ui_button_icon_movie_logo_Procurement_en.png new file mode 100644 index 00000000..f46d409e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/minigame/ui_button_icon_movie_logo_Procurement_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/minigame/ui_button_icon_movie_logo_Procurement_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/minigame/ui_button_icon_movie_logo_Procurement_en.png.meta new file mode 100644 index 00000000..f692667c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/minigame/ui_button_icon_movie_logo_Procurement_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e18c969b2ee83c14391f940995293034 +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/Material_en/shopping.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping.meta new file mode 100644 index 00000000..e3060470 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e59b52c3a9106b04e9b30c3aa1465bc9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/shopping_background_title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/shopping_background_title_logo_en.png new file mode 100644 index 00000000..c3b30363 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/shopping_background_title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/shopping_background_title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/shopping_background_title_logo_en.png.meta new file mode 100644 index 00000000..18849cfe --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/shopping_background_title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3052cb7c475b29f40aed46c23712956a +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/Material_en/shopping/ui_button_icon_Exchange_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_en.png new file mode 100644 index 00000000..a1f65a26 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_en.png.meta new file mode 100644 index 00000000..05918fd6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f2baab95ad6d0a641a40e6d234e1c422 +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/Material_en/shopping/ui_button_icon_Exchange_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_gray_en.png new file mode 100644 index 00000000..87c764e8 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_gray_en.png.meta new file mode 100644 index 00000000..470445a1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Exchange_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6523a9e1a7c53ff47a5a3a9851cc84be +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/Material_en/shopping/ui_button_icon_Learned_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Learned_logo_en.png new file mode 100644 index 00000000..3fd38c6e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Learned_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Learned_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Learned_logo_en.png.meta new file mode 100644 index 00000000..e68de101 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Learned_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4e524d6b9475e7c4b92a8e55779dd2bd +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/Material_en/shopping/ui_button_icon_Purchased_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Purchased_logo_en.png new file mode 100644 index 00000000..84dc215d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Purchased_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Purchased_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Purchased_logo_en.png.meta new file mode 100644 index 00000000..c4b7aec6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_Purchased_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a52460eae9e20e84e98151f6e5807b2d +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/Material_en/shopping/ui_button_icon_close_logo_small_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_close_logo_small_en.png new file mode 100644 index 00000000..59e282bd Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_close_logo_small_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_close_logo_small_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_close_logo_small_en.png.meta new file mode 100644 index 00000000..f056215b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_close_logo_small_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b38a4686c052f1248bc3219f1b45d074 +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/Material_en/shopping/ui_button_icon_purchase_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_en.png new file mode 100644 index 00000000..23e767c2 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_en.png.meta new file mode 100644 index 00000000..4343547f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b6d6cdc5498743040bcdf23b3780fa0d +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/Material_en/shopping/ui_button_icon_purchase_logo_gray_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_gray_en.png new file mode 100644 index 00000000..df813cd1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_gray_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_gray_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_gray_en.png.meta new file mode 100644 index 00000000..cb8b2aa7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_purchase_logo_gray_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: dec0e364be2c3634a94960daef0717f4 +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/Material_en/shopping/ui_button_icon_stop_logo_small_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_stop_logo_small_en.png new file mode 100644 index 00000000..10f342f7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_stop_logo_small_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_stop_logo_small_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_stop_logo_small_en.png.meta new file mode 100644 index 00000000..1e453784 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_button_icon_stop_logo_small_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 31f5a049028df4d4a8df7222be280a77 +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/Material_en/shopping/ui_shopping_Exchange_Achievement_title_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_Exchange_Achievement_title_text_en.png new file mode 100644 index 00000000..59f4289a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_Exchange_Achievement_title_text_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_Exchange_Achievement_title_text_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_Exchange_Achievement_title_text_en.png.meta new file mode 100644 index 00000000..c25ea501 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_Exchange_Achievement_title_text_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4e01022a23f5aff47bec762186207368 +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/Material_en/shopping/ui_shopping_detail_button_icon_material_off_rogo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_material_off_rogo_en.png new file mode 100644 index 00000000..e91c7d97 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_material_off_rogo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_material_off_rogo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_material_off_rogo_en.png.meta new file mode 100644 index 00000000..84cebc34 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_material_off_rogo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b40ce4fb7f271894ebdfdd639524cded +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/Material_en/shopping/ui_shopping_detail_button_icon_recipe_off_rogo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_recipe_off_rogo_en.png new file mode 100644 index 00000000..5f790b33 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_recipe_off_rogo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_recipe_off_rogo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_recipe_off_rogo_en.png.meta new file mode 100644 index 00000000..96725321 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/shopping/ui_shopping_detail_button_icon_recipe_off_rogo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 75e62f81b433ce541866b37242f0317c +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/Material_en/title.meta b/popcorn/Assets/MyGame/Resources/Material_en/title.meta new file mode 100644 index 00000000..2f4614a6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/title.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fec4e3d7c7b2446478e37b205803266e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png new file mode 100644 index 00000000..b46c874f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png.meta new file mode 100644 index 00000000..c9127b5e --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/title/title_logo_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0d3eeb8df334169418402320dedce3f7 +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/Material_en/title/title_tapToStart_en.png b/popcorn/Assets/MyGame/Resources/Material_en/title/title_tapToStart_en.png new file mode 100644 index 00000000..04c886bc Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_en/title/title_tapToStart_en.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_en/title/title_tapToStart_en.png.meta b/popcorn/Assets/MyGame/Resources/Material_en/title/title_tapToStart_en.png.meta new file mode 100644 index 00000000..57f01e71 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_en/title/title_tapToStart_en.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0d4654dde87eeff41bc5d77c92033e70 +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/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko.png new file mode 100644 index 00000000..8234d61d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko.png.meta new file mode 100644 index 00000000..92b34427 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: a6daba616ba22424f868ad61e28895c3 +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/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko.png new file mode 100644 index 00000000..da15751f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko.png.meta new file mode 100644 index 00000000..0d0ee233 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d26106e48c758c34d96245b1e321a118 +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/Material_ko/minigame.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame.meta new file mode 100644 index 00000000..88b1a4b4 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c6c82b693916df34189494a8e9288c6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko.png new file mode 100644 index 00000000..fcb353b3 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko.png.meta new file mode 100644 index 00000000..cc34dc1a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 7fe87fab4b877054f87028bbcf915e8c +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/Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko.png new file mode 100644 index 00000000..ed76083b Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko.png.meta new file mode 100644 index 00000000..7651ac7b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8d3f65ded58b6be46af33e18b1a6a4c3 +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/Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko.png new file mode 100644 index 00000000..501ae78a Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko.png.meta new file mode 100644 index 00000000..8f227bfd --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 067a0348296635546bb5efe7df093c92 +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/Material_ko/minigame/minigame_Selection_title_logo_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_title_logo_ko.png new file mode 100644 index 00000000..3a3a4659 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_title_logo_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_title_logo_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_title_logo_ko.png.meta new file mode 100644 index 00000000..064a2041 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_Selection_title_logo_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6daa13c523799c64b9367bfc97d5d279 +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/Material_ko/minigame/minigame_explanation_ko_Dither.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_explanation_ko_Dither.png new file mode 100644 index 00000000..277aac7c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_explanation_ko_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_explanation_ko_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_explanation_ko_Dither.png.meta new file mode 100644 index 00000000..f0e5e82a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_explanation_ko_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 84f42c32fc69a7842b957d05e7000ad9 +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/Material_ko/minigame/minigame_main_Score_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_Score_ko.png new file mode 100644 index 00000000..521b812f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_Score_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_Score_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_Score_ko.png.meta new file mode 100644 index 00000000..7e73a670 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_Score_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: bf385420c81bb16419e98da6ce97634d +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: 172, y: 0, z: 54, 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/Material_ko/minigame/minigame_main_explanation_text_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_explanation_text_ko.png new file mode 100644 index 00000000..95346792 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_explanation_text_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_explanation_text_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_explanation_text_ko.png.meta new file mode 100644 index 00000000..27a1d798 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_explanation_text_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0963ee25829e50e43bb90e36cdf928e3 +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/Material_ko/minigame/minigame_main_frame_time_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_frame_time_ko.png new file mode 100644 index 00000000..e64f54d6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_frame_time_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_frame_time_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_frame_time_ko.png.meta new file mode 100644 index 00000000..91a90025 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_main_frame_time_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1dc5b39f2a9ab854ea3657c111f506bf +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/Material_ko/minigame/minigame_result_material_title_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_material_title_ko.png new file mode 100644 index 00000000..1f913aff Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_material_title_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_material_title_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_material_title_ko.png.meta new file mode 100644 index 00000000..74355d63 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_material_title_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 2bcbc15334ba93641b90fd2f4229e35e +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/Material_ko/minigame/minigame_result_meter_title_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_meter_title_ko.png new file mode 100644 index 00000000..a7d0f213 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_meter_title_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_meter_title_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_meter_title_ko.png.meta new file mode 100644 index 00000000..d2075616 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_meter_title_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 37f7c390b871d6f40a752e1b493683cc +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/Material_ko/minigame/minigame_result_score_title_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_score_title_ko.png new file mode 100644 index 00000000..ae92ee3f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_score_title_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_score_title_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_score_title_ko.png.meta new file mode 100644 index 00000000..5428563a --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_score_title_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5a25cb0143e711e47b4dfe74df004c2e +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/Material_ko/minigame/minigame_result_title_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_title_ko.png new file mode 100644 index 00000000..f07fdbf7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_title_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_title_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_title_ko.png.meta new file mode 100644 index 00000000..013972cb --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/minigame_result_title_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5b7a4db1b03515142966f9f7f679f4a5 +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/Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko.png b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko.png new file mode 100644 index 00000000..6ee730db Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko.png.meta b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko.png.meta new file mode 100644 index 00000000..58d81bc1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9063d3413a819064db1808e2c9f800ba +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/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh.png new file mode 100644 index 00000000..8ebcfc9b Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh.png.meta new file mode 100644 index 00000000..70eb4d34 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: dd484b977b2995f4782e55b7ca263486 +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/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh.png new file mode 100644 index 00000000..7607ec74 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh.png.meta new file mode 100644 index 00000000..fc5e16d7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e259fa4d2057bac429e800d9dac78aae +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/Material_zh/minigame.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame.meta new file mode 100644 index 00000000..01ccde15 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ada5e4e56f6cec49838dcd30b3c95d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh.png new file mode 100644 index 00000000..5d4e15a3 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh.png.meta new file mode 100644 index 00000000..0e0c8271 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 2057f4dc5e7e1e24c839afaef4f7199f +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/Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh.png new file mode 100644 index 00000000..54119d68 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh.png.meta new file mode 100644 index 00000000..c45bff70 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: fd0f5bdfcca84694fbced678f99fed05 +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/Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh.png new file mode 100644 index 00000000..93b9e577 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh.png.meta new file mode 100644 index 00000000..f88c9182 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 2f8921b7483b09b49b052c605c8b1e5d +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/Material_zh/minigame/minigame_Selection_title_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_title_logo_zh.png new file mode 100644 index 00000000..3b0d24c1 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_title_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_title_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_title_logo_zh.png.meta new file mode 100644 index 00000000..4551a8e1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_Selection_title_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 23b594eeed7e42843b6d68063ca94ef3 +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/Material_zh/minigame/minigame_explanation_zh_Dither.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_explanation_zh_Dither.png new file mode 100644 index 00000000..8521632f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_explanation_zh_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_explanation_zh_Dither.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_explanation_zh_Dither.png.meta new file mode 100644 index 00000000..341bdc98 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_explanation_zh_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: cea456524a389a943956fe9b565c8b5a +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/Material_zh/minigame/minigame_main_Score_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_Score_zh.png new file mode 100644 index 00000000..bb9a2f1d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_Score_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_Score_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_Score_zh.png.meta new file mode 100644 index 00000000..6ec383a2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_Score_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 1432b6c8c05605f4697a9bb7720065d7 +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: 172, y: 0, z: 54, 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/Material_zh/minigame/minigame_main_explanation_text_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_explanation_text_zh.png new file mode 100644 index 00000000..116bdf10 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_explanation_text_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_explanation_text_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_explanation_text_zh.png.meta new file mode 100644 index 00000000..5117a309 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_explanation_text_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d6cfa824ddebb7040955770d58d8e523 +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/Material_zh/minigame/minigame_main_frame_time_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_frame_time_zh.png new file mode 100644 index 00000000..c803b250 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_frame_time_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_frame_time_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_frame_time_zh.png.meta new file mode 100644 index 00000000..19f00c4c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_main_frame_time_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 493904ed8947b674f8d2e06ddc56aa5c +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/Material_zh/minigame/minigame_result_material_title_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_material_title_zh.png new file mode 100644 index 00000000..e3b9178f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_material_title_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_material_title_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_material_title_zh.png.meta new file mode 100644 index 00000000..4efc33af --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_material_title_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 45c1ab3a2b2ade744a9eceb126483476 +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/Material_zh/minigame/minigame_result_meter_title_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_meter_title_zh.png new file mode 100644 index 00000000..7bda0a14 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_meter_title_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_meter_title_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_meter_title_zh.png.meta new file mode 100644 index 00000000..9bc47891 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_meter_title_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c7bd63718d8739447bc945d0fbe5fbab +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/Material_zh/minigame/minigame_result_score_title_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_score_title_zh.png new file mode 100644 index 00000000..fe8740db Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_score_title_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_score_title_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_score_title_zh.png.meta new file mode 100644 index 00000000..b058765f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_score_title_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: dbd158614eab20244823fa91cd5d3c19 +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/Material_zh/minigame/minigame_result_title_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_title_zh.png new file mode 100644 index 00000000..e192afb4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_title_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_title_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_title_zh.png.meta new file mode 100644 index 00000000..54d28243 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/minigame_result_title_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 915926f4c48378c4ebc85f7f18350da6 +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/Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh.png b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh.png new file mode 100644 index 00000000..adcbde81 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh.png.meta new file mode 100644 index 00000000..1c7f00c8 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e16258aaa68544042b9386dbdf041bf4 +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/ScrollGame/Stages/Stage1a.prefab b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1a.prefab index fe171271..ca89666d 100644 --- a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1a.prefab +++ b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1a.prefab @@ -131,27 +131,62 @@ PrefabInstance: - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.31 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.8 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.3 + objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.25 + objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.07 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.67 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder value: 22 objectReference: {fileID: 0} + - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 143.6 + value: 141.19 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -213,6 +248,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2233378810729895866} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.6 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -231,7 +271,7 @@ PrefabInstance: - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -1.12 + value: -1.03 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -913,6 +953,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2233378810729895866} m_Modifications: + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.11 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -946,7 +991,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -6.96 + value: -7.5 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1018,6 +1063,11 @@ PrefabInstance: propertyPath: m_Name value: ItemTree (4) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -1091,7 +1141,7 @@ PrefabInstance: - target: {fileID: 9197360416021838947, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1841,7 +1891,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1916,7 +1966,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.34 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1971,7 +2021,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 113.3 + value: 113.78 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2221,12 +2271,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.07 + value: 0.08 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.76 + value: -0.8 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2288,6 +2338,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.73 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &78845614246378510 stripped @@ -2468,6 +2528,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2233378810729895866} m_Modifications: + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.34 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -2481,7 +2546,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1b.prefab b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1b.prefab index 9e1ec880..aff34ba3 100644 --- a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1b.prefab +++ b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1b.prefab @@ -207,13 +207,18 @@ PrefabInstance: - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (6) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -222,7 +227,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -232,7 +237,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -287,7 +292,7 @@ PrefabInstance: - target: {fileID: 9197360416021838947, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -709,6 +714,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.01 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &9037051323871971101 stripped @@ -727,12 +742,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.61 + value: -0.18 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -1.51 + value: -1.22 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -762,7 +777,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 33.4 + value: 32.59 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -852,7 +867,7 @@ PrefabInstance: - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -862,7 +877,7 @@ PrefabInstance: - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1017,12 +1032,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.29 + value: -0.15 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -1.44 + value: -1.18 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1044,6 +1059,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.13 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -1099,6 +1124,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.03 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.24 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &6087903602085080222 stripped @@ -1114,6 +1149,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2124088376866006345} m_Modifications: + - target: {fileID: 2000043922596723899, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.57 + objectReference: {fileID: 0} + - target: {fileID: 2000043922596723899, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.48 + objectReference: {fileID: 0} + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -1122,7 +1172,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.11 + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.94 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1204,6 +1259,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.13 + objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.79 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &6542018056998414575 stripped @@ -1657,7 +1722,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.4 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1687,12 +1752,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.16 + value: 0.43 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -1.1 + value: -1.22 objectReference: {fileID: 0} - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1759,6 +1824,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.99 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &3793208829586482732 stripped @@ -2329,6 +2404,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2124088376866006345} m_Modifications: + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.1 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -2357,7 +2437,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -6.88 + value: -7.49 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2427,12 +2507,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.47 + value: 0.26 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.2 + value: -0.59 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2447,7 +2527,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2472,7 +2552,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 119.7 + value: 120.3 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2617,27 +2697,52 @@ PrefabInstance: - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.2 + objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.22 + objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.08 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.81 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder value: 23 objectReference: {fileID: 0} + - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 143.8 + value: 141.38 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2a.prefab b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2a.prefab index eb1511a1..9e94ab86 100644 --- a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2a.prefab +++ b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2a.prefab @@ -220,6 +220,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &7035028842901830796 stripped @@ -310,6 +325,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2454089663812030026} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.7 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -503,7 +523,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.13 + value: -0.37 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -538,7 +558,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 125.7 + value: 125.58 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -585,6 +605,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.94 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.42 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &8787040684268047626 stripped @@ -873,7 +908,12 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.62 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -930,6 +970,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.23 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.14 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &8990417723823175798 stripped @@ -1858,12 +1908,17 @@ PrefabInstance: - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2103,7 +2158,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.2 + value: -0.3 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2128,7 +2183,7 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.46 + value: -0.37 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2148,7 +2203,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 23.3 + value: 23.09 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2195,6 +2250,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.1 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.59 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &4119678685895478872 stripped @@ -2370,20 +2435,75 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2454089663812030026} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.98 + objectReference: {fileID: 0} + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.59 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.34 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.26 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.8 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.75 + objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.22 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2393,12 +2513,12 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 140.76 + value: 141.18 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2445,6 +2565,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.91 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &106127295303716348 stripped @@ -2703,12 +2838,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.29 + value: 0.071 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.41 + value: -0.661 objectReference: {fileID: 0} - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2790,6 +2925,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.08 + objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.43 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &743860672891921387 stripped @@ -2823,12 +2968,12 @@ PrefabInstance: - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -1.92 + value: -1.57 objectReference: {fileID: 0} - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -2.28 + value: -1.91 objectReference: {fileID: 0} - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2895,6 +3040,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.02 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.22 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &652320068428514162 stripped @@ -2915,16 +3070,46 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.21 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.49 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.67 + objectReference: {fileID: 0} + - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -3070,6 +3255,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2454089663812030026} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.64 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -3265,15 +3455,35 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2454089663812030026} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.8 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.4 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.18 + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.76 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3355,6 +3565,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.91 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &1498454167424321902 stripped @@ -3475,6 +3690,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.69 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -3530,6 +3750,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.47 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &1883882284982368659 stripped diff --git a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2b.prefab b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2b.prefab index c4945cda..42df453d 100644 --- a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2b.prefab +++ b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage2b.prefab @@ -155,7 +155,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -227,6 +227,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4580468283174947829} m_Modifications: + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.02 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -260,7 +265,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 133.8 + value: 133.7 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -500,7 +505,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -677,6 +682,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.64 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -732,6 +742,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.21 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &8469365342134320014 stripped @@ -830,7 +850,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.04 + value: -0.06 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.32 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -845,12 +870,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.18 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -1.09 + value: -0.78 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -907,6 +932,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.1 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.48 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &8678252565719307771 stripped @@ -1442,6 +1477,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.84 + objectReference: {fileID: 0} + - target: {fileID: 9197360416021838947, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &5414076570627102827 stripped @@ -1637,6 +1682,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4580468283174947829} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.02 + objectReference: {fileID: 0} + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.92 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -1645,12 +1700,12 @@ PrefabInstance: - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.1 + value: 0.01 objectReference: {fileID: 0} - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.96 + value: -0.69 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1737,6 +1792,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &5524822289189389556 stripped @@ -1775,7 +1835,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 126.6 + value: 127.1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1837,6 +1897,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4580468283174947829} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.05 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -1852,16 +1917,51 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.05 objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.02 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.83 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.18 + objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.09 + objectReference: {fileID: 0} + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.67 + objectReference: {fileID: 0} + - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -2287,20 +2387,70 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4580468283174947829} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.51 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.31 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.32 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.23 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.76 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.8 + objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.43 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2310,12 +2460,12 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 140.83 + value: 141.2 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2362,6 +2512,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.09 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.23 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &3104035667151869384 stripped @@ -3062,6 +3227,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.78 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.07 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &4411667517282319924 stripped @@ -3777,6 +3952,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.55 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -3832,6 +4012,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.85 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &1482094198056667194 stripped diff --git a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3a.prefab b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3a.prefab index ecc63535..f79e0412 100644 --- a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3a.prefab +++ b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3a.prefab @@ -257,7 +257,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 0.14 + value: -0.09 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -344,6 +344,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.03 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &7149021530372022108 stripped @@ -359,6 +364,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2725888655826027606} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.68 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -477,7 +487,7 @@ PrefabInstance: - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -522,7 +532,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 117.5 + value: 116.6 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1227,12 +1237,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.49 + value: -0.37 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -1.43 + value: -1.29 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1242,12 +1252,12 @@ PrefabInstance: - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -1.51 + value: -1.21 objectReference: {fileID: 0} - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -2.8 + value: -2.64 objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1262,12 +1272,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.72 + value: -0.63 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 0.43 + value: 0.22 objectReference: {fileID: 0} - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1282,7 +1292,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 33.34 + value: 33.4 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1329,6 +1339,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.11 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.62 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &9049210607042755743 stripped @@ -1437,12 +1457,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.07 + value: 0.38 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.91 + value: -1.24 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1499,6 +1519,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.05 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &4996738552111752414 stripped @@ -1517,7 +1547,7 @@ PrefabInstance: - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1839,11 +1869,36 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2725888655826027606} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.51 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.37 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.08 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.62 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -1852,18 +1907,33 @@ PrefabInstance: - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.03 objectReference: {fileID: 0} - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.95 + value: -1.1 objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.46 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.07 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -1872,12 +1942,12 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 140.84 + value: 141.2 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -1924,8 +1994,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.03 + objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.06 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} +--- !u!4 &421982286229603999 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + m_PrefabInstance: {fileID: 3165288487053285837} + m_PrefabAsset: {fileID: 0} --- !u!4 &5219597104471169540 stripped Transform: m_CorrespondingSourceObject: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, @@ -2122,7 +2218,7 @@ PrefabInstance: - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2547,6 +2643,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5027495955738489349} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5105605157821231892 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 421982286229603999} + m_Modifications: + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.76 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.66 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_Name + value: Item center (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3} --- !u!1001 &5387258700114466781 PrefabInstance: m_ObjectHideFlags: 0 @@ -2639,10 +2814,15 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.28 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.04 + value: -0.39 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2719,6 +2899,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.02 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &3181824687111051201 stripped @@ -2984,6 +3169,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2725888655826027606} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.81 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.13 + objectReference: {fileID: 0} - target: {fileID: 3769247313527994624, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -3027,7 +3222,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 60.1 + value: 60.47 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3112,12 +3307,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.03 + value: -0.05 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.99 + value: -0.75 objectReference: {fileID: 0} - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3184,6 +3379,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.03 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &3778271531904394711 stripped @@ -3772,7 +3977,17 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.21 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.75 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3829,6 +4044,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.19 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.71 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &512616045064707509 stripped @@ -4027,7 +4257,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.28 + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4047,12 +4277,12 @@ PrefabInstance: - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.92 + value: -0.74 objectReference: {fileID: 0} - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -2.6 + value: -2.51 objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4247,7 +4477,7 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.1 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4304,6 +4534,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.1 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.57 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &919601654611914745 stripped @@ -4554,6 +4794,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &1965225103877109331 stripped diff --git a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3b.prefab b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3b.prefab index f2e13480..18a8aa76 100644 --- a/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3b.prefab +++ b/popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage3b.prefab @@ -339,6 +339,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.22 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.73 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -352,7 +362,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 14.3 + value: 14.57 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -399,6 +409,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.52 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &7229074675444071712 stripped @@ -519,6 +544,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.6 + objectReference: {fileID: 0} - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -579,6 +609,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.82 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &7858943900312324155 stripped @@ -594,6 +639,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2552418280157887158} m_Modifications: + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.43 + objectReference: {fileID: 0} + - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.38 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -604,11 +659,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.71 + objectReference: {fileID: 0} + - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -617,7 +687,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 67 + value: 66.06 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -664,6 +734,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.22 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.05 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &7868165346790829471 stripped @@ -1817,7 +1897,7 @@ PrefabInstance: - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.21 + value: -0.11 objectReference: {fileID: 0} - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2079,6 +2159,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.55 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -2139,6 +2224,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.04 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.97 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &6607657849221510155 stripped @@ -2334,10 +2429,20 @@ PrefabInstance: propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.06 + objectReference: {fileID: 0} + - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.72 + objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -2749,6 +2854,11 @@ PrefabInstance: propertyPath: m_SortingOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 8238342438517328414, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &3059077678331521726 stripped @@ -2779,6 +2889,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.04 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.85 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -3104,6 +3224,11 @@ PrefabInstance: propertyPath: m_Name value: ItemTree (1) objectReference: {fileID: 0} + - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -3197,12 +3322,12 @@ PrefabInstance: - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.27 + value: 0.22 objectReference: {fileID: 0} - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.68 + value: -0.86 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3222,7 +3347,7 @@ PrefabInstance: - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3317,7 +3442,7 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.13 + value: 0.22 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3342,17 +3467,17 @@ PrefabInstance: - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0.6 + value: -0.29 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: 0.2 + value: -0.22 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -3409,6 +3534,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.79 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.08 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.74 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &4556316249545456043 stripped @@ -3492,6 +3632,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6857043227182090775} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6936857595637832415 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7645641885994862055} + m_Modifications: + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.86 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.53 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835658, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1149133266888835659, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, + type: 3} + propertyPath: m_Name + value: Item top (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 89e4bc6bc90624ac8a8c5f555d4c273b, type: 3} --- !u!1001 &7183666716716321735 PrefabInstance: m_ObjectHideFlags: 0 @@ -3512,12 +3726,12 @@ PrefabInstance: - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: -0.02 objectReference: {fileID: 0} - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.74 + value: -0.62 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4057,12 +4271,12 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.12 + value: -0.16 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.72 + value: -0.96 objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4087,7 +4301,7 @@ PrefabInstance: - target: {fileID: 6296419824617624432, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4102,7 +4316,7 @@ PrefabInstance: - target: {fileID: 6320076065680994612, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4117,7 +4331,7 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 87.4 + value: 87.1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4164,6 +4378,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.46 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.05 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.92 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &1406049225113618935 stripped @@ -4334,6 +4563,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2552418280157887158} m_Modifications: + - target: {fileID: 3329976228366573394, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} - target: {fileID: 3743485536561059170, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive @@ -4342,13 +4576,23 @@ PrefabInstance: - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.51 + value: 0.39 objectReference: {fileID: 0} - target: {fileID: 3743485536561059171, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y value: -0 objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.06 + objectReference: {fileID: 0} + - target: {fileID: 3769247313527994625, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.61 + objectReference: {fileID: 0} - target: {fileID: 4612740703592252992, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_Name @@ -4357,18 +4601,33 @@ PrefabInstance: - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: -0 + value: -0.03 objectReference: {fileID: 0} - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.57 + value: -1.06 objectReference: {fileID: 0} - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4881018188335882927, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.46 + objectReference: {fileID: 0} + - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.11 + objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_RootOrder @@ -4377,12 +4636,12 @@ PrefabInstance: - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalScale.x - value: -1 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 140.84 + value: 141.2 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4429,8 +4688,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8366474694430641870, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.13 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.06 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} +--- !u!4 &7645641885994862055 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2000043922596723899, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + m_PrefabInstance: {fileID: 8204243026862422364} + m_PrefabAsset: {fileID: 0} --- !u!4 &1322287398587251349 stripped Transform: m_CorrespondingSourceObject: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, @@ -4627,12 +4912,12 @@ PrefabInstance: - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.x - value: 0.38 + value: 0.01 objectReference: {fileID: 0} - target: {fileID: 6296419824617624433, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} propertyPath: m_LocalPosition.y - value: -0.49 + value: -0.38 objectReference: {fileID: 0} - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} @@ -4689,6 +4974,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.05 + objectReference: {fileID: 0} + - target: {fileID: 9165202840736919352, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.98 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, type: 3} --- !u!4 &2245695906081178099 stripped diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab index 0adf8e01..b2f96f5a 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_a.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3a4f1ff280f947a4a9880e2bf8460161, + objectReference: {fileID: 21300000, guid: e7f038671372a87469c8ac97c789ac37, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab index dfeccdf2..0f031ba2 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Decoration2_b.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8abd4ebb76e37354299e3cc6dc321af3, + objectReference: {fileID: 21300000, guid: 2e68d255e0e5d5a46894277d3ce6ccb5, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab index a875cd4b..8f6f8a44 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_a.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e48b24a329cfd854aa083d0d01dfb7ed, + objectReference: {fileID: 21300000, guid: 0f76ff24cd998354bbbc7b65ab2716d1, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_b.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_b.prefab index eb01b0aa..240ae4bd 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_b.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_b.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8cc8b23dc94f3cf45af90826b6a7a8c8, + objectReference: {fileID: 21300000, guid: e3bf728a19aadb14e92ef9d7243f7b5a, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab index 454c7387..d3f5363d 100644 --- a/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab +++ b/popcorn/Assets/MyGame/Resources/ShopCustomizeIcons/Signboard_c.prefab @@ -121,7 +121,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: afe878d3831c48142b5f235151719f38, + objectReference: {fileID: 21300000, guid: e37aebdaa6be093419f13bb4e4bbf44f, type: 3} - target: {fileID: 7617707139880814096, guid: 80c2e1b00cc3f4287988a0f77e25a12a, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity b/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity index fdbf3637..8725460b 100644 --- a/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity @@ -204,7 +204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30A2\u30D7\u30EA\u3092\u7D42\u4E86\u3057\u307E\u3059\u304B\uFF1F" + m_Text: "Do you want to quit the game\uFF1F" --- !u!222 &113215593 CanvasRenderer: m_ObjectHideFlags: 0 @@ -289,7 +289,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 60, y: 34} + m_SizeDelta: {x: 88, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &784374167 MonoBehaviour: @@ -310,9 +310,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f6a4eca993918a459fc49452ad67dd0, type: 3} + m_Sprite: {fileID: 21300000, guid: 1788def0e1c7af449ac496c56cc8c98c, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -425,9 +425,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99faa13474852f14f95261cfa7de3af5, type: 3} + m_Sprite: {fileID: 21300000, guid: 793eace680144034bb2ec4e51d9c3f21, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -771,7 +771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D42\u4E86\u78BA\u8A8D" + m_Text: Confirm quit --- !u!222 &1179090619 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 32b7d260..f4465111 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -4332,7 +4332,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8b11af295f8c03d4f8b223920b9a7a37, type: 3} + m_Sprite: {fileID: 21300000, guid: 29d0926d57e0e434c85b74e2b4e34201, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index c4b29f5e..08e95d7d 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -268,19 +268,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283934329} m_CullTransparentMesh: 0 ---- !u!114 &297523931 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1459407280} --- !u!1 &322038869 GameObject: m_ObjectHideFlags: 0 @@ -499,7 +486,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 02e04b8bfb9f3064ea2a0142ec5fd52e, type: 3} + m_Sprite: {fileID: 21300000, guid: 894a453fd1b97e242a858447235b894d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1540,7 +1527,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2109c4113b49a4c45aa0f5e13ab89297, type: 3} + m_Sprite: {fileID: 21300000, guid: f884f53aa39dffb4897d365fcdaefadf, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1655,7 +1642,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: baa9205a086494c45ac2b0d88fe571b8, type: 3} + m_Sprite: {fileID: 21300000, guid: 65be449a0380d104c82ed302e29aa713, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2818,7 +2805,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0e8ca5d9c840ba042b6ee05b94f22031, type: 3} + m_Sprite: {fileID: 21300000, guid: faae0ecceaaa97c4ab8229ff3c277034, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -8330,7 +8317,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 0 @@ -8440,6 +8427,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1960740842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1459407280} --- !u!1 &1993388964 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 6a21546b..640996b1 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -121,6 +121,32 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &5838204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1401507177} +--- !u!114 &16824281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1709156043} --- !u!1 &24537252 GameObject: m_ObjectHideFlags: 0 @@ -202,19 +228,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &31339499 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414353} --- !u!1 &32741089 GameObject: m_ObjectHideFlags: 0 @@ -327,6 +340,18 @@ Transform: m_Father: {fileID: 2040636316} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &147614861 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &149181930 GameObject: m_ObjectHideFlags: 0 @@ -392,6 +417,19 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &220609990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1980930080} --- !u!114 &260671573 MonoBehaviour: m_ObjectHideFlags: 0 @@ -778,19 +816,6 @@ MonoBehaviour: cullCornRate: 0.9 firstCornLimit: 160 secondCornLimit: 250 ---- !u!114 &305093359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414346} --- !u!1 &315104241 GameObject: m_ObjectHideFlags: 0 @@ -821,19 +846,6 @@ Transform: m_Father: {fileID: 2040636316} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!114 &316789975 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414350} --- !u!1 &323920545 GameObject: m_ObjectHideFlags: 0 @@ -1024,7 +1036,7 @@ RectTransform: m_Children: - {fileID: 1106859980} m_Father: {fileID: 387414334} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1235,7 +1247,7 @@ PrefabInstance: - target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 11 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1477,6 +1489,11 @@ PrefabInstance: propertyPath: onClickPlaySEFilename value: se_ButtonTap objectReference: {fileID: 0} + - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1495,7 +1512,7 @@ PrefabInstance: - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1637,150 +1654,19 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 ---- !u!114 &387414344 stripped +--- !u!114 &452908902 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414345 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414346 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414347 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414348 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414349 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414350 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414351 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414352 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8117515348220274205, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414353 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1750965193008879782, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414354 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1464061990, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &387414355 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 387414332} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: + mTarget: {fileID: 1507187603938887412} --- !u!1 &457045027 GameObject: m_ObjectHideFlags: 0 @@ -1837,7 +1723,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 39 - m_Right: 58 + m_Right: 78 m_Top: 4 m_Bottom: 0 m_ChildAlignment: 0 @@ -1881,7 +1767,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a64b1cc6e08eb5849a45654b25ba55bf, type: 3} + m_Sprite: {fileID: 21300000, guid: 3e6395a0cda798a47a6ddcc17370e27a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1939,19 +1825,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 260671573} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &466380812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414352} --- !u!95 &473560054 stripped Animator: m_CorrespondingSourceObject: {fileID: 1908936244342333737, guid: 0949d70c1a73342ca8955c7f59c04fe0, @@ -2071,19 +1944,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &513520004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414347} --- !u!1 &521469529 GameObject: m_ObjectHideFlags: 0 @@ -2302,19 +2162,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &563871743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414345} --- !u!1 &619114158 GameObject: m_ObjectHideFlags: 0 @@ -2559,6 +2406,31 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &650946944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 651479253} +--- !u!114 &651479253 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &665770084 GameObject: m_ObjectHideFlags: 0 @@ -2921,19 +2793,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &731385908 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414351} --- !u!1 &737572416 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3547190356963695060, guid: caaa748dbeed576499e8cae74d33f689, @@ -3140,19 +2999,6 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &888149486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414355} --- !u!1 &895001958 GameObject: m_ObjectHideFlags: 0 @@ -3264,19 +3110,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &906243848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414348} --- !u!1 &925906674 GameObject: m_ObjectHideFlags: 0 @@ -3580,6 +3413,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &984088744 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &989323255 GameObject: m_ObjectHideFlags: 0 @@ -3973,6 +3818,18 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 27 +--- !u!114 &1144180163 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1164585267 GameObject: m_ObjectHideFlags: 0 @@ -4243,6 +4100,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1218410118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1516974627} --- !u!1001 &1226867710 PrefabInstance: m_ObjectHideFlags: 0 @@ -4603,6 +4473,18 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1401507177 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1406886287 GameObject: m_ObjectHideFlags: 0 @@ -4684,6 +4566,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1447526946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1144180163} --- !u!1 &1452091997 GameObject: m_ObjectHideFlags: 0 @@ -4839,6 +4734,19 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 31 +--- !u!114 &1497390460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 984088744} --- !u!1 &1501215305 GameObject: m_ObjectHideFlags: 0 @@ -4957,7 +4865,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1535126674 +--- !u!114 &1516974627 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1537144681 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4969,7 +4889,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 387414344} + mTarget: {fileID: 147614861} --- !u!1 &1537737291 GameObject: m_ObjectHideFlags: 0 @@ -5002,19 +4922,6 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1564257283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1507187603938887412} --- !u!1001 &1589622939 PrefabInstance: m_ObjectHideFlags: 0 @@ -5514,6 +5421,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1709156043 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1734228464 GameObject: m_ObjectHideFlags: 0 @@ -15352,19 +15271,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!114 &1850113378 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414354} --- !u!114 &1859409048 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6168082219279810231, guid: caaa748dbeed576499e8cae74d33f689, @@ -15907,19 +15813,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1958951427} m_PrefabAsset: {fileID: 0} ---- !u!114 &1975174681 +--- !u!114 &1980930080 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 387414349} --- !u!1 &1989990597 GameObject: m_ObjectHideFlags: 0 @@ -16437,7 +16342,7 @@ PrefabInstance: - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} @@ -16840,6 +16745,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1507187604136703913, guid: 21599f8e6d1104a07b0b14b49f8c1429, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 33965d17844ba2f4a813cf42bf932db0, + type: 3} - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} propertyPath: m_Pivot.x @@ -17021,7 +16932,7 @@ PrefabInstance: - target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04, type: 3} propertyPath: m_RootOrder - value: 7 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab index ab81bbfa..61a76c7a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/MachineFrame.prefab @@ -74,7 +74,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -62.8} - m_SizeDelta: {x: 171, y: 50} + m_SizeDelta: {x: 188, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6554254553643039996 CanvasRenderer: @@ -103,9 +103,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, type: 3} + m_Sprite: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/StockCorn.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/StockCorn.prefab index 1a9552f8..17b6b02b 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/StockCorn.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/StockCorn.prefab @@ -214,7 +214,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04bf5df3d5854e646a010dcc268e68a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 33965d17844ba2f4a813cf42bf932db0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -252,7 +252,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 42 - m_Right: 60 + m_Right: 80 m_Top: -10 m_Bottom: 0 m_ChildAlignment: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 6b1d5177..25267264 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -681,7 +681,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0.7, y: 71.9} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114269955797022 CanvasRenderer: @@ -873,7 +873,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0.7, y: 71.9} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270417149857 CanvasRenderer: @@ -1007,7 +1007,7 @@ RectTransform: 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: 122, y: 40} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270452900658 CanvasRenderer: @@ -1036,7 +1036,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e4cf5badc30c9c848961d83d0daefd2c, type: 3} + m_Sprite: {fileID: 21300000, guid: 89ea0df8f37a2334a95f4fb29e2ea231, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1310,7 +1310,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0.7, y: 71.9} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270625729310 CanvasRenderer: @@ -1444,7 +1444,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0.7000687, y: 71.89999} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270758350243 CanvasRenderer: @@ -1965,7 +1965,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.3000093, y: 4} - m_SizeDelta: {x: 122, y: 40} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271397819352 CanvasRenderer: @@ -1994,7 +1994,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a2a9482dd8671844813d7eb2978e059, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2117,7 +2117,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.3, y: 4} - m_SizeDelta: {x: 122, y: 40} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271449284242 CanvasRenderer: @@ -2146,7 +2146,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bab63488a87726d4a8ee6b6cb34c40f0, type: 3} + m_Sprite: {fileID: 21300000, guid: 29098744b1af3364ab6600316ce9e9ae, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2378,7 +2378,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -2798,7 +2798,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -2886,7 +2886,7 @@ RectTransform: 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: 122, y: 40} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114271781323280 CanvasRenderer: @@ -2915,7 +2915,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, type: 3} + m_Sprite: {fileID: 21300000, guid: af08f912ee6d85f4595c2fe8f85c6507, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 3cc17319..afc243c4 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -223,7 +223,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 1 m_BestFit: 0 @@ -235,7 +235,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uAC00\uACF5\uBA38\uC2E0" + m_Text: Processing machine --- !u!114 &1134178393517056210 MonoBehaviour: m_ObjectHideFlags: 0 @@ -461,7 +461,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0.7, y: 71.9} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693359888773727 CanvasRenderer: @@ -595,7 +595,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.3, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693359959091457 CanvasRenderer: @@ -624,7 +624,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bab63488a87726d4a8ee6b6cb34c40f0, type: 3} + m_Sprite: {fileID: 21300000, guid: 29098744b1af3364ab6600316ce9e9ae, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -957,7 +957,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1.3000093, y: 4} - m_SizeDelta: {x: 118, y: 38} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693360776471843 CanvasRenderer: @@ -986,7 +986,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a2a9482dd8671844813d7eb2978e059, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1331,7 +1331,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0.7, y: 71.89999} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693360873139575 CanvasRenderer: @@ -2368,7 +2368,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + objectReference: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} @@ -2522,7 +2522,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 35bd62be821f70647a2142fec78e7fd3, + objectReference: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 193d2384..dd4fb301 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -178,9 +178,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c5f4520889b1ea42ad6bf74b0e96c30, type: 3} + m_Sprite: {fileID: 21300000, guid: c390477b4fbc6074698e6cfd4463f9ea, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -283,6 +283,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8736114270452900659, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 89ea0df8f37a2334a95f4fb29e2ea231, + type: 3} - target: {fileID: 8736114270758350254, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_AnchoredPosition.x @@ -427,7 +433,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, + objectReference: {fileID: 21300000, guid: af08f912ee6d85f4595c2fe8f85c6507, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -449,6 +455,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &275189771 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 275189768} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &298872039 PrefabInstance: m_ObjectHideFlags: 0 @@ -602,7 +620,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + objectReference: {fileID: 21300000, guid: 4a2a9482dd8671844813d7eb2978e059, type: 3} - target: {fileID: 8736114271410563866, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -614,6 +632,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8736114271449284243, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29098744b1af3364ab6600316ce9e9ae, + type: 3} - target: {fileID: 8736114271484472203, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_AnchoredPosition.x @@ -804,6 +828,19 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8736114270285166811} m_PrefabAsset: {fileID: 0} +--- !u!114 &615205426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 8736114270285166813} --- !u!114 &670145871 MonoBehaviour: m_ObjectHideFlags: 0 @@ -905,6 +942,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 1470} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1238614618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 275189771} --- !u!1 &1440832243 GameObject: m_ObjectHideFlags: 0 @@ -1096,7 +1146,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1720684620 MonoBehaviour: @@ -1117,9 +1167,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1508,13 +1558,25 @@ PrefabInstance: - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Text - value: "\uAC00\uACF5\uBA38\uC2E0" + value: Processing machine objectReference: {fileID: 0} + - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_FontData.m_Alignment value: 4 objectReference: {fileID: 0} + - target: {fileID: 2616693359959091456, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29098744b1af3364ab6600316ce9e9ae, + type: 3} - target: {fileID: 2616693360086915590, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Name @@ -1625,6 +1687,24 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2616693360776471842, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4a2a9482dd8671844813d7eb2978e059, + type: 3} + - target: {fileID: 5553657216358781386, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, + type: 3} + - target: {fileID: 6461896231797963539, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8990d570a96764364823ea362803dfcf, type: 3} --- !u!114 &2616693359400416743 stripped @@ -1661,14 +1741,13 @@ PrefabInstance: - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_Text - value: "1\uADF8\uB8E8\uC5D0\uC11C 3\uC774\uC0AD\uC744 \uC218\uD655\uD560 - \uC218 \uC788\uC2B5\uB2C8\uB2E4." + value: You can harvest 3 objectReference: {fileID: 0} - target: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 3975643701173361712, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1684,7 +1763,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0e7856286a3221944ad85eb3ad09c93b, + objectReference: {fileID: 21300000, guid: 01e9c701c8d844e47952d22cf715dc5e, type: 3} - target: {fileID: 6796275775689852962, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1696,6 +1775,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8736114270452900659, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 89ea0df8f37a2334a95f4fb29e2ea231, + type: 3} - target: {fileID: 8736114270758350254, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_AnchoredPosition.x @@ -1820,7 +1905,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7e541421118cc51468cb097ab0be4cec, + objectReference: {fileID: 21300000, guid: 4a2a9482dd8671844813d7eb2978e059, type: 3} - target: {fileID: 8736114271410563866, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1832,6 +1917,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8736114271449284243, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 29098744b1af3364ab6600316ce9e9ae, + type: 3} - target: {fileID: 8736114271484472203, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} propertyPath: m_AnchoredPosition.x @@ -1851,7 +1942,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 52102f2f72a27fb40bb5d27bf309f6d1, + objectReference: {fileID: 21300000, guid: af08f912ee6d85f4595c2fe8f85c6507, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, type: 3} @@ -1867,3 +1958,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8736114270285166813 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 2b895e0f..f6a2283a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -231,19 +231,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 239476807} m_CullTransparentMesh: 0 ---- !u!114 &253984197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1766466141} --- !u!1 &308891212 GameObject: m_ObjectHideFlags: 0 @@ -532,7 +519,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 108, y: 40} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &575026011 MonoBehaviour: @@ -553,7 +540,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a2a9482dd8671844813d7eb2978e059, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1292,7 +1279,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 108, y: 40} + m_SizeDelta: {x: 152, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1020149467 MonoBehaviour: @@ -1313,7 +1300,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} + m_Sprite: {fileID: 21300000, guid: af08f912ee6d85f4595c2fe8f85c6507, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1561,7 +1548,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1122617364 MonoBehaviour: @@ -1582,7 +1569,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 31f5a049028df4d4a8df7222be280a77, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2167,7 +2154,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, + objectReference: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} @@ -2195,18 +2182,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1402887486} m_PrefabAsset: {fileID: 0} ---- !u!114 &1402887490 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9078439763752813187, guid: a03eacc36379f7a4b9c976a5aaa17ee2, - type: 3} - m_PrefabInstance: {fileID: 1402887486} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1480555403 PrefabInstance: m_ObjectHideFlags: 0 @@ -2858,7 +2833,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: abd93eb864d1792489e26436c0253f91, + objectReference: {fileID: 21300000, guid: 9d8b7eeea01eb2e438dfac06bb61af65, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} @@ -2886,18 +2861,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1766466137} m_PrefabAsset: {fileID: 0} ---- !u!114 &1766466141 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9078439763752813187, guid: a03eacc36379f7a4b9c976a5aaa17ee2, - type: 3} - m_PrefabInstance: {fileID: 1766466137} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1929329150 GameObject: m_ObjectHideFlags: 0 @@ -3012,19 +2975,6 @@ RectTransform: m_AnchoredPosition: {x: -7, y: 166.19997} m_SizeDelta: {x: 550, y: 300} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1949582597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1402887490} --- !u!1 &1977897796 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity index 9e346cdf..346ef55b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity @@ -614,7 +614,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 062e7df722b12514eb866309eefb1088, type: 3} + m_Sprite: {fileID: 21300000, guid: 859db30fafea43a49b6f7440affcf4ca, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -668,7 +668,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1, y: 4} - m_SizeDelta: {x: 122, y: 40} + m_SizeDelta: {x: 108, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1707876980489548928 MonoBehaviour: @@ -1049,7 +1049,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 72938eaef3d051547b715572192bc434, type: 3} + m_Sprite: {fileID: 21300000, guid: d57dc601b5a0e9b4d96650a3d878673f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1103,7 +1103,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 319, y: -42} - m_SizeDelta: {x: 340, y: 42} + m_SizeDelta: {x: 314, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1707876980850809402 MonoBehaviour: @@ -1362,7 +1362,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -1374,9 +1374,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\uD0F1\uD06C\uC758 \uC5EC\uC720 \uACF5\uAC04\uC774 \uBD80\uC871\uD574\uC11C\n\uD31D\uCF58\uC774 - \uB118\uCCD0\uB0A9\uB2C8\uB2E4.\n\uB118\uCE5C \uBD84\uC740 \uC790\uB3D9\uC73C\uB85C - \uD3D0\uAE30\uB429\uB2C8\uB2E4." + m_Text: Because there is not enough free space in the tank Popcorn will overflow + The overflow will be automatically discarded. --- !u!222 &1707876980975310911 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1606,7 +1605,7 @@ RectTransform: 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: 290, y: 40} + m_SizeDelta: {x: 164, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1707876981437582203 MonoBehaviour: @@ -1627,7 +1626,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 13e929ddb9b148c42acb7fe2abb804e7, type: 3} + m_Sprite: {fileID: 21300000, guid: 4bbbf0927dd59b6429b67fed20321636, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1742,7 +1741,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8566ff8a0a1fede4fab28c60f4616577, type: 3} + m_Sprite: {fileID: 21300000, guid: bc7417fb533e06640a505755bf3b4d86, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity index e3edbbe4..afc8f406 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity @@ -640,7 +640,7 @@ RectTransform: 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: 290, y: 40} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &308875738 MonoBehaviour: @@ -661,7 +661,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -755,7 +755,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 319, y: -34} - m_SizeDelta: {x: 340, y: 42} + m_SizeDelta: {x: 314, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &377458893 MonoBehaviour: @@ -776,7 +776,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e1aa8b6ea993e3d489dcd6308d0cf5d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b9f4b6377671b5479597672719d19bc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -873,7 +873,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 148, y: -373} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &406579701 MonoBehaviour: @@ -1159,7 +1159,7 @@ RectTransform: m_GameObject: {fileID: 677856731} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 406579700} m_RootOrder: 0 @@ -1188,7 +1188,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 062e7df722b12514eb866309eefb1088, type: 3} + m_Sprite: {fileID: 21300000, guid: a4ae18b6aed1eb94dbbc5664789c4c8a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2323,7 +2323,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -147, y: -373} - m_SizeDelta: {x: 240, y: 110} + m_SizeDelta: {x: 240, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1530405765 MonoBehaviour: @@ -3635,7 +3635,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -148, y: 654} - m_SizeDelta: {x: 342, y: 108} + m_SizeDelta: {x: 462, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2136945805 MonoBehaviour: @@ -3696,7 +3696,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5692e43e5368ba84cadd4e46a2936f40, type: 3} + m_Sprite: {fileID: 21300000, guid: 8bf552a8c07aeb947ba7ea13f68e9e63, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity index 0a886d88..35e7f119 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity @@ -2486,7 +2486,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: 138, y: 0} + m_AnchoredPosition: {x: 164, y: 0} m_SizeDelta: {x: 38, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1105771977 @@ -3177,7 +3177,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -144, y: 0} + m_AnchoredPosition: {x: -163, y: 0} m_SizeDelta: {x: 38, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1543647726 @@ -3469,7 +3469,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1986056006 MonoBehaviour: @@ -3530,7 +3530,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3659,7 +3659,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u4E2D" + m_Text: During automatic cooking --- !u!222 &1987961198 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3997,7 +3997,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 281} - m_SizeDelta: {x: 342, y: 108} + m_SizeDelta: {x: 462, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2136945805 MonoBehaviour: @@ -4058,7 +4058,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8bf552a8c07aeb947ba7ea13f68e9e63, type: 3} + m_Sprite: {fileID: 21300000, guid: 131c154b52b5f4043aaecbcd66473abe, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity index 5a3c24e0..bee46592 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity @@ -190,6 +190,11 @@ PrefabInstance: propertyPath: m_Name value: line (1) objectReference: {fileID: 0} + - target: {fileID: 6753247314740774566, guid: b1baf87241be3a442a9ff800362abbbb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6753247314740774567, guid: b1baf87241be3a442a9ff800362abbbb, type: 3} propertyPath: m_Pivot.x @@ -337,8 +342,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.99996, y: -41} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 137.99997, y: -38} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &252133241 MonoBehaviour: @@ -454,8 +459,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: 267.00003, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_AnchoredPosition: {x: 297.00003, y: 1} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &369996024 MonoBehaviour: @@ -529,7 +534,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445717700 @@ -552,7 +557,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -564,7 +569,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\uD68D\uB4DD\uAE4C\uC9C0 \uD544\uC694\uD55C \uC2DC\uAC04" + m_Text: Time to acquire --- !u!222 &445717701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -648,8 +653,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: 267, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_AnchoredPosition: {x: 297, y: 1} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &497376572 MonoBehaviour: @@ -811,7 +816,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &593536992 MonoBehaviour: @@ -872,7 +877,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8b7783b0e5a9b454db7fd811119f046e, type: 3} + m_Sprite: {fileID: 21300000, guid: 31f5a049028df4d4a8df7222be280a77, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1011,8 +1016,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: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617186344 MonoBehaviour: @@ -1259,8 +1264,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.99996, y: -41} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 137.99997, y: -38} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &739094530 MonoBehaviour: @@ -1375,8 +1380,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: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059000513 MonoBehaviour: @@ -1450,7 +1455,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1165270082 @@ -1473,7 +1478,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1485,7 +1490,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\uD68D\uB4DD\uD560 \uC218 \uC788\uB294 \uD31D\uCF58" + m_Text: Popcorn you can get --- !u!222 &1165270083 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1571,8 +1576,8 @@ 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: -159, y: 114.00003} - m_SizeDelta: {x: 206, y: 130} + m_AnchoredPosition: {x: -186, y: 114.00003} + m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1177471512 MonoBehaviour: @@ -1822,7 +1827,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -59} - m_SizeDelta: {x: 770, y: 400} + m_SizeDelta: {x: 860, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1228675119 MonoBehaviour: @@ -1989,8 +1994,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: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330781664 MonoBehaviour: @@ -2063,8 +2068,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 109.000015, y: -40} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 142.00002, y: -37} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1355556012 MonoBehaviour: @@ -2217,8 +2222,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 105, y: -41} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 138, y: -38} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1393575076 MonoBehaviour: @@ -2407,7 +2412,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2419,10 +2424,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\uC790\uB3D9 \uC870\uB9AC\uB97C \uC0AC\uC6A9\uD558\uBA74 \uC77C\uC815 - \uC2DC\uAC04 \uD6C4\uC5D0\n\uB300\uB7C9\uC758 \uD31D\uCF58\uC744 \uD68D\uB4DD\uD560 - \uC218 \uC788\uC2B5\uB2C8\uB2E4!\n\uAD11\uACE0\uB97C \uBCF4\uACE0 \uC790\uB3D9 - \uC870\uB9AC\uB97C \uC0AC\uC6A9\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? " + m_Text: With automatic cooking, after a certain amount of time You can get a lot + of popcorn! Do you want to watch the video and use automatic cooking? --- !u!222 &1633334325 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2506,8 +2509,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: 267.00003, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_AnchoredPosition: {x: 297, y: 1} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1643570443 MonoBehaviour: @@ -2655,7 +2658,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667839400 @@ -2678,7 +2681,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2690,7 +2693,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\uB808\uBCA8\uC5C5\uC5D0 \uD544\uC694\uD55C \uC0AC\uC6A9 \uD69F\uC218" + m_Text: Number of uses required to level up --- !u!222 &1667839401 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2774,8 +2777,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: 267, y: 1} - m_SizeDelta: {x: 200, y: 74} + m_AnchoredPosition: {x: 297, y: 1} + m_SizeDelta: {x: 240, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676166303 MonoBehaviour: @@ -2911,7 +2914,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: be4dab1f6c324984cb0659ce0cc2b7c7, type: 3} + m_Sprite: {fileID: 21300000, guid: b6575785a082f8543bd6d9aa7906155b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2966,7 +2969,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: 140, y: 114} + m_AnchoredPosition: {x: 174, y: 114} m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1725004923 @@ -3100,7 +3103,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -111, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1771385232 @@ -3162,7 +3165,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3174,7 +3177,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\uC790\uB3D9 \uC870\uB9AC \uB808\uBCA8" + m_Text: Automatic cooking level --- !u!222 &1771385234 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3218,7 +3221,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: 820, y: 900} + m_SizeDelta: {x: 910, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1828954259 MonoBehaviour: @@ -3407,6 +3410,11 @@ PrefabInstance: propertyPath: m_Name value: line objectReference: {fileID: 0} + - target: {fileID: 6753247314740774566, guid: b1baf87241be3a442a9ff800362abbbb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6753247314740774567, guid: b1baf87241be3a442a9ff800362abbbb, type: 3} propertyPath: m_Pivot.x @@ -3585,7 +3593,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: 780, y: 900} + m_SizeDelta: {x: 800, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &2085678476 CanvasGroup: @@ -3707,8 +3715,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: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_AnchoredPosition: {x: -99, y: -30.000103} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2100577140 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index e1f94303..eb16b2a0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -207,25 +207,25 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, + objectReference: {fileID: 21300000, guid: b5492bd078fe6614098c7216380c6559, type: 3} - target: {fileID: 751013266033158939, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, + objectReference: {fileID: 21300000, guid: b5492bd078fe6614098c7216380c6559, type: 3} - target: {fileID: 751013266328303293, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, + objectReference: {fileID: 21300000, guid: edd6f2b9154125d41a7f5e9177e2aa47, type: 3} - target: {fileID: 751013266565487797, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, + objectReference: {fileID: 21300000, guid: edd6f2b9154125d41a7f5e9177e2aa47, type: 3} - target: {fileID: 2491106385478250891, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -251,13 +251,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 3394136939320170178, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 3412655375795948910, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -268,13 +268,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6c7a1316274f767489221ac9165a0148, + objectReference: {fileID: 21300000, guid: c26ae926ef1c05f4fa308d0685afaf34, type: 3} - target: {fileID: 4082915277351343690, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 016a4d1058a82e64899a7e1776a6a3e3, + objectReference: {fileID: 21300000, guid: bc6530bc2e452114983904ff37892878, type: 3} - target: {fileID: 4082915277351343700, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -285,13 +285,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3427e8ca8d0104e48931345970086635, + objectReference: {fileID: 21300000, guid: 90d9bcf861b8f8446a37f440f410c45e, type: 3} - target: {fileID: 4082915277796665065, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 274b9e3453e45cb42952f9bf572e625b, + objectReference: {fileID: 21300000, guid: 1b21c61c7670bb845aad6daba2d6e317, type: 3} - target: {fileID: 4082915277796665065, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -302,13 +302,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, + objectReference: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} - target: {fileID: 4082915278124182473, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, + objectReference: {fileID: 21300000, guid: 6e94a28848db9ab44947f43b082812ce, type: 3} - target: {fileID: 4082915278124182473, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -324,7 +324,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, + objectReference: {fileID: 21300000, guid: edd6f2b9154125d41a7f5e9177e2aa47, type: 3} - target: {fileID: 4082915278942985864, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -350,19 +350,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, + objectReference: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} - target: {fileID: 4082915279096188744, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, + objectReference: {fileID: 21300000, guid: b5492bd078fe6614098c7216380c6559, type: 3} - target: {fileID: 4082915279112502089, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} - target: {fileID: 4082915279371560208, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -503,19 +503,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 7325254816367235996, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 7325254816537426324, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 8853301888902362100, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity index 0bcea226..a3ff53c1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity @@ -212,7 +212,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f3378cb6a2562d8498886f93b8fcc817, + objectReference: {fileID: 21300000, guid: 5c6d3bd70b7c3f545ae2673c91ba5e35, type: 3} - target: {fileID: 2377818823490934338, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} @@ -338,25 +338,25 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, + objectReference: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} - target: {fileID: 2377818824163143826, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, + objectReference: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} - target: {fileID: 2377818824174324135, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: dc2aaee634e57eb4898f671d9d280316, + objectReference: {fileID: 21300000, guid: c26ae926ef1c05f4fa308d0685afaf34, type: 3} - target: {fileID: 2377818824328388905, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, + objectReference: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5a98de00194aa40f6a3050df19f4e5f5, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity index 8f2c39cf..c641164e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity @@ -207,7 +207,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6992356671f4ba241abd42710ad93123, + objectReference: {fileID: 21300000, guid: ef629d99a80507944968acb66e51b307, type: 3} - target: {fileID: 4187074209012466681, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} @@ -332,7 +332,8 @@ PrefabInstance: - target: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Text - value: "\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u3059\u308B\u3068\n\u9054\u6210\u5831\u916C\u304C\u3082\u3089\u3048\u306A\u304F\u306A\u308A\n\u65E2\u306B\u8ABF\u7406\u3057\u305F\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306F\n\u8A66\u98DF\u306B\u56DE\u3055\u308C\u307E\u3059" + value: If you cancel You will not be able to receive achievement rewards Popcorn + that has already been cooked Will be sent for tasting objectReference: {fileID: 0} - target: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} @@ -349,19 +350,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: adf4494c1d0b1084eac5d0b1310ecbf7, + objectReference: {fileID: 21300000, guid: a867e1ff59aedbf48a8693fbf531ccb7, type: 3} - target: {fileID: 4187074209620482715, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: db3a5113bce41a3408381d04fbd53a92, + objectReference: {fileID: 21300000, guid: 9ec2253249fd8b043b5676e0b0acd740, type: 3} - target: {fileID: 4187074210099131601, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, + objectReference: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} - target: {fileID: 4187074210099131614, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity index 8d301fa8..23108ef2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity @@ -207,7 +207,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 3058138224889858367, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -253,19 +253,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 4315754686575543077, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, + objectReference: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} - target: {fileID: 4315754686625492741, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, + objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} - target: {fileID: 4315754687099534943, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -396,7 +396,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 185361e852912d246a6e8c831df32ecb, + objectReference: {fileID: 21300000, guid: 48243d820b7c5bd43ba50a88f69a8c05, type: 3} - target: {fileID: 4315754688526726639, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -422,7 +422,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, + objectReference: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index 9b52a4e2..29af70f4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -416,12 +416,12 @@ PrefabInstance: - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -436,8 +436,19 @@ PrefabInstance: - target: {fileID: 41559837514718277, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -153 objectReference: {fileID: 0} + - target: {fileID: 1398728378518018609, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + objectReference: {fileID: 0} + - target: {fileID: 1398728378518018609, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 2054314707049269807, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -456,12 +467,12 @@ PrefabInstance: - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -476,17 +487,17 @@ PrefabInstance: - target: {fileID: 2283608498504545933, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -153 objectReference: {fileID: 0} - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -501,7 +512,7 @@ PrefabInstance: - target: {fileID: 2306676429090080402, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -63.6 objectReference: {fileID: 0} - target: {fileID: 2523338578469946763, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -561,8 +572,14 @@ PrefabInstance: - target: {fileID: 3337121566302665231, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u5E97\u8217\u30EC\u30D9\u30EB" + value: "\u5916\u89B3\u30EC\u30D9\u30EB" objectReference: {fileID: 0} + - target: {fileID: 3337121566302665231, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 3596886520976439052, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -700,6 +717,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401084837500, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 642d7890c10bfa0478e326098a66b501, + type: 3} - target: {fileID: 6859128401107917370, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.y @@ -864,7 +887,7 @@ PrefabInstance: - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x - value: 895 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -874,7 +897,7 @@ PrefabInstance: - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.x - value: 447.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401308582515, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -905,7 +928,7 @@ PrefabInstance: - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x - value: 895 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -915,7 +938,7 @@ PrefabInstance: - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.x - value: 447.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1148,6 +1171,12 @@ PrefabInstance: value: objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + - target: {fileID: 6859128402129278095, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, + type: 3} - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text @@ -1172,7 +1201,7 @@ PrefabInstance: - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x - value: 895 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1182,7 +1211,7 @@ PrefabInstance: - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchoredPosition.x - value: 447.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1355,7 +1384,7 @@ PrefabInstance: - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u30EC\u30D9\u30EB" + value: "\u5E97\u8217\u30EC\u30D9\u30EB" objectReference: {fileID: 0} - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1429,6 +1458,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7037845673517582736, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" + objectReference: {fileID: 0} - target: {fileID: 8427328856812647918, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index edc9a095..72588e3c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -6056,7 +6056,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 716cb1fb9a2a96445950199c3a6d2961, type: 3} + m_Sprite: {fileID: 21300000, guid: 715c2bd0966ed42719ef3272d260768f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7622,6 +7622,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -7690,13 +7696,25 @@ PrefabInstance: - target: {fileID: 1382553612690395228, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Text - value: "\u81EA\u52D5\u8ABF\u7406" + value: "\u81EA\u52A8\u70F9\u996A" objectReference: {fileID: 0} + - target: {fileID: 1382553612690395228, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} + - target: {fileID: 1750965193008879782, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ef9cd759497b04e9399ba3cd5617056c, + type: 3} - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -7767,6 +7785,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, + type: 3} + - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -7912,6 +7942,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, + type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.x @@ -7922,6 +7958,17 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Text + value: "\u5236\u4F5C" + objectReference: {fileID: 0} + - target: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x @@ -7952,6 +7999,12 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + type: 3} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -8017,6 +8070,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4486994142522989318, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e259fa4d2057bac429e800d9dac78aae, + type: 3} - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index d3954010..d4be990a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -210,6 +210,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1742302645601071765, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 1742302645900268983, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -347,17 +353,28 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2660639678406526124, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_SizeDelta.x + value: 166 + objectReference: {fileID: 0} - target: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 72cefa2f7b6bb3b40b9f05f60efeaaea, + objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchoredPosition.y value: 50 objectReference: {fileID: 0} + - target: {fileID: 2660639678575329504, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 49fd28526ab9a8c428a93e66a2bf760d, + type: 3} - target: {fileID: 2660639678609988585, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.y @@ -382,7 +399,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + type: 3} + - target: {fileID: 2660639678752994312, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -408,7 +431,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8fa3b56a1abd868419e01c6a50384134, + objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -544,7 +567,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} + - target: {fileID: 3338528259637188169, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 3338528259869159787, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -606,6 +635,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4606433576618360693, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.y @@ -732,6 +767,31 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} +--- !u!114 &55686910 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &434476094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 55686910} --- !u!114 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity index 788a00d1..aaa69398 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity @@ -322,13 +322,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 38d790c295ddce645bfcfb5e0edceb91, + objectReference: {fileID: 21300000, guid: 73e0f8e8e6edccf439cd0a364c197223, type: 3} - target: {fileID: 7864277047165460487, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, + objectReference: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} - target: {fileID: 7864277047233171550, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} @@ -339,7 +339,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, + objectReference: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} - target: {fileID: 7864277048177254394, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 37e0aa8f..e81fca16 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -177,7 +177,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9b141242e54041f4f934eb9f6f9bb784, type: 3} + m_Sprite: {fileID: 21300000, guid: 90d9bcf861b8f8446a37f440f410c45e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -444,7 +444,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 36b3da98ccacddc4abe8e0b1df6392ea, type: 3} + m_Sprite: {fileID: 21300000, guid: 1b21c61c7670bb845aad6daba2d6e317, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -747,7 +747,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -864,7 +864,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} + m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1035,7 +1035,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 36bdc31523f6bc246ad7c3622d376a25, type: 3} + m_Sprite: {fileID: 21300000, guid: 6e94a28848db9ab44947f43b082812ce, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2012,7 +2012,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -44.2} - m_SizeDelta: {x: 82, y: 34} + m_SizeDelta: {x: 118, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279096126319 CanvasRenderer: @@ -2041,9 +2041,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} + m_Sprite: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2205,7 +2205,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279112502088 CanvasRenderer: @@ -2234,9 +2234,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2939,7 +2939,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2960,13 +2960,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3114,7 +3114,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3125,13 +3125,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3299,7 +3299,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3310,13 +3310,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index f32d1346..9a2b6f35 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -341,7 +341,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 29} - m_SizeDelta: {x: 218, y: 70} + m_SizeDelta: {x: 350, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823168895748 CanvasRenderer: @@ -370,9 +370,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3378cb6a2562d8498886f93b8fcc817, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c6d3bd70b7c3f545ae2673c91ba5e35, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -882,7 +882,7 @@ RectTransform: 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: 64, y: 42} + m_SizeDelta: {x: 70, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823724858326 CanvasRenderer: @@ -911,7 +911,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1027,7 +1027,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1495,7 +1495,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -175, y: 73} - m_SizeDelta: {x: 82, y: 34} + m_SizeDelta: {x: 118, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824163143827 CanvasRenderer: @@ -1524,7 +1524,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} + m_Sprite: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1639,7 +1639,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc2aaee634e57eb4898f671d9d280316, type: 3} + m_Sprite: {fileID: 21300000, guid: c26ae926ef1c05f4fa308d0685afaf34, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1959,7 +1959,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} + m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 1f97962e..3fd078d9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -141,7 +141,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6992356671f4ba241abd42710ad93123, type: 3} + m_Sprite: {fileID: 21300000, guid: ef629d99a80507944968acb66e51b307, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -579,7 +579,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u3059\u308B\u3068\n\u9054\u6210\u5831\u916C\u304C\u3082\u3089\u3048\u306A\u304F\u306A\u308A\n\u65E2\u306B\u8ABF\u7406\u3057\u305F\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306F\n\u8A66\u98DF\u306B\u56DE\u3055\u308C\u307E\u3059" + m_Text: If you cancel You will not be able to receive achievement rewards Popcorn + that has already been cooked Will be sent for tasting --- !u!114 &1307251323072932719 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1047,7 +1048,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: adf4494c1d0b1084eac5d0b1310ecbf7, type: 3} + m_Sprite: {fileID: 21300000, guid: a867e1ff59aedbf48a8693fbf531ccb7, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1240,7 +1241,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: db3a5113bce41a3408381d04fbd53a92, type: 3} + m_Sprite: {fileID: 21300000, guid: 9ec2253249fd8b043b5676e0b0acd740, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1596,7 +1597,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 9db82183..69b1e3d9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -88,7 +88,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -141, y: 76} - m_SizeDelta: {x: 82, y: 34} + m_SizeDelta: {x: 118, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686575543082 CanvasRenderer: @@ -117,7 +117,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09da070ea3021c5428ccc8b6faaaedf3, type: 3} + m_Sprite: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -310,7 +310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} + m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -826,7 +826,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -1015,7 +1015,7 @@ RectTransform: 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_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} @@ -1486,7 +1486,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 185361e852912d246a6e8c831df32ecb, type: 3} + m_Sprite: {fileID: 21300000, guid: a5e177dea40081446b2dc78070034c04, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1845,7 +1845,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2043,7 +2043,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2159,7 +2159,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2339,7 +2339,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2455,7 +2455,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} 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 c5b31fed..1ef17476 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -590,7 +590,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc2aaee634e57eb4898f671d9d280316, type: 3} + m_Sprite: {fileID: 21300000, guid: c26ae926ef1c05f4fa308d0685afaf34, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -843,7 +843,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47bebb06d82ad4b458a7a82082cec799, type: 3} + m_Sprite: {fileID: 21300000, guid: bc6530bc2e452114983904ff37892878, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1072,7 +1072,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, type: 3} + m_Sprite: {fileID: 21300000, guid: edd6f2b9154125d41a7f5e9177e2aa47, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1187,7 +1187,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9619dc1bf909abb46aee1a87360265d0, type: 3} + m_Sprite: {fileID: 21300000, guid: b5492bd078fe6614098c7216380c6559, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1414,7 +1414,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -1646,7 +1646,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4207e0bd10cba40469dd2424a3571212, type: 3} + m_Sprite: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1938,7 +1938,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ea63a6fefdfeed7458fa482330a7228a, type: 3} + m_Sprite: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index 7f2d01c2..e919c8ed 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -214,7 +214,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -332,7 +332,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -956,7 +956,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -968,7 +968,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: UI/InfoShopCustomizeLevel + m_Text: "\u5916\u89B3\u30EC\u30D9\u30EB" --- !u!114 &5449134050274049995 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1224,7 +1224,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1236,7 +1236,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &2879166960840634929 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1342,7 +1342,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1354,7 +1354,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &5992511198008917351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1430,7 +1430,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -34.000042} - m_SizeDelta: {x: 222, y: 46} + m_SizeDelta: {x: 284, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859128400961489651 CanvasRenderer: @@ -1459,7 +1459,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1902,7 +1902,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -41.10004} - m_SizeDelta: {x: 222, y: 46} + m_SizeDelta: {x: 284, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859128401084837501 CanvasRenderer: @@ -1931,7 +1931,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} + m_Sprite: {fileID: 21300000, guid: 642d7890c10bfa0478e326098a66b501, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2425,7 +2425,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4236,7 +4236,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4248,7 +4248,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: UI/InfoLevel + m_Text: "\u30EC\u30D9\u30EB" --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4587,7 +4587,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -4599,7 +4599,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4780,7 +4780,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4792,7 +4792,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5546\u54C1\u5E93\u5B58" + m_Text: "\u5546\u54C1\u5728\u5EAB" --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4898,7 +4898,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5215,7 +5215,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -34} - m_SizeDelta: {x: 222, y: 46} + m_SizeDelta: {x: 284, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859128402129278080 CanvasRenderer: @@ -5360,7 +5360,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -5372,7 +5372,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u79F0\u8C13" + m_Text: "\u79F0\u53F7" --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5478,7 +5478,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5636,7 +5636,7 @@ RectTransform: m_GameObject: {fileID: 6859128402182084771} 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: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 6859128402407862776} m_RootOrder: 0 @@ -5644,7 +5644,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859128402182084774 CanvasRenderer: @@ -5673,9 +5673,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6027,7 +6027,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -6039,7 +6039,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6750\u6599\u5E93\u5B58" + m_Text: "\u6750\u6599\u5728\u5EAB" --- !u!114 &2317717004034477971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6115,7 +6115,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -41.10004} - m_SizeDelta: {x: 222, y: 46} + m_SizeDelta: {x: 284, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859128402304538402 CanvasRenderer: @@ -6144,7 +6144,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -6410,7 +6410,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 94} - m_SizeDelta: {x: 300, y: 138} + m_SizeDelta: {x: 300, y: 144} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6859128402407862779 CanvasRenderer: @@ -6574,7 +6574,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -6586,7 +6586,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u94FA\u7B49\u7EA7" + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8109,7 +8109,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -8610,7 +8610,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -8731,7 +8731,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -8752,7 +8752,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -8873,7 +8873,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -8894,7 +8894,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -9010,7 +9010,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -10875,7 +10875,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -10991,7 +10991,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index f4cb9a4f..e5c8505e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.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: -50.00001, y: -4} + m_AnchoredPosition: {x: -71.5, y: -4} m_SizeDelta: {x: 82, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &13667852 @@ -111,7 +111,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: 234, y: 120} + m_SizeDelta: {x: 256, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &118497228 CanvasRenderer: @@ -187,7 +187,7 @@ 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: 373, y: -203} + m_AnchoredPosition: {x: 362, y: -203} m_SizeDelta: {x: -782.43066, y: 125.79419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6119163445458718855 @@ -283,8 +283,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: 44, y: 8} - m_SizeDelta: {x: 100, y: 42} + m_AnchoredPosition: {x: 33, y: 8} + m_SizeDelta: {x: 144, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1339603271 CanvasRenderer: @@ -313,9 +313,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 49ccadb8669df11469e259812f5b0e30, type: 3} + m_Sprite: {fileID: 21300000, guid: 51e9c0c2590d51740bd47383d0348d04, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -398,8 +398,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: 44.00004, y: -5} - m_SizeDelta: {x: 100, y: 42} + m_AnchoredPosition: {x: 32.3, y: -1.1} + m_SizeDelta: {x: 144, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1464061991 CanvasRenderer: @@ -428,9 +428,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 49ccadb8669df11469e259812f5b0e30, type: 3} + m_Sprite: {fileID: 21300000, guid: 51e9c0c2590d51740bd47383d0348d04, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -586,7 +586,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: -50, y: 9} + m_AnchoredPosition: {x: -71, y: 9} m_SizeDelta: {x: 82, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1974020077 @@ -663,7 +663,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: 234, y: 120} + m_SizeDelta: {x: 256, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2041305257 CanvasRenderer: @@ -954,7 +954,7 @@ RectTransform: m_GameObject: {fileID: 566248750470715636} 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_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4146400484972392966} - {fileID: 2609057251471961254} @@ -1165,7 +1165,7 @@ RectTransform: m_GameObject: {fileID: 756812947753906504} 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_LocalScale: {x: 1, y: 1, z: 0.9} m_Children: - {fileID: 2753315661541855576} - {fileID: 3412357805197715353} @@ -1362,7 +1362,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 13} m_SizeDelta: {x: 300, y: 202} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4341721824000677314 @@ -1648,7 +1648,7 @@ RectTransform: 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_AnchoredPosition: {x: 53, y: 473} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4251265789366133276 @@ -2126,7 +2126,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 38, y: -29} - m_SizeDelta: {x: 102, y: 58} + m_SizeDelta: {x: 140, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2411136131736408551 CanvasRenderer: @@ -2155,9 +2155,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3be9a3bcc8d7c864a97b5be41e33418f, type: 3} + m_Sprite: {fileID: 21300000, guid: d093b97838f7bee4589f5b9dac23ddb4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2241,7 +2241,7 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: 13} m_SizeDelta: {x: 300, y: 202} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4400287271111670875 @@ -2317,7 +2317,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 39, y: -29.000061} - m_SizeDelta: {x: 102, y: 58} + m_SizeDelta: {x: 140, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3480730007122962075 CanvasRenderer: @@ -2346,9 +2346,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fcff498df82e3324a908c160dbe78025, type: 3} + m_Sprite: {fileID: 21300000, guid: f0e107abf5ab87d4cb79e289197aea93, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2499,7 +2499,7 @@ RectTransform: m_GameObject: {fileID: 7129812585269745309} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.89999807, y: 0.89999807, z: 0.89999807} + m_LocalScale: {x: 1, y: 1, z: 0.89999807} m_Children: - {fileID: 2744514800634281199} m_Father: {fileID: 3664916832844628215} @@ -2507,7 +2507,7 @@ RectTransform: 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: 684} + m_AnchoredPosition: {x: 53, y: 684} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &512143980313251866 @@ -3087,7 +3087,7 @@ RectTransform: m_GameObject: {fileID: 8559323780514547720} 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_LocalScale: {x: 1, y: 1, z: 0.9} m_Children: - {fileID: 3731750983233236168} - {fileID: 8216095361509793363} @@ -3242,7 +3242,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 35.999977, y: -29.000061} - m_SizeDelta: {x: 102, y: 58} + m_SizeDelta: {x: 140, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &671799504063113083 CanvasRenderer: @@ -3271,9 +3271,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b9dba4f783fd158408455c008aa8696b, type: 3} + m_Sprite: {fileID: 21300000, guid: c1b4c7d4cfe573243a1dc161efcc15b8, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3347,7 +3347,7 @@ RectTransform: m_GameObject: {fileID: 8788721428949136014} 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_LocalScale: {x: 1, y: 1, z: 0.9} m_Children: - {fileID: 3623280182761213892} - {fileID: 6262328253883145864} @@ -3528,7 +3528,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 49, y: -29.000061} - m_SizeDelta: {x: 182, y: 56} + m_SizeDelta: {x: 196, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5756465118540328855 CanvasRenderer: @@ -3557,7 +3557,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7790c7ac777220c43b20f746837042ba, type: 3} + m_Sprite: {fileID: 21300000, guid: 503e1dac51f0f89449adfda161422448, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3614,6 +3614,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3664916832844628215} m_Modifications: + - target: {fileID: 1892712672056555269, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, + type: 3} + - target: {fileID: 3310671340499624764, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, + type: 3} + - target: {fileID: 3310671340824885726, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, + type: 3} + - target: {fileID: 3310671340978879439, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, + type: 3} - target: {fileID: 3310671341034218321, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_LocalPosition.x @@ -3624,6 +3648,12 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3310671341497605163, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + type: 3} - target: {fileID: 3310671341536731056, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_IsActive @@ -4452,6 +4482,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8171438696355494108, guid: 2403d69753829416a83b8cfa00108d38, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 64781a74ed1e92947b5bbc0bc212efd5, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2403d69753829416a83b8cfa00108d38, type: 3} --- !u!224 &6205448659049427752 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 7dafc17d..8838a1be 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -746,7 +746,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 38d790c295ddce645bfcfb5e0edceb91, type: 3} + m_Sprite: {fileID: 21300000, guid: 73e0f8e8e6edccf439cd0a364c197223, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1012,7 +1012,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b001ae43c4f609d4ca681dbd095e579f, type: 3} + m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1262,7 +1262,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index cc304ea2..12f17e01 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -1395,7 +1395,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -7.1} - m_SizeDelta: {x: 136, y: 44} + m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639678575329505 CanvasRenderer: @@ -1424,9 +1424,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} + m_Sprite: {fileID: 21300000, guid: 49fd28526ab9a8c428a93e66a2bf760d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1584,7 +1584,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639678739049205 CanvasRenderer: @@ -1615,7 +1615,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2161,7 +2161,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: 136, y: 44} + m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639679015166978 CanvasRenderer: @@ -2192,7 +2192,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2765,6 +2765,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1628107519460211737, guid: 1559aa4b9e5d85c46ae00275092f8d28, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} --- !u!224 &1742302644927332555 stripped @@ -2892,18 +2898,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} ---- !u!224 &6170226839459316569 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, - type: 3} - m_PrefabInstance: {fileID: 2686639074240930400} - m_PrefabAsset: {fileID: 0} --- !u!1 &6410983111595538124 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, type: 3} m_PrefabInstance: {fileID: 2686639074240930400} m_PrefabAsset: {fileID: 0} +--- !u!224 &6170226839459316569 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 2686639074240930400} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2987405833846227820 PrefabInstance: m_ObjectHideFlags: 0 @@ -3031,6 +3037,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1628107519460211737, guid: 1559aa4b9e5d85c46ae00275092f8d28, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} --- !u!224 &4606433577286798635 stripped @@ -3166,6 +3178,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1628107519460211737, guid: 1559aa4b9e5d85c46ae00275092f8d28, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} --- !u!224 &3338528260037239831 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab index 5f4770fd..2fd6b04e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab @@ -229,7 +229,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 104, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1628107518841360725 CanvasRenderer: @@ -258,9 +258,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c0e67d3c5c942b7488e6e51862fac65a, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db3b35adbf917b4289e1d0b5c38dc76, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -785,7 +785,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 94, y: 40} + m_SizeDelta: {x: 136, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1628107519460211738 CanvasRenderer: @@ -814,9 +814,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} + m_Sprite: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab index 5fe84df7..4f5a1bb8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab @@ -367,7 +367,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -852,7 +852,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 104, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &171020293652895552 CanvasRenderer: @@ -881,9 +881,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c0e67d3c5c942b7488e6e51862fac65a, type: 3} + m_Sprite: {fileID: 21300000, guid: 1db3b35adbf917b4289e1d0b5c38dc76, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1574,7 +1574,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 94, y: 40} + m_SizeDelta: {x: 136, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &697035924651597310 CanvasRenderer: @@ -1603,9 +1603,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} + m_Sprite: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index 36b131a8..60ecb639 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6b12d4304d8cc814988c6828d9b478e9, type: 3} + m_Sprite: {fileID: 21300000, guid: e259fa4d2057bac429e800d9dac78aae, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -716,7 +716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} + m_Sprite: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -831,7 +831,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} + m_Sprite: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1020,7 +1020,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} + m_Sprite: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1438,7 +1438,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} + m_Sprite: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3051,7 +3051,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} + m_Sprite: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3505,7 +3505,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 8f4ce2b3f243577478f0825c79f336a7, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index b3ee0505..8c6ac75a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -1752,7 +1752,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1664081618 MonoBehaviour: @@ -1773,7 +1773,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8b7783b0e5a9b454db7fd811119f046e, type: 3} + m_Sprite: {fileID: 21300000, guid: 31f5a049028df4d4a8df7222be280a77, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2166,7 +2166,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2843,7 +2843,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: be4dab1f6c324984cb0659ce0cc2b7c7, type: 3} + m_Sprite: {fileID: 21300000, guid: b6575785a082f8543bd6d9aa7906155b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index f4c77462..2f2a20ab 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -453,7 +453,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &558600091 MonoBehaviour: @@ -474,9 +474,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1077,7 +1077,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -4, y: 20} - m_SizeDelta: {x: 196, y: 60} + m_SizeDelta: {x: 306, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1587966891 MonoBehaviour: @@ -1098,7 +1098,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e2831d465ad30b44a8c7c0dc17763b5a, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e16c84395ba5d84f9f4069bc908ab1d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1523,7 +1523,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 63} - m_SizeDelta: {x: 210, y: 110} + m_SizeDelta: {x: 230, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2088564207 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity index 4b8de082..65071365 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity @@ -317,9 +317,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u52D5\u753B\u304C\u8996\u8074\u3067\u304D\u306A\u3044\u72B6\u614B\u3067\u3059 - \u3057\u3070\u3089\u304F\u6642\u9593\u3092\u7F6E\u304F\u304B \u901A\u4FE1\u72B6\u614B\u3092\u78BA\u8A8D\u3057\u305F\u4E0A\u3067 - \u3082\u3046\u4E00\u5EA6 \u304A\u8A66\u3057\u304F\u3060\u3055\u3044" + m_Text: I can't watch the video. Please wait for a while or check the network status + and try again. --- !u!222 &466319072 CanvasRenderer: m_ObjectHideFlags: 0 @@ -642,7 +641,7 @@ RectTransform: 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: 64, y: 42} + m_SizeDelta: {x: 70, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1211618566 MonoBehaviour: @@ -663,9 +662,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 0c61577f..ca52c725 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -816,7 +816,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1555,7 +1555,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 84f89be4d9494764d8d3a01701bdc98a, type: 3} + m_Sprite: {fileID: 21300000, guid: abb6600531042114a9a2bb2d370f4663, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index 399f3d88..1ef1a589 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -3423,7 +3423,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7cf3290f89d6c3b4eaa04d0e5980591b, + objectReference: {fileID: 21300000, guid: 40629b0556657ca4685f32303b71f171, type: 3} - target: {fileID: 1458058295471017775, guid: b46e011db918bbe42a91795497f90b9c, type: 3} @@ -3589,13 +3589,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: fb63ee5957e15004eb27aaf367103806, + objectReference: {fileID: 21300000, guid: f238f145958172d428942802c02fc39c, type: 3} - target: {fileID: 7328251775215910467, guid: b46e011db918bbe42a91795497f90b9c, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b840fc03d9c919544b8d4beefd48696d, + objectReference: {fileID: 21300000, guid: 6cafaf4bcaf9b324d851fd727ce1185a, type: 3} - target: {fileID: 8309997995485196036, guid: b46e011db918bbe42a91795497f90b9c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab index 5fb8b68e..78e421e4 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/BackGround.prefab @@ -1,5 +1,223 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2207011874448038152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 378211063441888086} + - component: {fileID: 5703259336843222995} + m_Layer: 0 + m_Name: soil + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &378211063441888086 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2207011874448038152} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.71, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2243708896566117290} + - {fileID: 1328746015733650182} + - {fileID: 7824095950597301739} + - {fileID: 5343662222173737496} + - {fileID: 5794952391475179319} + - {fileID: 8954540207825004017} + - {fileID: 5375908070971412344} + - {fileID: 7967055159468717628} + - {fileID: 8116186933248962417} + - {fileID: 8423112502416727363} + - {fileID: 5994002974410987653} + - {fileID: 1730860864095076974} + - {fileID: 477987529167590894} + - {fileID: 2932318776076802331} + - {fileID: 5330756749785673320} + m_Father: {fileID: 835325393001496006} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5703259336843222995 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2207011874448038152} + 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: 3 + m_Sprite: {fileID: 21300000, guid: 2081be9cdca0565408f74cac50a734cc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 17.66, y: 0.18} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3087227909930956355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2243708896566117290} + - component: {fileID: 7335484460120177556} + m_Layer: 0 + m_Name: soil_fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2243708896566117290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3087227909930956355} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -3.408, z: 0} + m_LocalScale: {x: 16.66, y: 6.6, z: 1} + m_Children: [] + m_Father: {fileID: 378211063441888086} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7335484460120177556 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3087227909930956355} + 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: bb188fd763f57c0429accb1301e0f529, type: 3} + m_Color: {r: 0.6784314, g: 0.5058824, b: 0.24313726, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.06, y: 1.02} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4004039549266049552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3166655808870504592} + m_Layer: 0 + m_Name: grass + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3166655808870504592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004039549266049552} + 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: 114515115945883693} + - {fileID: 674548012455352473} + - {fileID: 5330143021005405392} + - {fileID: 7197892073387727698} + - {fileID: 4595159959828451044} + - {fileID: 1663453306280159366} + - {fileID: 7417386882039766195} + - {fileID: 7820646471895418682} + - {fileID: 1835249755041812076} + - {fileID: 5009590793352778188} + - {fileID: 6084509728114171849} + m_Father: {fileID: 835325393001496006} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5848867441450559626 GameObject: m_ObjectHideFlags: 0 @@ -167,7 +385,7 @@ SpriteRenderer: m_Size: {x: 17.66, y: 22.08039} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!114 &3590064911546481895 @@ -194,7 +412,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 835325393001496006} - - component: {fileID: 9103270782266049649} m_Layer: 0 m_Name: Ground m_TagString: Untagged @@ -212,60 +429,12 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -5.43, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 378211063441888086} + - {fileID: 3166655808870504592} m_Father: {fileID: 6693468020679260201} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &9103270782266049649 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6944257598449659502} - 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: 3 - m_Sprite: {fileID: 21300000, guid: 28f30b53baa7ad34781696a56498f9c6, 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: 4.04} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &8440537209289290077 GameObject: m_ObjectHideFlags: 0 @@ -429,6 +598,566 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &492902128668142226 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.29 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.77 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992926472195320264, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_Name + value: grass (1) + objectReference: {fileID: 0} + - target: {fileID: 6018427155669892813, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b331d3965714eb49916770293c22e99, type: 3} +--- !u!4 &674548012455352473 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + m_PrefabInstance: {fileID: 492902128668142226} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &789692925358480336 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.2199993 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.6600003 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7342627985248690804, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_Name + value: soil_c (3) + objectReference: {fileID: 0} + - target: {fileID: 8675171850117152559, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 483982dc55bd93e4f90c753c98202980, type: 3} +--- !u!4 &5330756749785673320 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + m_PrefabInstance: {fileID: 789692925358480336} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &825362783176334554 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4655153564520618466, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3199997 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.19 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876229046912503630, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_Name + value: soil_a (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d55a90701871c404a8eeb6e47f3c3783, type: 3} +--- !u!4 &5794952391475179319 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + m_PrefabInstance: {fileID: 825362783176334554} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &967089332952784494 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.5699997 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.4500003 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436097753294705563, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_Name + value: grass_b (5) + objectReference: {fileID: 0} + - target: {fileID: 6448392731900757369, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82615705745292a44b01b81daffb090e, type: 3} +--- !u!4 &6084509728114171849 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + m_PrefabInstance: {fileID: 967089332952784494} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1017124036855548454 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.x + value: -5.380001 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.7400002 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992926472195320264, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_Name + value: grass + objectReference: {fileID: 0} + - target: {fileID: 6018427155669892813, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b331d3965714eb49916770293c22e99, type: 3} +--- !u!4 &114515115945883693 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + m_PrefabInstance: {fileID: 1017124036855548454} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1240470194849522165 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4655153564520618466, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.42000008 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.5500002 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876229046912503630, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_Name + value: soil_a (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d55a90701871c404a8eeb6e47f3c3783, type: 3} +--- !u!4 &5343662222173737496 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + m_PrefabInstance: {fileID: 1240470194849522165} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2062344663087648875 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.x + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.50999975 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436097753294705563, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_Name + value: grass_b (4) + objectReference: {fileID: 0} + - target: {fileID: 6448392731900757369, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82615705745292a44b01b81daffb090e, type: 3} +--- !u!4 &5009590793352778188 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + m_PrefabInstance: {fileID: 2062344663087648875} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2328695415354834037 PrefabInstance: m_ObjectHideFlags: 0 @@ -515,6 +1244,86 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2328695415354834037} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2835969841032893980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4655153564520618466, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.08 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.04 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876229046912503630, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_Name + value: soil_a (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d55a90701871c404a8eeb6e47f3c3783, type: 3} +--- !u!4 &8954540207825004017 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + m_PrefabInstance: {fileID: 2835969841032893980} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3366069943570363836 PrefabInstance: m_ObjectHideFlags: 0 @@ -626,6 +1435,1046 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3366069943570363836} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3480741187864296687 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.x + value: -8.01 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.5499997 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992926472195320264, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_Name + value: grass (4) + objectReference: {fileID: 0} + - target: {fileID: 6018427155669892813, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b331d3965714eb49916770293c22e99, type: 3} +--- !u!4 &4595159959828451044 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + m_PrefabInstance: {fileID: 3480741187864296687} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3860652800033818269 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.26000023 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.94000006 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436097753294705563, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_Name + value: grass_b (2) + objectReference: {fileID: 0} + - target: {fileID: 6448392731900757369, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82615705745292a44b01b81daffb090e, type: 3} +--- !u!4 &7820646471895418682 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + m_PrefabInstance: {fileID: 3860652800033818269} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4002377061532210694 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4655153564520618466, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.7800007 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.9200001 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876229046912503630, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_Name + value: soil_a (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d55a90701871c404a8eeb6e47f3c3783, type: 3} +--- !u!4 &7824095950597301739 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + m_PrefabInstance: {fileID: 4002377061532210694} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4608473049853877524 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.7999992 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.4499998 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436097753294705563, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_Name + value: grass_b (1) + objectReference: {fileID: 0} + - target: {fileID: 6448392731900757369, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82615705745292a44b01b81daffb090e, type: 3} +--- !u!4 &7417386882039766195 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + m_PrefabInstance: {fileID: 4608473049853877524} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4639642399574642635 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.51 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.17999983 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436097753294705563, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_Name + value: grass_b (3) + objectReference: {fileID: 0} + - target: {fileID: 6448392731900757369, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82615705745292a44b01b81daffb090e, type: 3} +--- !u!4 &1835249755041812076 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + m_PrefabInstance: {fileID: 4639642399574642635} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5020684197279686742 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.5599995 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.42 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7342627985248690804, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_Name + value: soil_c (1) + objectReference: {fileID: 0} + - target: {fileID: 8675171850117152559, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 483982dc55bd93e4f90c753c98202980, type: 3} +--- !u!4 &477987529167590894 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + m_PrefabInstance: {fileID: 5020684197279686742} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5076439543248932571 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.37 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.2199998 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992926472195320264, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_Name + value: grass (2) + objectReference: {fileID: 0} + - target: {fileID: 6018427155669892813, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b331d3965714eb49916770293c22e99, type: 3} +--- !u!4 &5330143021005405392 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + m_PrefabInstance: {fileID: 5076439543248932571} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5291498790726213867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4655153564520618466, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.x + value: -6.7800007 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.0300002 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876229046912503630, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + propertyPath: m_Name + value: soil_a + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d55a90701871c404a8eeb6e47f3c3783, type: 3} +--- !u!4 &1328746015733650182 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6566117875694711789, guid: d55a90701871c404a8eeb6e47f3c3783, + type: 3} + m_PrefabInstance: {fileID: 5291498790726213867} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5471152980536370234 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.45 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.y + value: -3.0100002 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6676895612389472762, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8839286314483024466, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_Name + value: soil_b (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3211d3e995452429e2fa5f505325a6, type: 3} +--- !u!4 &8423112502416727363 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + m_PrefabInstance: {fileID: 5471152980536370234} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5624584942476863777 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.x + value: -7.1800003 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9499998 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436097753294705563, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_Name + value: grass_b + objectReference: {fileID: 0} + - target: {fileID: 6448392731900757369, guid: 82615705745292a44b01b81daffb090e, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82615705745292a44b01b81daffb090e, type: 3} +--- !u!4 &1663453306280159366 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6420813395034833319, guid: 82615705745292a44b01b81daffb090e, + type: 3} + m_PrefabInstance: {fileID: 5624584942476863777} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5740934590273115656 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.96 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.0900002 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6676895612389472762, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8839286314483024466, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_Name + value: soil_b (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3211d3e995452429e2fa5f505325a6, type: 3} +--- !u!4 &8116186933248962417 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + m_PrefabInstance: {fileID: 5740934590273115656} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5879786729167163205 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.8099995 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.25 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6676895612389472762, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8839286314483024466, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_Name + value: soil_b (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3211d3e995452429e2fa5f505325a6, type: 3} +--- !u!4 &7967055159468717628 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + m_PrefabInstance: {fileID: 5879786729167163205} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6560172648572090326 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.290001 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.63999987 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7342627985248690804, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_Name + value: soil_c + objectReference: {fileID: 0} + - target: {fileID: 8675171850117152559, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 483982dc55bd93e4f90c753c98202980, type: 3} +--- !u!4 &1730860864095076974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + m_PrefabInstance: {fileID: 6560172648572090326} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6871365500090186755 PrefabInstance: m_ObjectHideFlags: 0 @@ -651,7 +2500,7 @@ PrefabInstance: - target: {fileID: 3369490898853473183, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7298026551172620012, guid: 7fa52d20820d0f84a9218625917a643a, type: 3} @@ -817,3 +2666,323 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7747817936090880844} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7763813133807266979 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.6000004 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.94000006 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7342627985248690804, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_Name + value: soil_c (2) + objectReference: {fileID: 0} + - target: {fileID: 8675171850117152559, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 483982dc55bd93e4f90c753c98202980, type: 3} +--- !u!4 &2932318776076802331 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4832127711065159096, guid: 483982dc55bd93e4f90c753c98202980, + type: 3} + m_PrefabInstance: {fileID: 7763813133807266979} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7793304774751101436 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.9300003 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.y + value: -4.13 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6676895612389472762, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8839286314483024466, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_Name + value: soil_b (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3211d3e995452429e2fa5f505325a6, type: 3} +--- !u!4 &5994002974410987653 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + m_PrefabInstance: {fileID: 7793304774751101436} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7813559245843245401 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3166655808870504592} + m_Modifications: + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.3499999 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1992926472195320264, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_Name + value: grass (3) + objectReference: {fileID: 0} + - target: {fileID: 6018427155669892813, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + propertyPath: m_SortingOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b331d3965714eb49916770293c22e99, type: 3} +--- !u!4 &7197892073387727698 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1120087922907066891, guid: 9b331d3965714eb49916770293c22e99, + type: 3} + m_PrefabInstance: {fileID: 7813559245843245401} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8472000408379454977 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 378211063441888086} + m_Modifications: + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.x + value: -7.4400005 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.y + value: -3.04 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6676895612389472762, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8839286314483024466, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + propertyPath: m_Name + value: soil_b + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: be3211d3e995452429e2fa5f505325a6, type: 3} +--- !u!4 &5375908070971412344 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4542329462699850105, guid: be3211d3e995452429e2fa5f505325a6, + type: 3} + m_PrefabInstance: {fileID: 8472000408379454977} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab index 7e995195..8c32918b 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab @@ -507,7 +507,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 --- !u!114 &2607884839347368726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -586,6 +586,9 @@ MonoBehaviour: level1: {fileID: 775281020594132328} level2: {fileID: 7545235244005095164} level3: {fileID: 3741799588110921262} + level1Value: 9 + level2Value: 18 + level3Value: 27 hitEffectPrefab: {fileID: 3274305818614039910, guid: 1bc5e14a40e0b4e94a1ba39081ac8436, type: 3} --- !u!114 &3714690223456412398 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab index 5fb14cd8..f0d41651 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab @@ -660,7 +660,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: fb63ee5957e15004eb27aaf367103806, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab index d1a78378..6dcd2ac5 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Item.prefab @@ -5050,7 +5050,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 3 scalar: 0.6 - minScalar: 1 + minScalar: 0.8 maxCurve: serializedVersion: 2 m_Curve: @@ -5218,7 +5218,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 3 - scalar: 0.4 + scalar: 0.8 minScalar: 1 maxCurve: serializedVersion: 2 @@ -5974,16 +5974,7 @@ ParticleSystem: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 10.146134 - outSlope: 10.146134 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.27896324 - - serializedVersion: 3 - time: 0.15873218 - value: 1 + value: 0.76169205 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -5991,8 +5982,8 @@ ParticleSystem: inWeight: 1 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.45050073 - value: 0.11865729 + time: 0.37539697 + value: 0.21887702 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -6000,8 +5991,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.7466005 - value: 0.5424745 + time: 0.6873201 + value: 0.46674514 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -9897,7 +9888,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3823135948477190933 Transform: m_ObjectHideFlags: 0 @@ -24349,7 +24340,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 0.5 + scalar: 0.4 minScalar: 1 maxCurve: serializedVersion: 2 @@ -25291,8 +25282,8 @@ ParticleSystem: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6765078 - value: 0.71830297 + time: 0.6686037 + value: 0.55602574 inSlope: 0 outSlope: 0 tangentMode: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab index 887743f3..8bbfe9fc 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/ItemTree.prefab @@ -73,7 +73,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: d3beac48f387ec845b29c3414e664cc2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab index bb63178c..d38d53d0 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Obstacle 1x1.prefab @@ -74,7 +74,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 --- !u!1 &4498234376221693369 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab index 66ea9366..99e01f21 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab @@ -807,7 +807,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5ceb82572adc3b74a9435c69995d018a, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1439,7 +1439,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 40ee8a21444623d49811e0563b43b5ef, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1974,6 +1974,7 @@ GameObject: - component: {fileID: 2932450735406619850} - component: {fileID: 2324374880752575135} - component: {fileID: 3265577146508687536} + - component: {fileID: 7261199778610617677} m_Layer: 5 m_Name: title _score m_TagString: Untagged @@ -2037,6 +2038,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7261199778610617677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6546516869825252536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: minigame_result_score_title + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 168ce81ae00f94048adf95be606bf1fc, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 1 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &7003081708440578088 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index d11c9bae..87f5a864 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -1063,7 +1063,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: 86} - m_SizeDelta: {x: 108, y: 66} + m_SizeDelta: {x: 278, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813504388152430 CanvasRenderer: @@ -1092,9 +1092,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0d07c69efa3df24fac0843c9a1920d2, type: 3} + m_Sprite: {fileID: 21300000, guid: 27208e7cc90230c40bf97bb787a635d9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1709,7 +1709,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 789} - m_SizeDelta: {x: 414, y: 116} + m_SizeDelta: {x: 682, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505623332493 CanvasRenderer: @@ -1738,9 +1738,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9aa432443b00f546af3b0c4e5e1846b, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f008475ba648c747a53271ed92851dc, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1981,7 +1981,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: 86} - m_SizeDelta: {x: 108, y: 66} + m_SizeDelta: {x: 278, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505652122420 CanvasRenderer: @@ -2010,9 +2010,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 53455103b6864fd4093faca95dc52307, type: 3} + m_Sprite: {fileID: 21300000, guid: 2cbcf01a8ca007b40b50f05c76723fd7, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2252,7 +2252,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: 86} - m_SizeDelta: {x: 108, y: 66} + m_SizeDelta: {x: 278, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505704525542 CanvasRenderer: @@ -2281,9 +2281,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 030af2bbe28d3b24e94162845a2243bc, type: 3} + m_Sprite: {fileID: 21300000, guid: b3cb6e69de972544b98cbb4007ec1359, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2782,6 +2782,11 @@ PrefabInstance: propertyPath: m_Name value: detail_NotReleased objectReference: {fileID: 0} + - target: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} --- !u!1 &5937334820095103990 stripped @@ -2963,6 +2968,42 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4559813504355184347} m_Modifications: + - target: {fileID: 1892712672056555269, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, + type: 3} + - target: {fileID: 2407377532650141408, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6e3b952e60a778c4497e7d9809d64788, + type: 3} + - target: {fileID: 3310671340499624764, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, + type: 3} + - target: {fileID: 3310671340824885726, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, + type: 3} + - target: {fileID: 3310671340978879439, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, + type: 3} + - target: {fileID: 3310671341497605163, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + type: 3} - target: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass.prefab new file mode 100644 index 00000000..06867042 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1992926472195320264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120087922907066891} + - component: {fileID: 6018427155669892813} + m_Layer: 0 + m_Name: grass + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1120087922907066891 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992926472195320264} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.38, y: 2.74, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6018427155669892813 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992926472195320264} + 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: 4 + m_Sprite: {fileID: 21300000, guid: 9c97716a67f28004d9f3a4583e164630, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.72, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass.prefab.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass.prefab.meta new file mode 100644 index 00000000..aa6e1828 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9b331d3965714eb49916770293c22e99 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass_b.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass_b.prefab new file mode 100644 index 00000000..a32c45cd --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass_b.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6436097753294705563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6420813395034833319} + - component: {fileID: 6448392731900757369} + m_Layer: 0 + m_Name: grass_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6420813395034833319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6436097753294705563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.18, y: 0.95, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6448392731900757369 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6436097753294705563} + 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: 4 + m_Sprite: {fileID: 21300000, guid: ed6394d582c755c4ca65e638a5a81061, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.54, y: 0.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass_b.prefab.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass_b.prefab.meta new file mode 100644 index 00000000..adcd12a3 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/grass_b.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82615705745292a44b01b81daffb090e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_c.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_c.prefab index c4d4856c..130e3de2 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_c.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_c.prefab @@ -496,17 +496,17 @@ PrefabInstance: - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.a - value: 0.6313726 + value: 1 objectReference: {fileID: 0} - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.740566 + value: 0.7294118 objectReference: {fileID: 0} - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.74544626 + value: 0.7372549 objectReference: {fileID: 0} - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -516,12 +516,12 @@ PrefabInstance: - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.514151 + value: 0.6084906 objectReference: {fileID: 0} - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.5703958 + value: 0.6532345 objectReference: {fileID: 0} - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -546,17 +546,17 @@ PrefabInstance: - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.a - value: 0.6313726 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.740566 + value: 0.7294118 objectReference: {fileID: 0} - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.74544626 + value: 0.7372549 objectReference: {fileID: 0} - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -566,17 +566,17 @@ PrefabInstance: - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.a - value: 0.6313726 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.740566 + value: 0.7294118 objectReference: {fileID: 0} - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.74544626 + value: 0.7372549 objectReference: {fileID: 0} - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -596,12 +596,12 @@ PrefabInstance: - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.514151 + value: 0.5801887 objectReference: {fileID: 0} - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.54549605 + value: 0.631675 objectReference: {fileID: 0} - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -611,17 +611,17 @@ PrefabInstance: - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.a - value: 0.6313726 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.740566 + value: 0.7294118 objectReference: {fileID: 0} - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.74544626 + value: 0.7372549 objectReference: {fileID: 0} - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -646,17 +646,17 @@ PrefabInstance: - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.a - value: 0.6313726 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.740566 + value: 0.7294118 objectReference: {fileID: 0} - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.74544626 + value: 0.7372549 objectReference: {fileID: 0} - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -726,12 +726,12 @@ PrefabInstance: - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.5424528 + value: 0.6462264 objectReference: {fileID: 0} - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.60893404 + value: 0.6880706 objectReference: {fileID: 0} - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f, type: 3} @@ -741,12 +741,12 @@ PrefabInstance: - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.b - value: 0.5613208 + value: 0.6745283 objectReference: {fileID: 0} - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} propertyPath: m_Color.g - value: 0.64331686 + value: 0.70962816 objectReference: {fileID: 0} - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_a.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_a.prefab new file mode 100644 index 00000000..89da7d35 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_a.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8876229046912503630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6566117875694711789} + - component: {fileID: 4655153564520618466} + m_Layer: 0 + m_Name: soil_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6566117875694711789 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8876229046912503630} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.78, y: 1.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4655153564520618466 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8876229046912503630} + 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: 4 + m_Sprite: {fileID: 21300000, guid: 7fa351551286dc148a3023f5bba7971b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.78, y: 0.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_a.prefab.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_a.prefab.meta new file mode 100644 index 00000000..0eb53359 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_a.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d55a90701871c404a8eeb6e47f3c3783 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_b.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_b.prefab new file mode 100644 index 00000000..e65b3121 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_b.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8839286314483024466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4542329462699850105} + - component: {fileID: 6676895612389472762} + m_Layer: 0 + m_Name: soil_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4542329462699850105 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839286314483024466} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6676895612389472762 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8839286314483024466} + 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: 4 + m_Sprite: {fileID: 21300000, guid: cb1597f3767b9d3419f8916185898ea3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.62, y: 0.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_b.prefab.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_b.prefab.meta new file mode 100644 index 00000000..1ba79239 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_b.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: be3211d3e995452429e2fa5f505325a6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_c.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_c.prefab new file mode 100644 index 00000000..7ab282ec --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_c.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7342627985248690804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4832127711065159096} + - component: {fileID: 8675171850117152559} + m_Layer: 0 + m_Name: soil_c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4832127711065159096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7342627985248690804} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.29, y: 2.07, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8675171850117152559 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7342627985248690804} + 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: 4 + m_Sprite: {fileID: 21300000, guid: 9fbde169ada49434e95cf5ef93dbdc02, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.28, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_c.prefab.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_c.prefab.meta new file mode 100644 index 00000000..598afe05 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/soil_c.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 483982dc55bd93e4f90c753c98202980 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity b/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity index 4990bec1..f3f24c56 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity @@ -218,7 +218,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -591,7 +591,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5500af79403541b428db2d5561263df8, type: 3} + m_Sprite: {fileID: 21300000, guid: 7f9708db240270d4fb39959ada4d959d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index f359eef1..bddf3a37 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -678,7 +678,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eaaaaeacf4c8f9c43ba5fac7c4d59052, type: 3} + m_Sprite: {fileID: 21300000, guid: 374760d4400fdb7499407a91c0861cf8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2001,7 +2001,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa09137f214f7ca449bc8ffc04b7be42, type: 3} + m_Sprite: {fileID: 21300000, guid: 3c84112a54b2bef4081e716c2cdee58d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2240,7 +2240,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f8446b686246b984b86db9af4530eae4, type: 3} + m_Sprite: {fileID: 21300000, guid: 791818e298ddfa4409cacae99c6b4efd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2504,7 +2504,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: -14} - m_SizeDelta: {x: 250, y: 108} + m_SizeDelta: {x: 300, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1344990811 MonoBehaviour: @@ -3259,7 +3259,7 @@ RectTransform: 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: 122, y: 42} + m_SizeDelta: {x: 200, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1794914335 MonoBehaviour: @@ -3320,7 +3320,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9b54a1859059a854eb41c4abe1bde7a3, type: 3} + m_Sprite: {fileID: 21300000, guid: f741dc3c53e723947a77164154a746f5, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3523,7 +3523,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1894598663 MonoBehaviour: @@ -3544,7 +3544,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity index 9323c9fe..6c9f7f0e 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity @@ -265,7 +265,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 179} - m_SizeDelta: {x: 232, y: 50} + m_SizeDelta: {x: 270, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153656216 MonoBehaviour: @@ -286,7 +286,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a1d3115a8e6c0d54eb4d6668c15fffd5, type: 3} + m_Sprite: {fileID: 21300000, guid: 60fe4adf2d46cef4a94749bae8d9da66, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -379,7 +379,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_SizeDelta: {x: 670, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &191065716 MonoBehaviour: @@ -453,7 +453,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_SizeDelta: {x: 670, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &202732245 MonoBehaviour: @@ -527,7 +527,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 232} - m_SizeDelta: {x: 770, y: 18} + m_SizeDelta: {x: 878, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &274133162 MonoBehaviour: @@ -601,7 +601,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -115.000015, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &293486475 @@ -663,7 +663,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -675,7 +675,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u552E\u4EF7\u5956\u52B1" + m_Text: Selling price bonus --- !u!222 &293486477 CanvasRenderer: m_ObjectHideFlags: 0 @@ -720,7 +720,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: 241, y: 1} + m_AnchoredPosition: {x: 293, y: 1} m_SizeDelta: {x: 250, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &335814639 @@ -967,7 +967,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_SizeDelta: {x: 670, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &441103411 MonoBehaviour: @@ -1079,7 +1079,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: 820, y: 900} + m_SizeDelta: {x: 930, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &447077185 MonoBehaviour: @@ -1154,7 +1154,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &452869259 MonoBehaviour: @@ -1215,7 +1215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1268,7 +1268,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_SizeDelta: {x: 670, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &477688598 MonoBehaviour: @@ -1622,7 +1622,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: 216, y: 1} + m_AnchoredPosition: {x: 268.00003, y: 1} m_SizeDelta: {x: 300, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &985063426 @@ -1697,7 +1697,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -115.000015, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1048417435 @@ -1759,7 +1759,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1771,7 +1771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5BA3\u4F20\u6548\u679C\u589E\u52A0" + m_Text: Increased advertising effectiveness --- !u!222 &1048417437 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2046,7 +2046,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: 216.00003, y: 1} + m_AnchoredPosition: {x: 268.00006, y: 1} m_SizeDelta: {x: 300, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170931952 @@ -2121,7 +2121,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -115, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1181495074 @@ -2183,7 +2183,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2195,7 +2195,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5916\u89C2\u7B49\u7EA7" + m_Text: Appearance level --- !u!222 &1181495076 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2239,7 +2239,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -115.000015, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1185689757 @@ -2301,7 +2301,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2313,7 +2313,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" + m_Text: Until the next level up --- !u!222 &1185689759 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2533,7 +2533,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: -60, y: -0.00007247925} + m_AnchoredPosition: {x: -115.000015, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1367586356 @@ -2595,7 +2595,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2607,7 +2607,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u83B7\u5BA2\u91CF\u589E\u52A0" + m_Text: Increase the number of customers --- !u!222 &1367586358 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2652,7 +2652,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: 241, y: 1} + m_AnchoredPosition: {x: 293, y: 1} m_SizeDelta: {x: 250, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1410287718 @@ -2959,7 +2959,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 61} - m_SizeDelta: {x: 770, y: 620} + m_SizeDelta: {x: 880, y: 620} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1600908638 MonoBehaviour: @@ -3033,7 +3033,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -89, y: -30.000103} - m_SizeDelta: {x: 550, y: 6} + m_SizeDelta: {x: 670, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1758534904 MonoBehaviour: @@ -3505,7 +3505,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: 241.00003, y: 1} + m_AnchoredPosition: {x: 293.00003, y: 1} m_SizeDelta: {x: 250, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2084788273 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity index 4d1dbc51..93b64d00 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity @@ -562,7 +562,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1818491038 MonoBehaviour: @@ -623,9 +623,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -846,7 +846,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1231003470895153764 MonoBehaviour: @@ -966,9 +966,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} + m_Sprite: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1697,9 +1697,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, type: 3} + m_Sprite: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1724,7 +1724,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7029507892793546887 CanvasRenderer: @@ -1976,7 +1976,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 @@ -2176,7 +2176,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -2411,7 +2411,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 784cc1290199742a58c39bcc5b1a13ba, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b791b29becec62468fa706ff3a6749a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index ef600cea..674bee2f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -363,7 +363,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0e085521ac2669a4da2d38a4d8482a9e, type: 3} + m_Sprite: {fileID: 21300000, guid: 75e05b805ed6a0d49bd58266cfabf3b5, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -434,19 +434,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} ---- !u!114 &169151089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 227427382} --- !u!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -458,13 +445,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -853,6 +840,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 319475418} m_CullTransparentMesh: 0 +--- !u!114 &321930778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1428988152} --- !u!1001 &336991181 PrefabInstance: m_ObjectHideFlags: 0 @@ -864,13 +864,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1434,19 +1434,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 ---- !u!114 &439996222 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1428988152} --- !u!114 &501846075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1844,6 +1831,19 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 551709010} m_PrefabAsset: {fileID: 0} +--- !u!114 &594274667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 293313977} --- !u!1 &601118649 GameObject: m_ObjectHideFlags: 0 @@ -2130,7 +2130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c13b73b8589caa249a6334a765df4f42, type: 3} + m_Sprite: {fileID: 21300000, guid: d65b58b99312eed418f41ce9c8a5c3e9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2345,7 +2345,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 118, y: 64} + m_SizeDelta: {x: 160, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &695678468 MonoBehaviour: @@ -2366,7 +2366,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5287c7947a30b6d4fbf8a716591cc8ce, type: 3} + m_Sprite: {fileID: 21300000, guid: 3d3b5cd8c4cd56a45be86e76fc6b4eba, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2424,6 +2424,19 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 1680478608} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &748422669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 227427383} --- !u!114 &776291670 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2448,13 +2461,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2635,6 +2648,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 675} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &830106448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 336991182} --- !u!114 &838116263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2984,19 +3010,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915074762} m_CullTransparentMesh: 0 ---- !u!114 &925236225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 227427383} --- !u!1 &930271088 GameObject: m_ObjectHideFlags: 0 @@ -3243,7 +3256,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e54a13649abe3440a66d8b6f25f269d, type: 3} + m_Sprite: {fileID: 21300000, guid: 091482721da1dda4ea0e1652593ac76e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3468,6 +3481,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 959868501} m_CullTransparentMesh: 0 +--- !u!114 &1006321928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1428988153} --- !u!1 &1028508433 GameObject: m_ObjectHideFlags: 0 @@ -3717,7 +3743,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 059d3d7aa066a1343a402a26a86f3ac9, type: 3} + m_Sprite: {fileID: 21300000, guid: 9af10152ad2725e4a864d3161d04beac, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3775,7 +3801,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &1088469016 +--- !u!114 &1153839208 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3787,8 +3813,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 336991182} ---- !u!114 &1229003745 + mTarget: {fileID: 811473977} +--- !u!114 &1204000792 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3800,7 +3826,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 811473978} + mTarget: {fileID: 336991183} --- !u!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -3937,6 +3963,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276255578} m_CullTransparentMesh: 0 +--- !u!114 &1341213210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 227427382} --- !u!1001 &1368329045 PrefabInstance: m_ObjectHideFlags: 0 @@ -4041,13 +4080,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6e634d5b49eb5c74ab8cf49853e31d02, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ea5f155c3ba47104f8aa84b59f318924, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4269,19 +4308,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1028508436} ---- !u!114 &1586132743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 811473977} --- !u!1 &1592747031 GameObject: m_ObjectHideFlags: 0 @@ -4478,7 +4504,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 70e8d2c2ed46bdc46a0831e6f5543ff5, type: 3} + m_Sprite: {fileID: 21300000, guid: a0ed564d06bcade45aca7a3fa98d604a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4776,38 +4802,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1771898120 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 293313977} --- !u!4 &1826383572 stripped Transform: m_CorrespondingSourceObject: {fileID: 5209415119062664250, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} m_PrefabInstance: {fileID: 6725113439449511083} m_PrefabAsset: {fileID: 0} ---- !u!114 &1832418371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 336991183} --- !u!114 &1861500674 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4895,6 +4895,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895333847} m_CullTransparentMesh: 0 +--- !u!114 &1970854444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 811473978} --- !u!114 &2014261845 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5193,19 +5206,6 @@ MonoBehaviour: scrollRect: {fileID: 2083561337} verticalSlider: {fileID: 429811578} direction: 0 ---- !u!114 &2090955682 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1428988153} --- !u!1 &1135563714249534642 GameObject: m_ObjectHideFlags: 0 @@ -5385,7 +5385,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b26c0957338ba9d47a7ac4f83c3f4cfb, type: 3} + m_Sprite: {fileID: 21300000, guid: 693b96dd70896f94e8dc10f672d95dfe, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5416,7 +5416,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: edd70ddee1c13db4daab79460d608f70, + objectReference: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3} - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity index 2b8330a2..f9d1d3f2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity @@ -178,7 +178,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 879cff1e1acde304582285dbe37d6869, type: 3} + m_Sprite: {fileID: 21300000, guid: c6689bcf32023ee4e8eccc786b0d615b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -669,7 +669,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, type: 3} + m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -904,7 +904,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -8} - m_SizeDelta: {x: 530, y: 82} + m_SizeDelta: {x: 580, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1687945084 MonoBehaviour: @@ -925,7 +925,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c5f6ed2647d5a24b98c16d190ec265b, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e43fecf5be6a604baf871877445d4a4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index cdc0a54b..0b3e975c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -128,11 +128,161 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3084478268397759140, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327423357121430, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424009996303, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424014868448, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3613327424185171990, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3856012875109116650, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 6fd9544d3d90fa14997c0ac7ab65549c, + objectReference: {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, type: 3} - target: {fileID: 3856012875358022744, guid: 6592613d31e034734bea16833d6345c1, type: 3} @@ -248,7 +398,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, + objectReference: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6592613d31e034734bea16833d6345c1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab index 588234f5..520d4785 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Conversation/Canvas.prefab @@ -169,7 +169,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40eb244aa806bdb4b81c1a81fa51811c, type: 3} + m_Sprite: {fileID: 21300000, guid: bad8c1ad7d7a7fd43a3a8c0c85988dba, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -535,7 +535,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 443815280ba7b6a4283b74716f6e1438, type: 3} + m_Sprite: {fileID: 21300000, guid: 6b2cfbea393cef842aa106de7b7bc476, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab index 945ed8c5..4fc0d938 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Customize_Frame.prefab @@ -296,7 +296,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7a4d379c23667994f85cfeaacc039afc, type: 3} + m_Sprite: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -598,7 +598,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7985beda2da84b944b94cd87b141c898, type: 3} + m_Sprite: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index e326eedd..00561634 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -784,7 +784,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -255, y: 79.89997} - m_SizeDelta: {x: 120, y: 48} + m_SizeDelta: {x: 190, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875109116653 CanvasRenderer: @@ -813,7 +813,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6fd9544d3d90fa14997c0ac7ab65549c, type: 3} + m_Sprite: {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1041,7 +1041,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 @@ -1490,7 +1490,7 @@ RectTransform: 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: 88, y: 36} + m_SizeDelta: {x: 104, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875620007259 CanvasRenderer: @@ -1519,7 +1519,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, type: 3} + m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1635,7 +1635,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 0 @@ -1753,7 +1753,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -1871,7 +1871,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 @@ -2741,7 +2741,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2909,7 +2909,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3102,7 +3102,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3280,7 +3280,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3483,7 +3483,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index b75ef3c9..10487972 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -141,7 +141,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -153,7 +153,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.25 - m_Text: "\u53EF\u4EE5\u77ED\u65F6\u95F4\u5185\u589E\u957F\u5BA2\u6D41\u91CF" + m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\n\u304A\u5BA2\u3055\u3093\u304C\u5C11\u3057\u5897\u3048\u308B\u3088" --- !u!114 &1424299160027476878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -563,7 +563,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 172, y: 92} + m_SizeDelta: {x: 208, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7492023257525246333 CanvasRenderer: @@ -592,7 +592,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, type: 3} + m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -707,7 +707,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 31e6fb14761094676b211436f927ef92, type: 3} + m_Sprite: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1551,7 +1551,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 74.99997} - m_SizeDelta: {x: 358, y: 104} + m_SizeDelta: {x: 510, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5161980301888140780 CanvasRenderer: @@ -1580,9 +1580,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7929c6099b8cb411fb44a6a77ac9834f, type: 3} + m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1740,7 +1740,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 172, y: 92} + m_SizeDelta: {x: 208, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1104163593313499312 CanvasRenderer: @@ -1769,7 +1769,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b0ae48eaf05548bba4c2a399ca6ad0c, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e87dbf8c9dca34884b8267401b0a2a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2025,7 +2025,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2705466136985562315, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2036,7 +2036,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2705466137083800160, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2047,7 +2047,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2705466137392089852, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2578,13 +2578,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d7f796290286648b5bdf49d4c045a190, + objectReference: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} - target: {fileID: 6124127957932188848, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, + objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2605,13 +2605,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ce334bd62eba64a7bb4961f3b939b109, + objectReference: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, type: 3} - target: {fileID: 6124127958415964740, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6124127958617077932, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2623,7 +2623,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, + objectReference: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} - target: {fileID: 6134734927453340133, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index ba413df9..3ffe379f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -330,7 +330,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ba2136be20e049f46a0d5d2b8da36b2d, type: 3} + m_Sprite: {fileID: 21300000, guid: b44836fda8a89fe43a2b49d4476720e5, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -860,7 +860,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 06a06fac70c152c48aca453cff4f2750, type: 3} + m_Sprite: {fileID: 21300000, guid: 6b6efef2cf83267428f7d8999e15c2a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -976,7 +976,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -1130,7 +1130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d5a0fe50a4b721f4981476bf8057c20a, type: 3} + m_Sprite: {fileID: 21300000, guid: 6b4a74b8fd5d2014d8ec65b1a5409968, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -11265,7 +11265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8769d7124306d04ba4ec1b1f4f44c66, type: 3} + m_Sprite: {fileID: 21300000, guid: 972da0c5fe38e1342b310c2c0135e7e2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11381,7 +11381,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -11469,7 +11469,7 @@ RectTransform: 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: 64, y: 42} + m_SizeDelta: {x: 70, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8660695105894842742 CanvasRenderer: @@ -11498,7 +11498,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 19c780e3..cb04216a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -324,7 +324,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6124127957328696056 RectTransform: m_ObjectHideFlags: 0 @@ -625,7 +625,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d57063cf737a5c44d8ea58a4bc72edec, type: 3} + m_Sprite: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -711,7 +711,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 440} - m_SizeDelta: {x: 564, y: 62} + m_SizeDelta: {x: 740, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957932188849 CanvasRenderer: @@ -740,7 +740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8569c0f8839941642b7637c9440ce2b1, type: 3} + m_Sprite: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -855,7 +855,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f805024c7d7237d4c96bcb63f0396b12, type: 3} + m_Sprite: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1656,7 +1656,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f65affcfe9a325a4dbad7edc91dfe083, type: 3} + m_Sprite: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2037,7 +2037,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} @@ -2472,7 +2472,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} @@ -3052,7 +3052,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} @@ -3487,7 +3487,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index bd10b016..fd640ccd 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -192,7 +192,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -204,9 +204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - m_Text: "\uD0F1\uD06C \uC548\uC758 \uD31D\uCF58\uC744 \uAE08\uBC29 \uBE44\uC6B8 - \uC218 \uC788\uC5B4\uC694.\n\uCF54\uC778\uC774\uB098 \uD558\uD2B8\uB294 \uBC1B\uC744 - \uC218 \uC5C6\uC5B4\uC694\"" + m_Text: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" --- !u!114 &7887033067418340973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -566,7 +564,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -73} - m_SizeDelta: {x: 604, y: 54} + m_SizeDelta: {x: 774, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5089467466529880990 CanvasRenderer: @@ -595,7 +593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ddf1854932c89294e88c52778a24b793, type: 3} + m_Sprite: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1238,7 +1236,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5089467467555811494 CanvasRenderer: @@ -1267,7 +1265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1825,7 +1823,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -1913,7 +1911,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 7} - m_SizeDelta: {x: 172, y: 92} + m_SizeDelta: {x: 208, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5089467468128331484 CanvasRenderer: @@ -1942,7 +1940,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9f0a40802a4be0e4885581f13627c3c2, type: 3} + m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 47bbed24..c9cd8b2d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -219,7 +219,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -360,13 +360,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -517,7 +517,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -558,7 +558,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -663,6 +663,44 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &313910592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 429638430} +--- !u!114 &357254126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1446845735} +--- !u!114 &429638430 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -1181,6 +1219,31 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 +--- !u!114 &1005979436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1760930532} +--- !u!114 &1139655502 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1329,6 +1392,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405932574} m_CullTransparentMesh: 0 +--- !u!114 &1446845735 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1495750392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1513025054} +--- !u!114 &1513025054 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1539992273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1139655502} +--- !u!114 &1760930532 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1623,7 +1748,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, + objectReference: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, type: 3} - target: {fileID: 2118578838188127427, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -1860,13 +1985,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3b0ae48eaf05548bba4c2a399ca6ad0c, + objectReference: {fileID: 21300000, guid: 6061bfd9050f0cb45ae2048806344bc9, type: 3} - target: {fileID: 4560236508152718986, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7929c6099b8cb411fb44a6a77ac9834f, + objectReference: {fileID: 21300000, guid: 24a163350f08e6d4882db9553b6b61be, type: 3} - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -1932,7 +2057,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 31e6fb14761094676b211436f927ef92, + objectReference: {fileID: 21300000, guid: 1c7e8cdb0de6a264f97b8293ae966aaa, type: 3} - target: {fileID: 6040599672751541160, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2017,13 +2142,13 @@ PrefabInstance: - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Text - value: "\u53EF\u4EE5\u77ED\u65F6\u95F4\u5185\u589E\u957F\u5BA2\u6D41\u91CF" + value: 'Buy for a while the number of customers will increase a little. ' objectReference: {fileID: 0} - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 7786810388559140403, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2069,19 +2194,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d7f796290286648b5bdf49d4c045a190, + objectReference: {fileID: 21300000, guid: 9a303fa5c88e7514899e198b7ab9f3c7, type: 3} - target: {fileID: 8826965070428866943, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, + objectReference: {fileID: 21300000, guid: 453f23d8b60e90c49ba4ee8dce2ed6a4, type: 3} - target: {fileID: 8826965070472475005, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ce334bd62eba64a7bb4961f3b939b109, + objectReference: {fileID: 21300000, guid: ce6b0855c1bd2444b978789370886494, type: 3} - target: {fileID: 8826965070724525141, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity index f9e05876..6cd01b70 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity @@ -207,19 +207,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ba2136be20e049f46a0d5d2b8da36b2d, + objectReference: {fileID: 21300000, guid: b44836fda8a89fe43a2b49d4476720e5, type: 3} - target: {fileID: 8660695104521205934, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 06a06fac70c152c48aca453cff4f2750, + objectReference: {fileID: 21300000, guid: 6b6efef2cf83267428f7d8999e15c2a0, type: 3} - target: {fileID: 8660695104846840910, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d5a0fe50a4b721f4981476bf8057c20a, + objectReference: {fileID: 21300000, guid: 6b4a74b8fd5d2014d8ec65b1a5409968, type: 3} - target: {fileID: 8660695104952201896, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} @@ -380,13 +380,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c8769d7124306d04ba4ec1b1f4f44c66, + objectReference: {fileID: 21300000, guid: 972da0c5fe38e1342b310c2c0135e7e2, type: 3} - target: {fileID: 8660695105894842743, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, + objectReference: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity index 2145aa79..42f05333 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity @@ -236,15 +236,13 @@ PrefabInstance: - target: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} propertyPath: m_Text - value: "\uD0F1\uD06C \uC548\uC758 \uD31D\uCF58\uC744 \uAE08\uBC29 \uBE44\uC6B8 - \uC218 \uC788\uC5B4\uC694.\n\uCF54\uC778\uC774\uB098 \uD558\uD2B8\uB294 \uBC1B\uC744 - \uC218 \uC5C6\uC5B4\uC694\"" + value: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" objectReference: {fileID: 0} - target: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 5089467466492122905, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -270,7 +268,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ddf1854932c89294e88c52778a24b793, + objectReference: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} - target: {fileID: 5089467466543878408, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -386,7 +384,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 5089467467567286955, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -417,7 +415,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9f0a40802a4be0e4885581f13627c3c2, + objectReference: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 87cdd0e3..67e6a8ac 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1513,6 +1513,7 @@ MonoBehaviour: popcornImage: {fileID: 53013342} maxPosision: 0.44 minPosision: -1.75 + textObject: {fileID: 0} --- !u!1 &438809665 GameObject: m_ObjectHideFlags: 0 @@ -12515,6 +12516,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, + type: 3} - target: {fileID: 3201651210435991723, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: mLocalizeTarget @@ -12593,6 +12600,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} +--- !u!212 &1685069511 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + m_PrefabInstance: {fileID: 1685069510} + m_PrefabAsset: {fileID: 0} --- !u!114 &1685069515 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -13318,6 +13331,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1852761908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1685069511} --- !u!1 &1853804041 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 9ff56eb1..f60eb7f9 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -497,7 +497,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 753bdf739fc2679418f8064422e3c449, type: 3} + m_Sprite: {fileID: 21300000, guid: edd6f2b9154125d41a7f5e9177e2aa47, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -787,7 +787,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cfb90a2d77f52f8449f001ae3c506486, type: 3} + m_Sprite: {fileID: 21300000, guid: b5492bd078fe6614098c7216380c6559, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1242,7 +1242,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -1359,9 +1359,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f2ec7d503bc828a42b5ddc28c3eaaa48, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b791b29becec62468fa706ff3a6749a, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1903,7 +1903,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 33 m_FontStyle: 1 m_BestFit: 1 @@ -2292,7 +2292,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -2410,7 +2410,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -3561,7 +3561,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 28 m_FontStyle: 1 m_BestFit: 0 @@ -3573,7 +3573,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uD544\uC694\uD55C \uC7AC\uB8CC" + m_Text: Required materials --- !u!222 &1649038409 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4057,7 +4057,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 27 m_FontStyle: 0 m_BestFit: 1 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 9b899c2e..60f8519e 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &5984284 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1771084673} --- !u!1 &25421134 GameObject: m_ObjectHideFlags: 0 @@ -444,7 +431,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2e49fdaafc2cfe945bdf05d4acdc97f3, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1015,6 +1002,7 @@ MonoBehaviour: m_EditorClassIdentifier: scrollRect: {fileID: 203585999} verticalSlider: {fileID: 409545283} + direction: 2 --- !u!1001 &275912788 PrefabInstance: m_ObjectHideFlags: 0 @@ -1164,6 +1152,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277152052} m_CullTransparentMesh: 0 +--- !u!114 &316421036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 425834634} --- !u!1 &329292689 GameObject: m_ObjectHideFlags: 0 @@ -1220,6 +1221,19 @@ MonoBehaviour: recipePrefab: {fileID: 5490177795204899762, guid: 2beb2d436ad55734186e797d315796b3, type: 3} closeButton: {fileID: 968322477} +--- !u!114 &356824047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1771084673} --- !u!224 &384598190 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -1895,7 +1909,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &665613675 +--- !u!114 &646032228 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2618,6 +2632,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1097143862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1771084672} --- !u!1001 &1193300603 PrefabInstance: m_ObjectHideFlags: 0 @@ -2872,7 +2899,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &1308614124 +--- !u!114 &1278183662 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2885,6 +2912,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 759959154} +--- !u!114 &1316997427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1568730408} --- !u!224 &1396650753 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -3509,19 +3549,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &1516297109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 425834634} --- !u!1 &1554563048 GameObject: m_ObjectHideFlags: 0 @@ -3558,7 +3585,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 36, y: -111} - m_SizeDelta: {x: 258, y: 60} + m_SizeDelta: {x: 406, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 MonoBehaviour: @@ -3579,7 +3606,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 00ac67079ddcd3542a186a9d39555eca, type: 3} + m_Sprite: {fileID: 21300000, guid: c8bd01d6018fc2b439a187ad82fc1c13, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4731,19 +4758,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1773113836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1771084672} --- !u!1001 &1831059052 PrefabInstance: m_ObjectHideFlags: 0 @@ -5270,19 +5284,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 136044098} m_PrefabAsset: {fileID: 0} ---- !u!114 &1983304606 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1568730408} --- !u!114 &2062501365 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity index 5f931709..b8c22c00 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity @@ -272,9 +272,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -917,7 +917,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05c5b7e900206b442b94d0e96066685d, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e01022a23f5aff47bec762186207368, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 586abe6c..96831c99 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 94, y: 40} + m_SizeDelta: {x: 136, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2827439657377708488 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 40947599d2383e249980484ff9c2abba, type: 3} + m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -187,7 +187,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: 120, y: 54} + m_SizeDelta: {x: 150, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &13677528175845750 CanvasRenderer: @@ -216,7 +216,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -540,7 +540,7 @@ RectTransform: m_GameObject: {fileID: 1735230268650569057} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 8536603424566114135} m_RootOrder: 1 @@ -548,7 +548,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: 120, y: 40} + m_SizeDelta: {x: 150, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &124664622128715699 CanvasRenderer: @@ -663,7 +663,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: 186, y: 104} + m_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7532558663698524988 CanvasRenderer: @@ -961,7 +961,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: 198, y: 104} + m_SizeDelta: {x: 216, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6007316325440438180 CanvasRenderer: @@ -1036,7 +1036,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8366295190681868724 CanvasRenderer: @@ -1065,7 +1065,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, type: 3} + m_Sprite: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1327,7 +1327,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -1339,7 +1339,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + m_Text: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" --- !u!114 &1285946725444220175 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1398,7 +1398,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8536603422629144348 RectTransform: m_ObjectHideFlags: 0 @@ -1417,7 +1417,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: 186, y: 104} + m_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603422629144345 CanvasRenderer: @@ -2186,7 +2186,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424202476246 CanvasRenderer: @@ -2215,7 +2215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, type: 3} + m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2331,7 +2331,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -2400,7 +2400,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8536603424418812069 RectTransform: m_ObjectHideFlags: 0 @@ -2419,7 +2419,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: 186, y: 104} + m_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424418812067 CanvasRenderer: @@ -2572,7 +2572,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: 120, y: 40} + m_SizeDelta: {x: 150, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424476639143 CanvasRenderer: @@ -2688,7 +2688,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: 198, y: 104} + m_SizeDelta: {x: 216, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424566114133 CanvasRenderer: @@ -2837,7 +2837,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2, y: 3} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424714656548 CanvasRenderer: @@ -2866,7 +2866,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, type: 3} + m_Sprite: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2954,7 +2954,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: 186, y: 104} + m_SizeDelta: {x: 200, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7606945559751820238 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index bb9adc6e..b1ec7eb0 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -394,7 +394,7 @@ RectTransform: 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: 126, y: 52} + m_SizeDelta: {x: 140, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368104864264 CanvasRenderer: @@ -423,7 +423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0555bf055ff0da4982434fd6e71441d, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -575,7 +575,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 1 @@ -767,7 +767,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab index eac4db6e..973535b8 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab @@ -318,7 +318,7 @@ RectTransform: 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_SizeDelta: {x: 414, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7495432060883253866 CanvasRenderer: @@ -347,7 +347,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1600952e851cce040812390c154d47b9, type: 3} + m_Sprite: {fileID: 21300000, guid: 3052cb7c475b29f40aed46c23712956a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -519,19 +519,25 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 10b76c8f490924a4497f1a1ce99ab197, + objectReference: {fileID: 21300000, guid: b40ce4fb7f271894ebdfdd639524cded, type: 3} - target: {fileID: 1429324070929694813, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9415d78c488ac65499e76da55fabb1a7, + objectReference: {fileID: 21300000, guid: 75e62f81b433ce541866b37242f0317c, type: 3} - target: {fileID: 1635669704753822050, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: mLocalizeTarget value: objectReference: {fileID: 0} + - target: {fileID: 2135570265429419190, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + type: 3} - target: {fileID: 2330426468125588075, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.x @@ -592,6 +598,72 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2689368185008525424, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 2689368185008525424, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 2689368185518094908, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 2689368185518094908, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 2689368185795001053, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 2689368185795001053, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 2689368186107567793, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 2689368186107567793, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 2689368186209629354, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 2689368186209629354, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 2689368186419127914, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 2689368186419127914, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -786,13 +858,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2912042419494869166, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -828,37 +900,48 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702814767940876, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702815021412257, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702816120709472, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702816214109051, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702816297785787, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + type: 3} + - target: {fileID: 5992766665972216920, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Text + value: Recipes exchange by watching videos + objectReference: {fileID: 0} + - target: {fileID: 5992766665972216920, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6210267155661053507, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -874,43 +957,49 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406391272459118, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, + type: 3} + - target: {fileID: 6778406391319654371, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406391355087278, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406391359986651, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6778406391449809845, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406391528862144, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6778406391602078464, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -936,19 +1025,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406391799384732, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406391868414044, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -974,7 +1063,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1020,13 +1109,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406392475276570, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6778406392476026602, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1052,13 +1141,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406392559949514, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1084,49 +1173,85 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406392802564057, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406392981877588, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406393018367830, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6778406393073679494, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406393079469880, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406393242006453, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406393295568823, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 7771816863359585887, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + type: 3} + - target: {fileID: 7771816863518062212, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + type: 3} + - target: {fileID: 7771816863723365444, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + type: 3} + - target: {fileID: 7771816863844477650, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + type: 3} + - target: {fileID: 7771816864104180275, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, + type: 3} + - target: {fileID: 7771816864391774366, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index 293e4125..fa5fbc4a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4707019036817275407 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} + m_Sprite: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -606,7 +606,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -618,7 +618,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uD569\uACC4" + m_Text: "\u5408\u8A08" --- !u!114 &4965073318475407547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -731,7 +731,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 2.9, y: 4} - m_SizeDelta: {x: 66, y: 40} + m_SizeDelta: {x: 115, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304335344414335 CanvasRenderer: @@ -760,7 +760,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, type: 3} + m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1712,7 +1712,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2112,7 +2112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f2ec7d503bc828a42b5ddc28c3eaaa48, type: 3} + m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2518,7 +2518,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index dc10d7e1..f1ad1c3f 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -647,6 +647,7 @@ MonoBehaviour: m_EditorClassIdentifier: scrollRect: {fileID: 2912042418150409388} verticalSlider: {fileID: 36571976361706991} + direction: 2 --- !u!1 &2912042418702301918 GameObject: m_ObjectHideFlags: 0 @@ -1689,7 +1690,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -17} - m_SizeDelta: {x: 80, y: 48} + m_SizeDelta: {x: 146, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1807434274116728218 CanvasRenderer: @@ -1718,9 +1719,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 10b76c8f490924a4497f1a1ce99ab197, type: 3} + m_Sprite: {fileID: 21300000, guid: b40ce4fb7f271894ebdfdd639524cded, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1833,7 +1834,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9415d78c488ac65499e76da55fabb1a7, type: 3} + m_Sprite: {fileID: 21300000, guid: 75e62f81b433ce541866b37242f0317c, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1903,25 +1904,25 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2042,19 +2043,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2065,7 +2066,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2095,19 +2096,19 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4171021028074710842, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2118,7 +2119,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2239,19 +2240,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2262,7 +2263,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2292,25 +2293,25 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2431,19 +2432,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2454,7 +2455,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2484,25 +2485,25 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2623,19 +2624,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2646,7 +2647,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2676,25 +2677,25 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2815,19 +2816,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2838,7 +2839,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2868,25 +2869,25 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e3e85161f95d90249836202b29165d9b, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3007,19 +3008,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3030,7 +3031,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a8859d14ca4e7194ba96cd691f4e9060, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3209,19 +3210,19 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\uAD11\uACE0 \uC2DC\uCCAD\uC73C\uB85C \uB808\uC2DC\uD53C \uAD50\uD658" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 70056e19bd1aab34dac206b63f1a7011, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3342,13 +3343,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d735ef11ca36c9741aff52f40d780cb6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 86741e9a2b889d24b9fd7961fcc112fb, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 8536603424418812070, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity index 96b7cd1d..8cee0cd4 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity @@ -128,6 +128,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5887917383623105892, guid: 3ea48dc60c16147799619e2fb9fe1cd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, + type: 3} - target: {fileID: 9133304335168602039, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_AnchoredPosition.y @@ -146,7 +152,7 @@ PrefabInstance: - target: {fileID: 9133304335307007781, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_Text - value: "\u5408\u8A08" + value: Total objectReference: {fileID: 0} - target: {fileID: 9133304335307007781, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} @@ -163,13 +169,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 9133304336582582509, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, + objectReference: {fileID: 21300000, guid: 5b791b29becec62468fa706ff3a6749a, type: 3} - target: {fileID: 9133304336623725415, guid: 3ea48dc60c16147799619e2fb9fe1cd9, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 62044d39..50243cb4 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -193,9 +193,11 @@ public class Shopping : MonoBehaviour public static bool CheckEarnedRecipe() { - var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); + var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet) + .Where(data => !data.IsHide) + .Where(data => data.Category == ItemCategory.Recipe); var adCount = GameDataManager.GameData.adCount; - foreach (var shopData in shopDataList.Where(data => data.Category == ItemCategory.Recipe)) + foreach (var shopData in shopDataList) { if (GetItemAmount(shopData) > 0) continue; if (shopData.price <= adCount) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index 7c5a0699..1d8c5c41 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -141,6 +141,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3033445368104864265, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, + type: 3} - target: {fileID: 3033445369676262432, guid: a1b406baf09004616b436c242e3a474f, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 9076b933..b2d9ec1a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -187,32 +187,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &355620160 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091312} ---- !u!114 &462971875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091308} --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -296,31 +270,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &555286545 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, - type: 3} - m_PrefabInstance: {fileID: 3078490422721459368} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &700940153 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091311} --- !u!114 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -403,7 +352,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 52c59ab27fa50ee4e8a6039814ed9a70, + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -534,13 +483,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 150bcaedfe3234047a8f48028269cfc9, + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d0ae1ddf0517a7242abc6fcd17acf837, + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -691,7 +640,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: d133cc46d23f4e044924f0bf0d886082, + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -712,7 +661,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03cf33d3fbc95cd48a1d55a2d6ae9d15, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -751,105 +700,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} ---- !u!114 &1098091308 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091310 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091311 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1098091312 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - m_PrefabInstance: {fileID: 1098091307} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1135861150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091309} ---- !u!114 &1351454005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1098091310} ---- !u!114 &1369737881 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1789499952} --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -925,31 +775,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} ---- !u!114 &1789499952 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, - type: 3} - m_PrefabInstance: {fileID: 3078490422721459368} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2010180996 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 555286545} --- !u!1001 &3078490422721459368 PrefabInstance: m_ObjectHideFlags: 0 @@ -1046,7 +871,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 203041986372112404, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite @@ -1411,6 +1237,12 @@ PrefabInstance: propertyPath: m_AdditionalShaderChannelsFlag value: 25 objectReference: {fileID: 0} + - target: {fileID: 3148737408544323659, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 3971030752033893388, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite @@ -1427,37 +1259,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797366965187485, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367225611132, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367521269520, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367681576907, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4265797367884266763, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1519,7 +1351,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a2db71d8798ad034f9594a39d6e19cc8, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 5709465544360413450, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1527,11 +1359,48 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} + - target: {fileID: 6758377365589220451, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} + - target: {fileID: 6758377365838755534, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} + - target: {fileID: 6758377366098884143, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} + - target: {fileID: 6758377366326110841, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} + - target: {fileID: 6758377366513596601, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} + - target: {fileID: 6758377366687994530, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} - target: {fileID: 8406322788130518425, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite @@ -1542,7 +1411,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 8406322788187973465, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1554,13 +1423,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 8406322788326259471, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1702,7 +1571,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1734,7 +1603,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 8406322789845613550, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1746,7 +1615,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 8406322789955138620, guid: 667a93fb2929943078b944050cddd464, type: 3} diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 82331fcb..c2fcacd5 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1573,10 +1573,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_detail_title_Advanced - - - - - - - - + - Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh[minigame_Selection_detail_title_Advanced_zh] + - Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh[minigame_Selection_detail_title_Advanced_zh] + - Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko[minigame_Selection_detail_title_Advanced_ko] + - Material_en/minigame/minigame_Selection_detail_title_Advanced_en[minigame_Selection_detail_title_Advanced_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_Selection_detail_title_Beginner @@ -1584,10 +1584,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_detail_title_Beginner - - - - - - - - + - Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh[minigame_Selection_detail_title_Beginner_zh] + - Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh[minigame_Selection_detail_title_Beginner_zh] + - Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko[minigame_Selection_detail_title_Beginner_ko] + - Material_en/minigame/minigame_Selection_detail_title_Beginner_en[minigame_Selection_detail_title_Beginner_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_Selection_detail_title_Intermediate @@ -1595,10 +1595,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_detail_title_Intermediate - - - - - - - - + - Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh[minigame_Selection_detail_title_Intermediate_zh] + - Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh[minigame_Selection_detail_title_Intermediate_zh] + - Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko[minigame_Selection_detail_title_Intermediate_ko] + - Material_en/minigame/minigame_Selection_detail_title_Intermediate_en[minigame_Selection_detail_title_Intermediate_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_Selection_title_logo @@ -1606,10 +1606,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_title_logo - - - - - - - - + - Material_zh/minigame/minigame_Selection_title_logo_zh[minigame_Selection_title_logo_zh] + - Material_zh/minigame/minigame_Selection_title_logo_zh[minigame_Selection_title_logo_zh] + - Material_ko/minigame/minigame_Selection_title_logo_ko[minigame_Selection_title_logo_ko] + - Material_en/minigame/minigame_Selection_title_logo_en[minigame_Selection_title_logo_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_main_Score @@ -1617,10 +1617,10 @@ MonoBehaviour: Description: Languages: - minigame_main_Score - - - - - - - - + - Material_zh/minigame/minigame_main_Score_zh[minigame_main_Score_zh] + - Material_zh/minigame/minigame_main_Score_zh[minigame_main_Score_zh] + - Material_ko/minigame/minigame_main_Score_ko[minigame_main_Score_ko] + - Material_en/minigame/minigame_main_Score_en[minigame_main_Score_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_main_explanation_text @@ -1628,10 +1628,10 @@ MonoBehaviour: Description: Languages: - minigame_main_explanation_text - - - - - - - - + - Material_zh/minigame/minigame_main_explanation_text_zh[minigame_main_explanation_text_zh] + - Material_zh/minigame/minigame_main_explanation_text_zh[minigame_main_explanation_text_zh] + - Material_ko/minigame/minigame_main_explanation_text_ko[minigame_main_explanation_text_ko] + - Material_en/minigame/minigame_main_explanation_text_en[minigame_main_explanation_text_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_main_frame_time @@ -1639,10 +1639,10 @@ MonoBehaviour: Description: Languages: - minigame_main_frame_time - - - - - - - - + - Material_zh/minigame/minigame_main_frame_time_zh[minigame_main_frame_time_zh] + - Material_zh/minigame/minigame_main_frame_time_zh[minigame_main_frame_time_zh] + - Material_ko/minigame/minigame_main_frame_time_ko[minigame_main_frame_time_ko] + - Material_en/minigame/minigame_main_frame_time_en[minigame_main_frame_time_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_result_material_title @@ -1650,10 +1650,10 @@ MonoBehaviour: Description: Languages: - minigame_result_material_title - - - - - - - - + - Material_zh/minigame/minigame_result_material_title_zh[minigame_result_material_title_zh] + - Material_zh/minigame/minigame_result_material_title_zh[minigame_result_material_title_zh] + - Material_ko/minigame/minigame_result_material_title_ko[minigame_result_material_title_ko] + - Material_en/minigame/minigame_result_material_title_en[minigame_result_material_title_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_result_meter_title @@ -1661,10 +1661,10 @@ MonoBehaviour: Description: Languages: - minigame_result_meter_title - - - - - - - - + - Material_zh/minigame/minigame_result_meter_title_zh[minigame_result_meter_title_zh] + - Material_zh/minigame/minigame_result_meter_title_zh[minigame_result_meter_title_zh] + - Material_ko/minigame/minigame_result_meter_title_ko[minigame_result_meter_title_ko] + - Material_en/minigame/minigame_result_meter_title_en[minigame_result_meter_title_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_result_title @@ -1672,10 +1672,10 @@ MonoBehaviour: Description: Languages: - minigame_result_title - - - - - - - - + - Material_zh/minigame/minigame_result_title_zh[minigame_result_title_zh] + - Material_zh/minigame/minigame_result_title_zh[minigame_result_title_zh] + - Material_ko/minigame/minigame_result_title_ko[minigame_result_title_ko] + - Material_en/minigame/minigame_result_title_en[minigame_result_title_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_Footer_MaterialProcurement_logo @@ -1683,10 +1683,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo - - - - - - - - + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] + - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko[ui_button_icon_Footer_MaterialProcurement_logo_ko] + - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en[ui_button_icon_Footer_MaterialProcurement_logo_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_Footer_MaterialProcurement_logo_key @@ -1694,10 +1694,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo_key - - - - - - - - + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] + - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko[ui_button_icon_Footer_MaterialProcurement_logo_key_ko] + - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en[ui_button_icon_Footer_MaterialProcurement_logo_key_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_movie_logo_Procurement @@ -1705,10 +1705,21 @@ MonoBehaviour: Description: Languages: - ui_button_icon_movie_logo_Procurement - - - - - - - - + - Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh[ui_button_icon_movie_logo_Procurement_zh] + - Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh[ui_button_icon_movie_logo_Procurement_zh] + - Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko[ui_button_icon_movie_logo_Procurement_ko] + - Material_en/minigame/ui_button_icon_movie_logo_Procurement_en[ui_button_icon_movie_logo_Procurement_en] + Flags: 0000000000 + Languages_Touch: [] + - Term: minigame_explanation_Dither + TermType: 5 + Description: + Languages: + - minigame_explanation_Dither + - Material_zh/minigame/minigame_explanation_zh_Dither[minigame_explanation_zh_Dither] + - Material_zh/minigame/minigame_explanation_zh_Dither[minigame_explanation_zh_Dither] + - Material_ko/minigame/minigame_explanation_ko_Dither[minigame_explanation_ko_Dither] + - Material_en/minigame/minigame_explanation_en_Dither[minigame_explanation_en_Dither] Flags: 0000000000 Languages_Touch: [] - Term: Unit/Amount @@ -13500,11 +13511,11 @@ MonoBehaviour: - Flags: 0000000000 Languages_Touch: [] - - Term: minigame_explanation_Dither + - Term: minigame_result_score_title TermType: 5 Description: Languages: - - minigame_explanation_Dither + - minigame_result_score_title - - - @@ -13535,7 +13546,7 @@ MonoBehaviour: Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8 Google_SpreadsheetName: I2Loc popcorn Localization - Google_LastUpdatedVersion: 1656653322741 + Google_LastUpdatedVersion: 1657078768745 Google_Password: change_this GoogleUpdateFrequency: 1 GoogleInEditorCheckFrequency: 1 diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 35eb5cf2..27d7f83c 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -261,7 +261,7 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 1 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180