diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking.meta new file mode 100644 index 00000000..28e2eddc --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94dca197c6c38924ca35368a6fc7f799 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh.png new file mode 100644 index 00000000..0fe1da55 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh.png.meta new file mode 100644 index 00000000..3162e7a3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: baa2dfb92f59abe48a6e68aa75a533ff +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/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh.png new file mode 100644 index 00000000..04c29bdc Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh.png.meta new file mode 100644 index 00000000..7996d26f --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: fdf5a4f1a34354c4c8879a65ca4513ea +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/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh.png new file mode 100644 index 00000000..d9fd743f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh.png.meta new file mode 100644 index 00000000..97637735 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 5f4586e200a83c5468e083a8e4877840 +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/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh.png new file mode 100644 index 00000000..b7c02557 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh.png.meta new file mode 100644 index 00000000..a253321d --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 92235cad5dd5b994db00c851cd272028 +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/Main/AutomaticCooking/ui_button_icon_empty_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_empty_logo_zh.png new file mode 100644 index 00000000..5ccae62d Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_empty_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_empty_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_empty_logo_zh.png.meta new file mode 100644 index 00000000..0ae4b1e3 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_empty_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0f7e4450b108bd44cb1afa5e416361dc +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/Main/AutomaticCooking/ui_button_icon_receive_logo_zh.png b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_receive_logo_zh.png new file mode 100644 index 00000000..fba3286c Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_receive_logo_zh.png differ diff --git a/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_receive_logo_zh.png.meta b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_receive_logo_zh.png.meta new file mode 100644 index 00000000..9f6d2819 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Material/Main/AutomaticCooking/ui_button_icon_receive_logo_zh.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ca9f58ef3915a324a895278091cb4423 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity index 3b90e507..e4715f5a 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: ca9f58ef3915a324a895278091cb4423, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1049,9 +1049,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 09982b47e2a955a47953ad04ecce1d20, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f4586e200a83c5468e083a8e4877840, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1362,7 +1362,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -1374,7 +1374,7 @@ 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: System/AutoCookCautionMessage --- !u!222 &1707876980975310911 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1625,7 +1625,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b3bb4315d0b662a45ad105284c877349, type: 3} + m_Sprite: {fileID: 21300000, guid: 0f7e4450b108bd44cb1afa5e416361dc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1740,7 +1740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cee098de223b0e547b791a85f878a39f, type: 3} + m_Sprite: {fileID: 21300000, guid: fdf5a4f1a34354c4c8879a65ca4513ea, 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 15855d49..f365b031 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity @@ -778,7 +778,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 7b9f4b6377671b5479597672719d19bc, 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/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 45b96605..b6d13269 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1102,7 +1102,7 @@ MonoBehaviour: Description: Languages: - ui_Main_AutomaticCooking_explanation_text - - + - Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_zh[ui_Main_AutomaticCooking_explanation_text_zh] - - Flags: 00000000 @@ -1112,7 +1112,7 @@ MonoBehaviour: Description: Languages: - ui_Main_AutomaticCooking_explanation_text_Complete - - + - Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_Complete_zh[ui_Main_AutomaticCooking_explanation_text_Complete_zh] - - Flags: 00000000 @@ -1122,7 +1122,7 @@ MonoBehaviour: Description: Languages: - ui_Main_AutomaticCooking_explanation_text_caution - - + - Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_explanation_text_caution_zh[ui_Main_AutomaticCooking_explanation_text_caution_zh] - - Flags: 00000000 @@ -1132,7 +1132,7 @@ MonoBehaviour: Description: Languages: - ui_Main_AutomaticCooking_title_logo - - + - Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_title_logo_zh[ui_Main_AutomaticCooking_title_logo_zh] - - Flags: 00000000 @@ -1152,7 +1152,7 @@ MonoBehaviour: Description: Languages: - ui_button_icon_empty_logo - - + - Material/Main/AutomaticCooking/ui_button_icon_empty_logo_zh[ui_button_icon_empty_logo_zh] - - Flags: 00000000 @@ -1162,7 +1162,7 @@ MonoBehaviour: Description: Languages: - ui_button_icon_receive_logo - - + - Material/Main/AutomaticCooking/ui_button_icon_receive_logo_zh[ui_button_icon_receive_logo_zh] - - Flags: 00000000