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/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 index df6276f5..f92dc616 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_en/Main/Movie/ui_Main_movie_Achievement_title_text_coin_en.png 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/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_marketing_CustomizationDetails_title_text_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png index 1e01b95d..1ca9e1ef 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en.png 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/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_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_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_publicity_logo_en.png b/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png index f915694b..694294cb 100644 Binary files a/popcorn/Assets/MyGame/Resources/Material_en/marketing/ui_button_icon_Footer_publicity_logo_en.png 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/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/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 3415b3d3..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 @@ -284,19 +310,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &79995316 -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: 1566048527} --- !u!1 &120399583 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 @@ -360,18 +385,6 @@ Transform: m_Father: {fileID: 1501215306} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &166654514 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 &213307014 GameObject: m_ObjectHideFlags: 0 @@ -404,18 +417,19 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &257449807 stripped +--- !u!114 &220609990 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 521511634720853184, 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_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: + mTarget: {fileID: 1980930080} --- !u!114 &260671573 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1022,7 +1036,7 @@ RectTransform: m_Children: - {fileID: 1106859980} m_Father: {fileID: 387414334} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1233,7 +1247,7 @@ PrefabInstance: - target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1498,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} @@ -1640,6 +1654,19 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 +--- !u!114 &452908902 +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!1 &457045027 GameObject: m_ObjectHideFlags: 0 @@ -1804,18 +1831,6 @@ Animator: type: 3} m_PrefabInstance: {fileID: 1958951427} m_PrefabAsset: {fileID: 0} ---- !u!114 &481120225 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!1 &492106929 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1507187602806663288, guid: 21599f8e6d1104a07b0b14b49f8c1429, @@ -2135,19 +2150,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &540064102 -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!114 &556316131 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3767471200807653374, guid: 0949d70c1a73342ca8955c7f59c04fe0, @@ -2404,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 @@ -2673,18 +2700,6 @@ MonoBehaviour: soilTopLightAnimator: {fileID: 1604139295} soilCenterLightAnimator: {fileID: 1309667616} soilBottomLightAnimator: {fileID: 473560054} ---- !u!114 &721786418 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 &727483538 GameObject: m_ObjectHideFlags: 0 @@ -2952,19 +2967,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4107102217382154191} m_PrefabAsset: {fileID: 0} ---- !u!114 &862692074 -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: 1020154402} --- !u!1 &877205765 GameObject: m_ObjectHideFlags: 0 @@ -3108,18 +3110,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &917741154 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 &925906674 GameObject: m_ObjectHideFlags: 0 @@ -3423,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 @@ -3603,31 +3605,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e66a2dbf7e774065832962016627c6d8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1020154402 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 &1031212790 -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: 257449807} --- !u!1 &1106859979 GameObject: m_ObjectHideFlags: 0 @@ -3841,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 @@ -4111,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 @@ -4354,18 +4356,6 @@ Animator: type: 3} m_PrefabInstance: {fileID: 279224989} m_PrefabAsset: {fileID: 0} ---- !u!114 &1314773538 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 &1321959278 GameObject: m_ObjectHideFlags: 0 @@ -4428,19 +4418,6 @@ Transform: m_Father: {fileID: 282523123} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1364968714 -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: 481120225} --- !u!1 &1381520040 GameObject: m_ObjectHideFlags: 0 @@ -4496,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 @@ -4577,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 @@ -4732,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 @@ -4850,7 +4865,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1526440927 +--- !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} @@ -4862,7 +4889,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 166654514} + mTarget: {fileID: 147614861} --- !u!1 &1537737291 GameObject: m_ObjectHideFlags: 0 @@ -4895,18 +4922,6 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1566048527 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!1001 &1589622939 PrefabInstance: m_ObjectHideFlags: 0 @@ -5406,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 @@ -5493,19 +5520,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 387414332} m_PrefabAsset: {fileID: 0} ---- !u!114 &1742609083 -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: 721786418} --- !u!1 &1775503937 GameObject: m_ObjectHideFlags: 0 @@ -15257,19 +15271,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!114 &1825370030 -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: 917741154} --- !u!114 &1859409048 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6168082219279810231, guid: caaa748dbeed576499e8cae74d33f689, @@ -15812,6 +15813,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1958951427} m_PrefabAsset: {fileID: 0} +--- !u!114 &1980930080 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!1 &1989990597 GameObject: m_ObjectHideFlags: 0 @@ -16329,7 +16342,7 @@ PrefabInstance: - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} @@ -16458,19 +16471,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} ---- !u!114 &2083074070 -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: 1314773538} --- !u!1 &2113322130 GameObject: m_ObjectHideFlags: 0 @@ -16932,7 +16932,7 @@ PrefabInstance: - target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04, type: 3} propertyPath: m_RootOrder - value: 9 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 32392260..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: 210, 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: 210, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270417149857 CanvasRenderer: @@ -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: 210, 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: 210, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8736114270758350243 CanvasRenderer: @@ -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 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 798ec431..afc243c4 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -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: 210, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693359888773727 CanvasRenderer: @@ -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: 210, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616693360873139575 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 2af08943..dd4fb301 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -455,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 @@ -620,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 @@ -810,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 @@ -911,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 @@ -1873,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 @@ -1908,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/Main/AutomaticCookingCaution.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity index 5b8e3fb1..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: a4ae18b6aed1eb94dbbc5664789c4c8a, 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: 09982b47e2a955a47953ad04ecce1d20, 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: @@ -1374,7 +1374,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u30BF\u30F3\u30AF\u306E\u7A7A\u304D\u5BB9\u91CF\u304C\u8DB3\u308A\u306A\u3044\u305F\u3081\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u304C\u6EA2\u308C\u3066\u3057\u307E\u3044\u307E\u3059\n\u6EA2\u308C\u305F\u5206\u306F\u81EA\u52D5\u3067\u7834\u68C4\u3055\u308C\u307E\u3059" + 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 @@ -1604,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: @@ -1625,7 +1626,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b3bb4315d0b662a45ad105284c877349, type: 3} + m_Sprite: {fileID: 21300000, guid: 4bbbf0927dd59b6429b67fed20321636, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1740,7 +1741,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cee098de223b0e547b791a85f878a39f, 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 8aaf89b7..c5ba9ae5 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: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, 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: 7b9f4b6377671b5479597672719d19bc, type: 3} + m_Sprite: {fileID: 21300000, guid: 8aea6767956ae9342abeb93a801218c5, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1167,7 +1167,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 &677856733 MonoBehaviour: @@ -1188,7 +1188,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a4ae18b6aed1eb94dbbc5664789c4c8a, type: 3} + m_Sprite: {fileID: 21300000, guid: 859db30fafea43a49b6f7440affcf4ca, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -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: 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/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 4636bdf2..e7c0edd0 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 @@ -454,7 +459,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: 267.00003, y: 1} + m_AnchoredPosition: {x: 297.00003, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &369996024 @@ -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: -83, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445717700 @@ -564,7 +569,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u7372\u5F97\u307E\u3067\u306E\u6642\u9593" + m_Text: Time to acquire --- !u!222 &445717701 CanvasRenderer: m_ObjectHideFlags: 0 @@ -648,7 +653,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: 267, y: 1} + m_AnchoredPosition: {x: 297, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &497376572 @@ -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: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 31f5a049028df4d4a8df7222be280a77, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1012,7 +1017,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: 600, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617186344 MonoBehaviour: @@ -1376,7 +1381,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: 600, 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: -83, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1165270082 @@ -1485,7 +1490,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u7372\u5F97\u3067\u304D\u308B\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" + m_Text: Popcorn you can get --- !u!222 &1165270083 CanvasRenderer: m_ObjectHideFlags: 0 @@ -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: 820, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1228675119 MonoBehaviour: @@ -1990,7 +1995,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: 600, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330781664 MonoBehaviour: @@ -2419,7 +2424,8 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3046\u3068\u4E00\u5B9A\u6642\u9593\u5F8C\u306B\n\u5927\u91CF\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u7372\u5F97\u3067\u304D\u307E\u3059\uFF01\n\u52D5\u753B\u3092\u898B\u3066\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3044\u307E\u3059\u304B\uFF1F" + 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 @@ -2503,7 +2509,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: 267.00003, y: 1} + m_AnchoredPosition: {x: 297, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1643570443 @@ -2652,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: -83, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667839400 @@ -2687,7 +2693,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u306B\u5FC5\u8981\u306A\u4F7F\u7528\u56DE\u6570" + m_Text: Number of uses required to level up --- !u!222 &1667839401 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2771,7 +2777,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: 267, y: 1} + m_AnchoredPosition: {x: 297, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676166303 @@ -2908,7 +2914,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 490f9ea68882b7b48bcc2974a41f8bcd, type: 3} + m_Sprite: {fileID: 21300000, guid: b6575785a082f8543bd6d9aa7906155b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3097,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: -83, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1771385232 @@ -3171,7 +3177,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" + m_Text: Automatic cooking level --- !u!222 &1771385234 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3215,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: 870, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1828954259 MonoBehaviour: @@ -3404,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 @@ -3582,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: @@ -3705,7 +3716,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: 600, 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/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index 0b58d58b..72294d0d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -441,7 +441,7 @@ PrefabInstance: - target: {fileID: 1398728378518018609, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + value: Until the next level up objectReference: {fileID: 0} - target: {fileID: 1398728378518018609, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -572,7 +572,7 @@ PrefabInstance: - target: {fileID: 3337121566302665231, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u5916\u89B3\u30EC\u30D9\u30EB" + value: Appearance level objectReference: {fileID: 0} - target: {fileID: 3337121566302665231, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -603,7 +603,7 @@ PrefabInstance: - target: {fileID: 4667112470385182661, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + value: Until the next level up objectReference: {fileID: 0} - target: {fileID: 4667112470385182661, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -685,7 +685,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, + objectReference: {fileID: 21300000, guid: 642d7890c10bfa0478e326098a66b501, type: 3} - target: {fileID: 6859128400999920012, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -717,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 @@ -766,7 +772,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, + objectReference: {fileID: 21300000, guid: d80ae6dbbc9b0654f8da51babec80fd4, type: 3} - target: {fileID: 6859128401135470825, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1009,7 +1015,7 @@ PrefabInstance: - target: {fileID: 6859128401682711732, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u30EC\u30D9\u30EB" + value: level objectReference: {fileID: 0} - target: {fileID: 6859128401682711732, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1085,7 +1091,7 @@ PrefabInstance: - target: {fileID: 6859128401939500947, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + value: Until the next level up objectReference: {fileID: 0} - target: {fileID: 6859128401939500947, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1116,7 +1122,7 @@ PrefabInstance: - target: {fileID: 6859128401988334834, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u5546\u54C1\u5728\u5EAB" + value: Product inventory objectReference: {fileID: 0} - target: {fileID: 6859128401988334834, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1168,7 +1174,7 @@ PrefabInstance: - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u79F0\u53F7" + value: title objectReference: {fileID: 0} - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1210,7 +1216,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} - target: {fileID: 6859128402297305239, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1230,7 +1236,7 @@ PrefabInstance: - target: {fileID: 6859128402301004802, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u6750\u6599\u5728\u5EAB" + value: Material inventory objectReference: {fileID: 0} - target: {fileID: 6859128402301004802, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1242,7 +1248,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, + objectReference: {fileID: 21300000, guid: 092db4cbbfd9f4541bef11fc1880ff8f, type: 3} - target: {fileID: 6859128402360749161, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1372,7 +1378,7 @@ PrefabInstance: - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Text - value: "\u5E97\u8217\u30EC\u30D9\u30EB" + value: Store level objectReference: {fileID: 0} - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} @@ -1446,6 +1452,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7037845673517582736, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: Automatic cooking level + objectReference: {fileID: 0} - target: {fileID: 8427328856812647918, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 3dd33668..7f520942 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: ff32278fa02ebbe4aab807a618d780f1, + type: 3} - target: {fileID: 1742302645900268983, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -351,13 +357,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, + objectReference: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, 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 +394,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, + type: 3} + - target: {fileID: 2660639678752994312, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -408,7 +426,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, + objectReference: {fileID: 21300000, guid: 49fd28526ab9a8c428a93e66a2bf760d, type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -544,7 +562,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} + - target: {fileID: 3338528259637188169, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} - target: {fileID: 3338528259869159787, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -606,6 +630,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: ff32278fa02ebbe4aab807a618d780f1, + type: 3} - target: {fileID: 4606433577286798635, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity index d2f7942f..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: 8a4a83b58fd845d4c8c98fd67fde9139, + objectReference: {fileID: 21300000, guid: 73e0f8e8e6edccf439cd0a364c197223, type: 3} - target: {fileID: 7864277047165460487, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, + 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: 4372cbbdff809454881ff362f84c540c, + 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 968520bf..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: 3427e8ca8d0104e48931345970086635, 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: 274b9e3453e45cb42952f9bf572e625b, type: 3} + m_Sprite: {fileID: 21300000, guid: 1b21c61c7670bb845aad6daba2d6e317, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -864,7 +864,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 @@ -1035,7 +1035,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, 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,7 +2041,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 4011d10062c94334d84399c8519e3ed1, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 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: b8ad8d53e7a334143ae4fc6b507549b4, 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: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2966,7 +2966,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + 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: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3131,7 +3131,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + 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: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 50daa64ef03816f449465e8d26b1ecdd, type: 3} - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3316,7 +3316,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + 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 5850473b..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,7 +370,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6009169cf4bae0f44a76a4d631861685, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c6d3bd70b7c3f545ae2673c91ba5e35, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 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: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: f292524fd33ea9248859b3b1ef5e1c46, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -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: 9ec1fd1b10d054845bc283dc1597bc56, 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: 6c7a1316274f767489221ac9165a0148, 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: 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/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 9dab352d..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: 9ec1fd1b10d054845bc283dc1597bc56, 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: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: e0e63c471a2a05a4f8a3b9e5de25db4f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1486,7 +1486,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 48243d820b7c5bd43ba50a88f69a8c05, 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: 4372cbbdff809454881ff362f84c540c, 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: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2339,7 +2339,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 3039f511366494148bc836ca960a11e7, type: 3} - target: {fileID: 1266659963694843888, 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 a13e445c..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 @@ -1646,7 +1646,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, 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: a873c8bad83dea840beba737356790ad, 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 6c48e48a..539e6667 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -968,7 +968,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5916\u89B3\u30EC\u30D9\u30EB" + m_Text: Appearance level --- !u!114 &5449134050274049995 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1236,7 +1236,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: Until the next level up --- !u!114 &2879166960840634929 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1354,7 +1354,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: Until the next level up --- !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: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} + m_Sprite: {fileID: 21300000, guid: 642d7890c10bfa0478e326098a66b501, 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: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} + m_Sprite: {fileID: 21300000, guid: d80ae6dbbc9b0654f8da51babec80fd4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4248,7 +4248,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30EC\u30D9\u30EB" + m_Text: level --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4599,7 +4599,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: Until the next level up --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4792,7 +4792,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5546\u54C1\u5728\u5EAB" + m_Text: Product inventory --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -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: @@ -5244,7 +5244,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} + m_Sprite: {fileID: 21300000, guid: 092db4cbbfd9f4541bef11fc1880ff8f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5372,7 +5372,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u79F0\u53F7" + m_Text: title --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -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: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, 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 @@ -6039,7 +6039,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6750\u6599\u5728\u5EAB" + m_Text: Material inventory --- !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: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} + m_Sprite: {fileID: 21300000, guid: 092db4cbbfd9f4541bef11fc1880ff8f, 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: @@ -6586,7 +6586,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" + m_Text: Store level --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8121,7 +8121,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" + m_Text: Automatic cooking level --- !u!114 &7515969663285405202 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index bd1b92b9..018fd3b9 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 @@ -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,7 +428,7 @@ 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: 1 m_FillCenter: 1 @@ -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 @@ -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: @@ -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} @@ -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} @@ -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} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index a8b8b496..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: 8a4a83b58fd845d4c8c98fd67fde9139, 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: bd3845c3836664a4a9adaac6d554621c, 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: 4372cbbdff809454881ff362f84c540c, 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 61996f9f..14929408 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -1224,7 +1224,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: 166, y: 44} + m_SizeDelta: {x: 88, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639678406526114 CanvasRenderer: @@ -1253,7 +1253,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} + m_Sprite: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -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: @@ -1613,9 +1613,9 @@ 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: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1699,7 +1699,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: 166, y: 44} + m_SizeDelta: {x: 88, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639678752994313 CanvasRenderer: @@ -1728,7 +1728,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} + m_Sprite: {fileID: 21300000, guid: 8313e9dcb68d05b48a314fcb0ed387fd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 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: @@ -2190,7 +2190,7 @@ 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: 1 m_FillCenter: 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: ff32278fa02ebbe4aab807a618d780f1, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} --- !u!224 &1742302644927332555 stripped @@ -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: ff32278fa02ebbe4aab807a618d780f1, + 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: ff32278fa02ebbe4aab807a618d780f1, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} --- !u!224 &3338528260037239831 stripped @@ -3321,7 +3339,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} - target: {fileID: 8610769905762339287, guid: 5efec1563da076e43b72d4631cb86748, type: 3} 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 47688453..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 @@ -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,7 +881,7 @@ 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: 1 m_FillCenter: 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,7 +1603,7 @@ 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: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index b0f21205..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: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 31f5a049028df4d4a8df7222be280a77, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2843,7 +2843,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 490f9ea68882b7b48bcc2974a41f8bcd, 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 5ded38bc..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: b8ad8d53e7a334143ae4fc6b507549b4, 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: 280, 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: f247faa75d88e5c40a92444ba0e075c3, 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 dc33fe95..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: 4372cbbdff809454881ff362f84c540c, 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: 2aa09e79e9eb3d74cb962b15849648f3, 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/Settings/HowToPlay.unity b/popcorn/Assets/MyGame/Scenes/Settings/HowToPlay.unity index e5edb004..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: f3a0ccdabb17f2244abcb3798b5b589e, 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: 004fade0ce34e974fb146a0502a917cf, 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 778d1e69..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: 3acd48f1b6c81e443a46bc4ab8d73cc9, 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: 44ace36fbac0cf04ab64b7662510f857, 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: 98a9ddfc9714daf4e8adb9bc86f701c8, type: 3} + m_Sprite: {fileID: 21300000, guid: 791818e298ddfa4409cacae99c6b4efd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -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: 5af21af3758285443984ca29acf06c80, 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: f3a0ccdabb17f2244abcb3798b5b589e, 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 50179233..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: ac590bcc9d962fc468c63e78856a1e4d, 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 @@ -675,7 +675,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u58F2\u5024\u30DC\u30FC\u30CA\u30B9" + 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: f3a0ccdabb17f2244abcb3798b5b589e, 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 @@ -1771,7 +1771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5BA3\u4F1D\u306E\u52B9\u679C\u30A2\u30C3\u30D7" + 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 @@ -2195,7 +2195,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5916\u89B3\u30EC\u30D9\u30EB" + 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 @@ -2313,7 +2313,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + 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 @@ -2607,7 +2607,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u304A\u5BA2\u3055\u3093\u306E\u6570\u30A2\u30C3\u30D7" + 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 328433ff..93b64d00 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationPurchase.unity @@ -274,18 +274,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 628711926} m_PrefabAsset: {fileID: 0} ---- !u!114 &628711928 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8637195768259321094, guid: 6f54d5af737d9af4dbf64b91e7e6bd3f, - type: 3} - m_PrefabInstance: {fileID: 628711926} - 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 &854297736 GameObject: m_ObjectHideFlags: 0 @@ -352,19 +340,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1818491039} ---- !u!114 &1013362567 -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: 628711928} --- !u!1 &1400119941 GameObject: m_ObjectHideFlags: 0 @@ -587,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: @@ -648,9 +623,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, 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 @@ -871,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: @@ -991,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 @@ -1722,9 +1697,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, 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 @@ -1749,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: @@ -2436,7 +2411,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, 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 7c35e79d..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: 4dfd13c469869964ca6f7bfef8074cb4, type: 3} + m_Sprite: {fileID: 21300000, guid: 75e05b805ed6a0d49bd58266cfabf3b5, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -445,13 +445,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -840,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 @@ -851,13 +864,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1421,19 +1434,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 ---- !u!114 &468526193 -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 @@ -1831,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 @@ -2117,7 +2130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0ad0c35e347f29e4dafe89c890bcbee6, type: 3} + m_Sprite: {fileID: 21300000, guid: d65b58b99312eed418f41ce9c8a5c3e9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2353,7 +2366,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1b1f56cd08f942645b331422171b2269, type: 3} + m_Sprite: {fileID: 21300000, guid: 3d3b5cd8c4cd56a45be86e76fc6b4eba, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2411,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 @@ -2435,13 +2461,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -2622,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 @@ -3217,7 +3256,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c0bd2ebfc1050249957c8c7ee4f436f, type: 3} + m_Sprite: {fileID: 21300000, guid: 091482721da1dda4ea0e1652593ac76e, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3442,7 +3481,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 959868501} m_CullTransparentMesh: 0 ---- !u!114 &974018926 +--- !u!114 &1006321928 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3704,7 +3743,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1033b578a6c824947b690e34f2c4a9ca, type: 3} + m_Sprite: {fileID: 21300000, guid: 9af10152ad2725e4a864d3161d04beac, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3762,33 +3801,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &1101951313 -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 &1123704846 -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 &1151421246 +--- !u!114 &1153839208 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3801,7 +3814,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 811473977} ---- !u!114 &1175293614 +--- !u!114 &1204000792 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3813,20 +3826,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 227427382} ---- !u!114 &1250966342 -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} + mTarget: {fileID: 336991183} --- !u!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -3963,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 @@ -4056,19 +4069,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1408619794 -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!1001 &1428988151 PrefabInstance: m_ObjectHideFlags: 0 @@ -4080,13 +4080,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80cdf08b5a00c7c4db3e3048590cbb59, + objectReference: {fileID: 21300000, guid: 35a865d30a4b7894fb326fac2163c868, type: 3} - target: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2ddfe1a3b7a7a8744a9ea89ab29f33da, + objectReference: {fileID: 21300000, guid: 7808a1d1a5234ba4cad6c9623fc111e1, type: 3} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4504,7 +4504,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5dfff996c6f85fb4fbb990dbc1abe1b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a0ed564d06bcade45aca7a3fa98d604a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4895,7 +4895,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895333847} m_CullTransparentMesh: 0 ---- !u!114 &1949795307 +--- !u!114 &1970854444 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4907,7 +4907,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 336991183} + mTarget: {fileID: 811473978} --- !u!114 &2014261845 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5385,7 +5385,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a0d094578640fa45953e89871854fb3, type: 3} + m_Sprite: {fileID: 21300000, guid: 693b96dd70896f94e8dc10f672d95dfe, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity index 3bbd9ab8..62d8a7aa 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: c6689bcf32023ee4e8eccc786b0d615b, type: 3} + m_Sprite: {fileID: 21300000, guid: a55e3686a65a4f041806756c0ac1802f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -608,7 +608,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 &1054852494 MonoBehaviour: @@ -669,7 +669,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, 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: 5e43fecf5be6a604baf871877445d4a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 3473d177df7162c4c970c5695334adee, 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 0b3e975c..7f27a1c7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -282,7 +282,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, + objectReference: {fileID: 21300000, guid: c800e5dc66b627440baae66a99b1b7af, type: 3} - target: {fileID: 3856012875358022744, guid: 6592613d31e034734bea16833d6345c1, type: 3} @@ -398,7 +398,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, + objectReference: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, 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 b9b98931..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: 1b9f45eaa19d03341a776a55e81a0f1a, 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: 85b31be12a772f64da682745a8fc9750, 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/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 9e68d2ba..79784660 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: 409c5760e22df3a4b9dab699899fb95c, type: 3} + m_Sprite: {fileID: 21300000, guid: c800e5dc66b627440baae66a99b1b7af, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 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: f3a0ccdabb17f2244abcb3798b5b589e, 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/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index 1b790875..17d8142a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -153,7 +153,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.25 - m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\n\u304A\u5BA2\u3055\u3093\u304C\u5C11\u3057\u5897\u3048\u308B\u3088" + m_Text: 'Buy for a while the number of customers will increase a little. ' --- !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: 94, y: 60} 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: aac62235e8d499d4f8c23e2f10a05471, type: 3} + m_Sprite: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -678,7 +678,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 89} - m_SizeDelta: {x: 850, y: 54} + m_SizeDelta: {x: 616, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4788906835824280238 CanvasRenderer: @@ -707,7 +707,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c7e8cdb0de6a264f97b8293ae966aaa, 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,7 +1580,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} + m_Sprite: {fileID: 21300000, guid: 24a163350f08e6d4882db9553b6b61be, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 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: 94, y: 60} 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: 25e87dbf8c9dca34884b8267401b0a2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 6061bfd9050f0cb45ae2048806344bc9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2578,13 +2578,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, + objectReference: {fileID: 21300000, guid: 9a303fa5c88e7514899e198b7ab9f3c7, type: 3} - target: {fileID: 6124127957932188848, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, + objectReference: {fileID: 21300000, guid: 453f23d8b60e90c49ba4ee8dce2ed6a4, type: 3} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2605,7 +2605,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, + objectReference: {fileID: 21300000, guid: ce6b0855c1bd2444b978789370886494, type: 3} - target: {fileID: 6124127958415964740, 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 85c78bf9..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: ed2ddfb0a2ddd2945af65cd7881b97e0, 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: 1817140589b2aa3449e3972236b874c5, type: 3} + m_Sprite: {fileID: 21300000, guid: 6b6efef2cf83267428f7d8999e15c2a0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1130,7 +1130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41d4ecc9e2cefff4babb89fa78a5ac78, 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: ad8dde46c91fc7f4db2b42e6983fb2d6, type: 3} + m_Sprite: {fileID: 21300000, guid: 972da0c5fe38e1342b310c2c0135e7e2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 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: 4372cbbdff809454881ff362f84c540c, 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 df205bec..3e22861f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -625,7 +625,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a303fa5c88e7514899e198b7ab9f3c7, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -740,7 +740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} + m_Sprite: {fileID: 21300000, guid: 453f23d8b60e90c49ba4ee8dce2ed6a4, 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: 39d00b01cf9866c449ee01e331f4a52b, type: 3} + m_Sprite: {fileID: 21300000, guid: ce6b0855c1bd2444b978789370886494, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index dc0e49b6..c92a2200 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -204,7 +204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - 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" + m_Text: You can quickly empty the popcorn in the tank. You won't get coins or hearts --- !u!114 &7887033067418340973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -564,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: @@ -593,7 +593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} + m_Sprite: {fileID: 21300000, guid: b076997e576de06458f8b751a3e0de4b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1236,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: @@ -1265,7 +1265,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 @@ -1911,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: 94, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5089467468128331484 CanvasRenderer: @@ -1940,7 +1940,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} + m_Sprite: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, 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 ea3614f3..d5f2139d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -121,6 +121,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &43443522 +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!1 &189791791 GameObject: m_ObjectHideFlags: 0 @@ -195,6 +208,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 189791791} m_CullTransparentMesh: 0 +--- !u!114 &204071331 +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!1001 &219610911 PrefabInstance: m_ObjectHideFlags: 0 @@ -219,7 +245,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -360,13 +386,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -517,7 +543,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, type: 3} - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -563,7 +589,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -668,19 +694,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &231674841 -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 &429638430 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, @@ -693,19 +706,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &468560520 -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 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -1076,7 +1076,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639508187} m_CullTransparentMesh: 0 ---- !u!114 &696130422 +--- !u!114 &651540414 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1088,7 +1088,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1513025054} + mTarget: {fileID: 1446845735} --- !u!1 &748884348 GameObject: m_ObjectHideFlags: 0 @@ -1249,7 +1249,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1242880600 +--- !u!114 &1152622774 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1261,7 +1261,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1760930532} + mTarget: {fileID: 429638430} --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1434,6 +1434,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1682202293 +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 &1760930532 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, @@ -1446,19 +1459,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1882433126 -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!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1753,7 +1753,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} @@ -1990,13 +1990,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} @@ -2062,7 +2062,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} @@ -2147,13 +2147,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} @@ -2199,19 +2199,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 9edb9928..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: ed2ddfb0a2ddd2945af65cd7881b97e0, + objectReference: {fileID: 21300000, guid: b44836fda8a89fe43a2b49d4476720e5, type: 3} - target: {fileID: 8660695104521205934, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1817140589b2aa3449e3972236b874c5, + objectReference: {fileID: 21300000, guid: 6b6efef2cf83267428f7d8999e15c2a0, type: 3} - target: {fileID: 8660695104846840910, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 41d4ecc9e2cefff4babb89fa78a5ac78, + 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: ad8dde46c91fc7f4db2b42e6983fb2d6, + objectReference: {fileID: 21300000, guid: 972da0c5fe38e1342b310c2c0135e7e2, type: 3} - target: {fileID: 8660695105894842743, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, + 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 42f05333..182f197f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity @@ -236,7 +236,8 @@ PrefabInstance: - target: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} propertyPath: m_Text - 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" + value: You can quickly empty the popcorn in the tank. You won't get coins or + hearts objectReference: {fileID: 0} - target: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -268,7 +269,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, + objectReference: {fileID: 21300000, guid: b076997e576de06458f8b751a3e0de4b, type: 3} - target: {fileID: 5089467466543878408, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -384,7 +385,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} - target: {fileID: 5089467467567286955, guid: 0da1dd32f93cb4fe4881d732047679ec, type: 3} @@ -415,7 +416,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, + objectReference: {fileID: 21300000, guid: f77db180669d8d8498c46fd384ec7eb5, 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..8efccec4 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 @@ -3184,7 +3185,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, type: 3} - target: {fileID: 512143980313251866, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3325,7 +3326,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7790c7ac777220c43b20f746837042ba, + objectReference: {fileID: 21300000, guid: 503e1dac51f0f89449adfda161422448, type: 3} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3351,13 +3352,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3508,7 +3509,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, type: 3} - target: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3549,7 +3550,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3630,7 +3631,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3be9a3bcc8d7c864a97b5be41e33418f, + objectReference: {fileID: 21300000, guid: d093b97838f7bee4589f5b9dac23ddb4, type: 3} - target: {fileID: 8591874021033984247, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -4164,6 +4165,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &759764437 +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 &760797060 GameObject: m_ObjectHideFlags: 0 @@ -12515,6 +12529,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: d34a42fae8361314fbe36511c05a1b18, + type: 3} - target: {fileID: 3201651210435991723, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: mLocalizeTarget @@ -12593,6 +12613,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, diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 4e9c54dc..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: 35f44428c7e9fd74eae90f656268d858, 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 @@ -1359,9 +1359,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, 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 @@ -3573,7 +3573,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5FC5\u8981\u306A\u6750\u6599" + m_Text: Required materials --- !u!222 &1649038409 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index bdf3cabf..60f8519e 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -431,7 +431,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: b38a4686c052f1248bc3219f1b45d074, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1003,19 +1003,6 @@ MonoBehaviour: scrollRect: {fileID: 203585999} verticalSlider: {fileID: 409545283} direction: 2 ---- !u!114 &237145466 -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: 2929932626674485992} --- !u!1001 &275912788 PrefabInstance: m_ObjectHideFlags: 0 @@ -1165,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 @@ -1221,7 +1221,7 @@ MonoBehaviour: recipePrefab: {fileID: 5490177795204899762, guid: 2beb2d436ad55734186e797d315796b3, type: 3} closeButton: {fileID: 968322477} ---- !u!114 &346212798 +--- !u!114 &356824047 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1233,7 +1233,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1568730408} + mTarget: {fileID: 1771084673} --- !u!224 &384598190 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -1909,7 +1909,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &665295303 +--- !u!114 &646032228 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1921,7 +1921,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 759959154} + mTarget: {fileID: 2929932626674485992} --- !u!224 &701105333 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -2200,19 +2200,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &850064385 -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 &968322475 GameObject: m_ObjectHideFlags: 0 @@ -2645,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 @@ -2899,7 +2899,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} ---- !u!114 &1196307150 +--- !u!114 &1278183662 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2911,26 +2911,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 425834634} + 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, type: 3} m_PrefabInstance: {fileID: 573590064} m_PrefabAsset: {fileID: 0} ---- !u!114 &1424984203 -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!114 &1432212884 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3585,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: 404, y: 60} + m_SizeDelta: {x: 406, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 MonoBehaviour: @@ -3606,7 +3606,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 52a7196ac9b13a14e8d03cc8fa84866e, type: 3} + m_Sprite: {fileID: 21300000, guid: c8bd01d6018fc2b439a187ad82fc1c13, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity index 592dca2c..fcc5cd47 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 c532e611..5b8e49e2 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: ff32278fa02ebbe4aab807a618d780f1, 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 @@ -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: @@ -577,7 +577,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, type: 3} + m_Sprite: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -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: 03f64e60d74a2a944a184d8401fb6d61, type: 3} + m_Sprite: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1339,7 +1339,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + m_Text: Recipes exchange by watching videos --- !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 @@ -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: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} + m_Sprite: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 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 @@ -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: @@ -2601,7 +2601,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -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: 1ed7a6eade5a3af4c962706dec098104, type: 3} + m_Sprite: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 4a7d9fb4..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: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab index 39448c11..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: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} + m_Sprite: {fileID: 21300000, guid: 3052cb7c475b29f40aed46c23712956a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -519,13 +519,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, + objectReference: {fileID: 21300000, guid: b40ce4fb7f271894ebdfdd639524cded, type: 3} - target: {fileID: 1429324070929694813, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, + objectReference: {fileID: 21300000, guid: 75e62f81b433ce541866b37242f0317c, type: 3} - target: {fileID: 1635669704753822050, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -536,7 +536,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 2330426468125588075, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -601,7 +601,7 @@ PrefabInstance: - target: {fileID: 2689368185008525424, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 2689368185008525424, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -612,7 +612,7 @@ PrefabInstance: - target: {fileID: 2689368185518094908, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 2689368185518094908, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -623,7 +623,7 @@ PrefabInstance: - target: {fileID: 2689368185795001053, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 2689368185795001053, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -634,7 +634,7 @@ PrefabInstance: - target: {fileID: 2689368186107567793, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 2689368186107567793, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -645,7 +645,7 @@ PrefabInstance: - target: {fileID: 2689368186209629354, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 2689368186209629354, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -656,7 +656,7 @@ PrefabInstance: - target: {fileID: 2689368186419127914, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 2689368186419127914, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -864,7 +864,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -900,42 +900,42 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702814767940876, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702815021412257, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702816120709472, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702816214109051, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4144702816297785787, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 5992766665972216920, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 5992766665972216920, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -957,25 +957,25 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406391272459118, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406391319654371, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406391355087278, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406391359986651, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -987,7 +987,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406391528862144, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1025,19 +1025,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406391799384732, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406391868414044, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1063,7 +1063,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1109,7 +1109,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406392475276570, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1141,13 +1141,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406392559949514, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1173,19 +1173,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406392802564057, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406392981877588, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406393018367830, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1197,19 +1197,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 6778406393079469880, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} - target: {fileID: 6778406393242006453, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 6778406393295568823, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} @@ -1221,37 +1221,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 7771816863518062212, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 7771816863723365444, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 7771816863844477650, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 7771816864104180275, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 7771816864391774366, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + 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 30035568..76c04a7a 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 @@ -618,7 +618,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5408\u8A08" + m_Text: Total --- !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: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} + m_Sprite: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2112,7 +2112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b791b29becec62468fa706ff3a6749a, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index 71e18338..f1ad1c3f 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -1690,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: @@ -1719,9 +1719,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, 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 @@ -1834,7 +1834,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, type: 3} + m_Sprite: {fileID: 21300000, guid: 75e62f81b433ce541866b37242f0317c, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1904,7 +1904,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -1916,13 +1916,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2043,7 +2043,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2055,7 +2055,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2066,7 +2066,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2096,7 +2096,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2108,7 +2108,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4171021028074710842, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2119,7 +2119,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2240,7 +2240,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2252,7 +2252,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2263,7 +2263,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2293,7 +2293,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2305,13 +2305,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2432,7 +2432,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2444,7 +2444,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2455,7 +2455,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2485,7 +2485,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2497,13 +2497,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2624,7 +2624,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2636,7 +2636,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2647,7 +2647,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2677,7 +2677,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2689,13 +2689,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2816,7 +2816,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2828,7 +2828,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2839,7 +2839,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2869,7 +2869,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -2881,13 +2881,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 4878151992627312335, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3008,7 +3008,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3020,7 +3020,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3031,7 +3031,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + objectReference: {fileID: 21300000, guid: dec0e364be2c3634a94960daef0717f4, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3210,7 +3210,7 @@ PrefabInstance: - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 953401080106444321, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3222,7 +3222,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} @@ -3343,7 +3343,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8536603424255746891, 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/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index 9099968d..1d8c5c41 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -145,7 +145,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: eca7336de7c3f644599b5015fe89f168, type: 3} - target: {fileID: 3033445369676262432, guid: a1b406baf09004616b436c242e3a474f, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 5c67f9d1..3c679f5b 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -187,6 +187,32 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &222249497 +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 &368917507 +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!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -270,6 +296,45 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &637449301 +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 &656196728 +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 &692373008 +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!114 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -352,7 +417,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -483,13 +548,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -640,7 +705,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -661,7 +726,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, type: 3} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -760,19 +825,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1122282474 -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!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -848,58 +900,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} ---- !u!114 &1691358241 -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 &1719423565 -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!114 &1904256576 -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 &1960490313 -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!1001 &3078490422721459368 PrefabInstance: m_ObjectHideFlags: 0 @@ -996,12 +996,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, + type: 3} - target: {fileID: 203041986372112404, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1066,7 +1067,7 @@ PrefabInstance: - target: {fileID: 1146852917836568778, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 1146852917836568778, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1077,7 +1078,7 @@ PrefabInstance: - target: {fileID: 1146852918367203974, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 1146852918367203974, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1088,7 +1089,7 @@ PrefabInstance: - target: {fileID: 1146852918627103335, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 1146852918627103335, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1099,7 +1100,7 @@ PrefabInstance: - target: {fileID: 1146852918952121867, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 1146852918952121867, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1110,7 +1111,7 @@ PrefabInstance: - target: {fileID: 1146852919051402256, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 1146852919051402256, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1121,7 +1122,7 @@ PrefabInstance: - target: {fileID: 1146852919246646992, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 1146852919246646992, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1133,37 +1134,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 1386000354375716278, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 1386000354625644315, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 1386000355740936666, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 1386000355848848321, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 1386000355901493505, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, type: 3} - target: {fileID: 1757697754891812348, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1349,7 +1350,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, + objectReference: {fileID: 21300000, guid: b40ce4fb7f271894ebdfdd639524cded, type: 3} - target: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1361,17 +1362,23 @@ PrefabInstance: propertyPath: m_AdditionalShaderChannelsFlag value: 25 objectReference: {fileID: 0} + - target: {fileID: 3148737408544323659, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} - target: {fileID: 3971030752033893388, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, + objectReference: {fileID: 21300000, guid: 75e62f81b433ce541866b37242f0317c, type: 3} - target: {fileID: 4265797366405192145, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1428,37 +1435,37 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 4711878981980077630, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 4711878982179515646, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 4711878982293283432, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 4711878982570517129, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 4711878982853265444, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, + objectReference: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} - target: {fileID: 5255014595623885689, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1475,42 +1482,79 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, + objectReference: {fileID: 21300000, guid: 3052cb7c475b29f40aed46c23712956a, + type: 3} + - target: {fileID: 6758377365589220451, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} + - target: {fileID: 6758377365838755534, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} + - target: {fileID: 6758377366098884143, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} + - target: {fileID: 6758377366326110841, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} + - target: {fileID: 6758377366513596601, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, + type: 3} + - target: {fileID: 6758377366687994530, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a52460eae9e20e84e98151f6e5807b2d, + type: 3} - target: {fileID: 8406322788130518425, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8406322788165944276, guid: 667a93fb2929943078b944050cddd464, 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} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8406322788219638036, guid: 667a93fb2929943078b944050cddd464, 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} @@ -1536,19 +1580,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8406322788681368102, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8406322788744466662, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1574,7 +1618,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1620,7 +1664,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1646,13 +1690,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8406322789441811918, guid: 667a93fb2929943078b944050cddd464, 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} @@ -1678,42 +1722,42 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8406322789691465571, guid: 667a93fb2929943078b944050cddd464, 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} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8406322789951364994, guid: 667a93fb2929943078b944050cddd464, 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} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + objectReference: {fileID: 21300000, guid: b6d6cdc5498743040bcdf23b3780fa0d, type: 3} - target: {fileID: 8406322790122289935, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 21300000, guid: 4e524d6b9475e7c4b92a8e55779dd2bd, type: 3} - target: {fileID: 8760182090298572002, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Text - value: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + value: Recipes exchange by watching videos objectReference: {fileID: 0} - target: {fileID: 8760182090298572002, guid: 667a93fb2929943078b944050cddd464, type: 3} diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 9b9ac774..22e8b57f 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -69,7 +69,7 @@ MonoBehaviour: - Material_zh/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - Material_zh/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - Material_ko/marketing/marketing_background_Signboard_EarlyType_ko[marketing_background_Signboard_EarlyType_ko] - - + - Material_en/marketing/marketing_background_Signboard_EarlyType_en[marketing_background_Signboard_EarlyType_en] Flags: 0000000000 Languages_Touch: [] - Term: marketing_background_Signboard_Second @@ -80,7 +80,7 @@ MonoBehaviour: - Material_zh/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - Material_zh/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - Material_ko/marketing/marketing_background_Signboard_Second_ko[marketing_background_Signboard_Second_ko] - - + - Material_en/marketing/marketing_background_Signboard_Second_en[marketing_background_Signboard_Second_en] Flags: 0000000000 Languages_Touch: [] - Term: marketing_background_Signboard_Tasting @@ -102,7 +102,7 @@ MonoBehaviour: - Material_zh/marketing/marketing_cart_closed_zh[marketing_cart_closed_zh] - Material_zh/marketing/marketing_cart_closed_zh[marketing_cart_closed_zh] - Material_ko/marketing/marketing_cart_closed_ko[marketing_cart_closed_ko] - - + - Material_en/marketing/marketing_cart_closed_en[marketing_cart_closed_en] Flags: 0000000000 Languages_Touch: [] - Term: marketing_cart_logo_Dither @@ -113,7 +113,7 @@ MonoBehaviour: - Material_zh/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] - Material_zh/marketing/marketing_cart_logo_zh_Dither[marketing_cart_logo_zh_Dither] - Material_ko/marketing/marketing_cart_logo_ko_Dither[marketing_cart_logo_ko_Dither] - - + - Material_en/marketing/marketing_cart_logo_en_Dither[marketing_cart_logo_en_Dither] Flags: 0000000000 Languages_Touch: [] - Term: marketing_cart_logo_EarlyType_Dither @@ -124,7 +124,7 @@ MonoBehaviour: - Material_zh/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] - Material_zh/marketing/marketing_cart_logo_EarlyType_zh_Dither[marketing_cart_logo_EarlyType_zh_Dither] - Material_ko/marketing/marketing_cart_logo_EarlyType_ko_Dither[marketing_cart_logo_EarlyType_ko_Dither] - - + - Material_en/marketing/marketing_cart_logo_EarlyType_en_Dither[marketing_cart_logo_EarlyType_en_Dither] Flags: 0000000000 Languages_Touch: [] - Term: marketing_cart_logo_Second_Dither @@ -135,7 +135,7 @@ MonoBehaviour: - Material_zh/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - Material_zh/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - Material_ko/marketing/marketing_cart_logo_Second_ko_Dither[marketing_cart_logo_Second_ko_Dither] - - + - Material_en/marketing/marketing_cart_logo_Second_en_Dither[marketing_cart_logo_Second_en_Dither] Flags: 0000000000 Languages_Touch: [] - Term: shopping_background_title_logo @@ -399,7 +399,7 @@ MonoBehaviour: - Material_zh/Main/Mission/ui_Main_Mission_icon_Achievement_zh[ui_Main_Mission_icon_Achievement_zh] - Material_zh/Main/Mission/ui_Main_Mission_icon_Achievement_zh[ui_Main_Mission_icon_Achievement_zh] - Material_ko/Main/Mission/ui_Main_Mission_icon_Achievement_ko[ui_Main_Mission_icon_Achievement_ko] - - + - Material_en/Main/Mission/ui_Main_Mission_icon_Achievement_en[ui_Main_Mission_icon_Achievement_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_Main_Mission_pop_button_text_daily @@ -1312,7 +1312,7 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_ko[ui_marketing_Customize_icon_decoration2_a_ko] - - + - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en[ui_marketing_Customize_icon_decoration2_a_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_b @@ -1323,7 +1323,7 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_ko[ui_marketing_Customize_icon_decoration2_b_ko] - - + - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en[ui_marketing_Customize_icon_decoration2_b_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_c @@ -1334,7 +1334,7 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_ko[ui_marketing_Customize_icon_decoration2_c_ko] - - + - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en[ui_marketing_Customize_icon_decoration2_c_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_a @@ -1345,7 +1345,7 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_ko[ui_marketing_Customize_icon_signboard_a_ko] - - + - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en[ui_marketing_Customize_icon_signboard_a_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_b @@ -1356,7 +1356,7 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_ko[ui_marketing_Customize_icon_signboard_b_ko] - - + - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en[ui_marketing_Customize_icon_signboard_b_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_c @@ -1367,7 +1367,7 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_ko[ui_marketing_Customize_icon_signboard_c_ko] - - + - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en[ui_marketing_Customize_icon_signboard_c_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_Customize_text_InPlace @@ -1477,7 +1477,7 @@ MonoBehaviour: - Material_zh/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] - Material_zh/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] - Material_ko/marketing/ui_marketing_StockMeter_StocktText_ko[ui_marketing_StockMeter_StocktText_ko] - - + - Material_en/marketing/ui_marketing_StockMeter_StocktText_en[ui_marketing_StockMeter_StocktText_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_marketing_StoreLevel_explanation_text