diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png index 437f7e86..68541b33 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta index 4b7b2c28..49592bd7 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 290, y: 0, z: 48, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png index 5c9de055..c685794a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta index 59dfa86a..4319f06f 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_Client_SpeechBalloon_small.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 93, y: 0, z: 33, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png index 5841d6a6..8ab3a506 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta index e77567f0..dfadb7d5 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 0, y: 123, z: 0, w: 79} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png new file mode 100644 index 00000000..af7cb4aa Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png.meta new file mode 100644 index 00000000..15963a1c --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_POP_detail_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e92598e171a04834897b190153055214 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 321, z: 0, w: 48} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png index 9cd9ae5e..94ec82f1 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta index c00e2f70..eaf35a15 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_Dither.png.meta @@ -46,8 +46,8 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 249, z: 0, w: 300} - spriteGenerateFallbackPhysicsShape: 1 + spriteBorder: {x: 80, y: 80, z: 80, w: 80} + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -71,6 +71,42 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png new file mode 100644 index 00000000..13a01f42 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png.meta new file mode 100644 index 00000000..e68a7949 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_a_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 59d6a2ebb2c0cbc44ad8d93d10029d58 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 111, y: 0, z: 111, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png new file mode 100644 index 00000000..87654db4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png.meta new file mode 100644 index 00000000..a202c96a --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detailFrame_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: eb5e5db8989e480449c34d6520a88a98 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 30, z: 0, w: 184} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png index d6c87801..fdc7898b 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta index 4fb4e5e9..8d0dc529 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 0, y: 184, z: 0, w: 101} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png new file mode 100644 index 00000000..a07ce0fd Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png.meta new file mode 100644 index 00000000..4e042935 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Frame_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 378448de62cf2ef45aef2a088bf13a1e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 80, y: 80, z: 80, w: 80} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png deleted file mode 100644 index 0ef44a9e..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png new file mode 100644 index 00000000..61e2c0e9 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png.meta similarity index 97% rename from popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png.meta index 03721922..d3d4fdd9 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 430, y: 13, z: 9, w: 13} + spriteBorder: {x: 377, y: 13, z: 22, w: 13} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index a6cfa8d2..614a940c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -1506,6 +1506,7 @@ GameObject: - component: {fileID: 359927433} - component: {fileID: 359927432} - component: {fileID: 359927431} + - component: {fileID: 359927434} m_Layer: 5 m_Name: Button_off m_TagString: Untagged @@ -1613,6 +1614,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 359927429} m_CullTransparentMesh: 0 +--- !u!114 &359927434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359927429} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &387626331 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 51229c5d..36846780 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -30,11 +30,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4082915278031755625} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 691} + m_AnchoredPosition: {x: 0, y: 779} m_SizeDelta: {x: 366, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277424874094 @@ -109,7 +109,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 922, y: 1498} + m_SizeDelta: {x: 922, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277521603128 CanvasRenderer: @@ -139,7 +139,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9816e10bc2e71ae42a20e3ef6e107d19, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -668,6 +668,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1108653143504097850} + - {fileID: 5030323268344160145} - {fileID: 4082915278229527154} - {fileID: 4082915279116682333} - {fileID: 4082915278864071265} @@ -675,7 +677,7 @@ RectTransform: - {fileID: 4082915278280054884} - {fileID: 4082915278992014894} m_Father: {fileID: 4082915278546610718} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -877,11 +879,11 @@ RectTransform: - {fileID: 7325254816105691106} - {fileID: 7325254816271539690} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -119} m_SizeDelta: {x: 1000, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4082915278229527152 @@ -913,7 +915,7 @@ MonoBehaviour: m_Padding: m_Left: -500 m_Right: 0 - m_Top: -740 + m_Top: -914 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: -100 @@ -955,11 +957,11 @@ RectTransform: - {fileID: 4082915278942985864} - {fileID: 4082915279019759820} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -413} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 354} m_SizeDelta: {x: 0, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4082915278280054938 @@ -1029,14 +1031,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4082915277521603130} + - {fileID: 9178891399397225713} - {fileID: 4082915278031755625} m_Father: {fileID: 4082915279371560212} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 922, y: 1498} + m_AnchoredPosition: {x: 0, y: 52} + m_SizeDelta: {x: 922, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915278807493231 GameObject: @@ -1217,11 +1220,11 @@ RectTransform: - {fileID: 4082915277900228848} - {fileID: 4082915278008547937} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 2 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1, y: -259} + m_AnchoredPosition: {x: 1, y: -338} m_SizeDelta: {x: 730, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915278879672978 @@ -1467,11 +1470,11 @@ RectTransform: m_Children: - {fileID: 4082915279112502090} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 156} + m_AnchoredPosition: {x: 0, y: 168} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278992014883 @@ -1963,11 +1966,11 @@ RectTransform: - {fileID: 4082915279204653795} - {fileID: 4082915277970689978} m_Father: {fileID: 4082915278031755625} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 547} + m_AnchoredPosition: {x: 0, y: 635} m_SizeDelta: {x: 720, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915279204653804 @@ -2035,7 +2038,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 2a7bf22a7dc92d242b6e7dcd6647cc6f, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2238,6 +2241,228 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &5089618811158251263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9178891399397225713} + - component: {fileID: 5023734004673988866} + - component: {fileID: 3097705197763176933} + m_Layer: 5 + m_Name: Window_mat_detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9178891399397225713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089618811158251263} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4082915278546610718} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 66} + m_SizeDelta: {x: 818, y: 1310} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5023734004673988866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089618811158251263} + m_CullTransparentMesh: 0 +--- !u!114 &3097705197763176933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089618811158251263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e92598e171a04834897b190153055214, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5269593934005782374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5030323268344160145} + - component: {fileID: 1744485631078531303} + - component: {fileID: 7721293545209984243} + m_Layer: 5 + m_Name: lineUnder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5030323268344160145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5269593934005782374} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4082915278031755625} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -267.5} + m_SizeDelta: {x: 760, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1744485631078531303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5269593934005782374} + m_CullTransparentMesh: 0 +--- !u!114 &7721293545209984243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5269593934005782374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: befe49c03955d3642a335e511312e1ba, type: 3} + m_Type: 2 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8469412328290291956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1108653143504097850} + - component: {fileID: 4878617007304336867} + - component: {fileID: 7576376462711902748} + m_Layer: 5 + m_Name: lineUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1108653143504097850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8469412328290291956} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4082915278031755625} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 563} + m_SizeDelta: {x: 760, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4878617007304336867 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8469412328290291956} + m_CullTransparentMesh: 0 +--- !u!114 &7576376462711902748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8469412328290291956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: befe49c03955d3642a335e511312e1ba, type: 3} + m_Type: 2 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1001 &751013265656328038 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index 25744783..3de335f5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -129,8 +129,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 234} - m_SizeDelta: {x: 900, y: 850} + m_AnchoredPosition: {x: 0, y: 145} + m_SizeDelta: {x: 900, y: 1020} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2377818823009469882 GameObject: @@ -517,7 +517,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818823262257511} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -526,7 +526,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -239} + m_AnchoredPosition: {x: 0, y: -149.99994} m_SizeDelta: {x: 705, y: 680} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823262257506 @@ -1564,7 +1564,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818824260807142} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1576,7 +1576,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -158.00005} + m_AnchoredPosition: {x: 0, y: -68.999985} m_SizeDelta: {x: 704, y: 794} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &2377818824260807140 @@ -1764,7 +1764,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2377818824381547239} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1776,7 +1776,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 293} + m_AnchoredPosition: {x: 0, y: 381.99994} m_SizeDelta: {x: 876, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824381547234 @@ -1807,7 +1807,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 047c28dcec3cfef4b83693f782e71e6e, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index f7fd77c3..403fb592 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -1037,7 +1037,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 047c28dcec3cfef4b83693f782e71e6e, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 20160476..a3c3f477 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -522,8 +522,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -55.799988, y: -23} - m_SizeDelta: {x: 260, y: 130} + m_AnchoredPosition: {x: -29.5, y: -16.3} + m_SizeDelta: {x: 200, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3658417434518209424 GameObject: @@ -637,7 +637,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 98} + m_SizeDelta: {x: 200, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3658417434522814402 CanvasRenderer: @@ -847,7 +847,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 98} + m_SizeDelta: {x: 200, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3658417434859902286 CanvasRenderer: @@ -922,7 +922,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -147, y: 1} + m_AnchoredPosition: {x: -133, y: -23} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3658417435668626830 @@ -1182,7 +1182,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7130003} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -272, y: 11.5} + m_AnchoredPosition: {x: -231, y: -10} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890202353341283 @@ -1256,8 +1256,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -53.299988, y: 68} - m_SizeDelta: {x: 250, y: 50} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890202664346919 CanvasRenderer: @@ -1288,18 +1288,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 23 - m_FontStyle: 0 + m_FontSize: 25 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 23 + m_MaxSize: 25 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3" + m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &6701890202804983462 GameObject: m_ObjectHideFlags: 0 @@ -1333,7 +1333,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -271.8, y: -66} + m_AnchoredPosition: {x: -230.79999, y: -87.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6701890202901161254 @@ -1845,7 +1845,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 161, y: -98.8} + m_AnchoredPosition: {x: 32.2, y: -162.5} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8120304310888387125 @@ -2040,7 +2040,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 500, y: -376} - m_SizeDelta: {x: 720, y: 200} + m_SizeDelta: {x: 660, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2702520058299168695 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 1774f6ec..db2c15a5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -2817,7 +2817,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 111} + m_AnchoredPosition: {x: 0, y: 104} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639677226913018 @@ -2950,7 +2950,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 411} + m_AnchoredPosition: {x: 0, y: 412} m_SizeDelta: {x: 800, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2660639677480706702 @@ -2983,7 +2983,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -3459,7 +3459,7 @@ RectTransform: - {fileID: 2660639677480706696} - {fileID: 2660639678889033266} m_Father: {fileID: 2660639678456833894} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3806,6 +3806,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2660639678600407771} + - {fileID: 2799355392464177233} + - {fileID: 3875781502700277686} - {fileID: 2660639677971123135} m_Father: {fileID: 2660639679028779574} m_RootOrder: 1 @@ -4162,7 +4164,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -62} + m_AnchoredPosition: {x: 0, y: -69} m_SizeDelta: {x: 900, y: 880} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5142847172670219607 @@ -6256,6 +6258,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 10000 +--- !u!1 &5526035085733857660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3875781502700277686} + - component: {fileID: 2369406120133834676} + - component: {fileID: 4136380041265909428} + m_Layer: 5 + m_Name: Window_mat_Decoration + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3875781502700277686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526035085733857660} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2660639678456833894} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 648} + m_SizeDelta: {x: 750, y: 114} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2369406120133834676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526035085733857660} + m_CullTransparentMesh: 0 +--- !u!114 &4136380041265909428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5526035085733857660} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 59d6a2ebb2c0cbc44ad8d93d10029d58, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5720778789336431229 GameObject: m_ObjectHideFlags: 0 @@ -7670,6 +7746,80 @@ RectTransform: m_AnchoredPosition: {x: -7.0000105, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8142119222429364452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2799355392464177233} + - component: {fileID: 6047797878840319401} + - component: {fileID: 4459002468787055795} + m_Layer: 5 + m_Name: Window_mat_detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2799355392464177233 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8142119222429364452} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2660639678456833894} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 41} + m_SizeDelta: {x: 935, y: 1180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6047797878840319401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8142119222429364452} + m_CullTransparentMesh: 0 +--- !u!114 &4459002468787055795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8142119222429364452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: eb5e5db8989e480449c34d6520a88a98, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8173313593566145802 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab index 7ff30b5f..bfffc280 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_histoy.prefab @@ -433,6 +433,7 @@ GameObject: - component: {fileID: 6878252345190694867} - component: {fileID: 6878252345190694866} - component: {fileID: 6878252345190694869} + - component: {fileID: 4727775471500652942} m_Layer: 0 m_Name: Button m_TagString: Untagged @@ -539,6 +540,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4727775471500652942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878252345190694871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &6878252345214281169 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index fd93c3dc..ff9e8417 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -95.8, y: -22.3} + m_AnchoredPosition: {x: -68.500015, y: -44.700024} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6556948699061727839 @@ -116,7 +116,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 444, y: 200} + m_SizeDelta: {x: 410, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5776310992788139834 CanvasRenderer: @@ -322,7 +322,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -135.2, y: 20.8} + m_AnchoredPosition: {x: -107.9, y: -1.6} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932626576346094 @@ -395,7 +395,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -135, y: -66} + m_AnchoredPosition: {x: -107.70001, y: -88.400024} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2929932626752093613 @@ -432,8 +432,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 83.5, y: 68} - m_SizeDelta: {x: 250, y: 50} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 380, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932626752093610 CanvasRenderer: @@ -464,18 +464,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 23 - m_FontStyle: 0 + m_FontSize: 25 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 23 + m_MaxSize: 25 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3" + m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &2929932626910560294 GameObject: m_ObjectHideFlags: 0 @@ -666,7 +666,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 444, y: 200} + m_SizeDelta: {x: 410, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5490177795204899762 MonoBehaviour: @@ -725,7 +725,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -100} + m_AnchoredPosition: {x: 0, y: -129.2} m_SizeDelta: {x: 172, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3788395727770399120 @@ -803,7 +803,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 444, y: 200} + m_SizeDelta: {x: 410, y: 264} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3458940277878489447 CanvasRenderer: @@ -877,8 +877,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 81, y: -23} - m_SizeDelta: {x: 260, y: 130} + m_AnchoredPosition: {x: 91.8, y: -24} + m_SizeDelta: {x: 180, y: 190} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6592824682905068701 GameObject: @@ -1152,7 +1152,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -98.80005 + value: -93 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1335,12 +1335,12 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.x - value: 161 + value: 33.199997 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -98.8 + value: -158.4 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1529,7 +1529,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -34.2 + value: -29.4 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 799bd0e3..0c26b1a9 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -152,14 +152,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 28991872} - - {fileID: 1578250478} m_Father: {fileID: 203585998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -11.799988, y: 0} - m_SizeDelta: {x: -42.699986, y: 0} + m_AnchoredPosition: {x: -11.799988, y: 17.899994} + m_SizeDelta: {x: -42.69995, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &25421136 MonoBehaviour: @@ -259,8 +258,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 13, y: 0} + m_SizeDelta: {x: -4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &28991873 MonoBehaviour: @@ -282,8 +281,8 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 490, y: 300} - m_Spacing: {x: -20, y: -80.5} + m_CellSize: {x: 505.6, y: 100} + m_Spacing: {x: -81.8, y: 180} m_Constraint: 1 m_ConstraintCount: 2 --- !u!114 &28991874 @@ -717,6 +716,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!1 &199954320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 199954321} + - component: {fileID: 199954323} + - component: {fileID: 199954322} + m_Layer: 0 + m_Name: Window_mat_detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &199954321 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199954320} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 329292690} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 930, y: 930} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &199954322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199954320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 378448de62cf2ef45aef2a088bf13a1e, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &199954323 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 199954320} + m_CullTransparentMesh: 0 --- !u!1 &203585997 GameObject: m_ObjectHideFlags: 0 @@ -749,6 +822,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 25421135} + - {fileID: 1578250478} - {fileID: 409545282} m_Father: {fileID: 1455181832} m_RootOrder: 1 @@ -756,7 +830,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 34, y: 48} - m_SizeDelta: {x: 998.8, y: 780} + m_SizeDelta: {x: 998.8, y: 844.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &203585999 MonoBehaviour: @@ -873,7 +947,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 47} m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 0} --- !u!114 &277152054 @@ -941,13 +1015,14 @@ RectTransform: m_LocalScale: {x: 0.85, y: 0.85, z: 0.85} m_Children: - {fileID: 1594398330} + - {fileID: 199954321} - {fileID: 1455181832} m_Father: {fileID: 111842754} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 49} + m_AnchoredPosition: {x: 0, y: 75} m_SizeDelta: {x: 1186, y: 1310} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &384598190 stripped @@ -988,11 +1063,11 @@ RectTransform: m_Children: - {fileID: 1062067456} m_Father: {fileID: 203585998} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -20, y: 0} m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!114 &409545283 @@ -1112,7 +1187,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1122,17 +1197,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1172,12 +1247,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 676.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -330 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1479,7 +1554,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1489,17 +1564,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1539,12 +1614,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 252.8 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -330 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1661,7 +1736,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -477} + m_AnchoredPosition: {x: 0, y: -507} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &968322477 @@ -2353,7 +2428,7 @@ RectTransform: - {fileID: 203585998} - {fileID: 968322476} m_Father: {fileID: 329292690} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2575,7 +2650,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -153} + m_AnchoredPosition: {x: 0, y: -99} m_SizeDelta: {x: 404, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 @@ -2645,7 +2720,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2655,17 +2730,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2705,12 +2780,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 676.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2815,17 +2890,17 @@ RectTransform: m_GameObject: {fileID: 1578250477} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.89998996, y: 1, z: 1} m_Children: - {fileID: 1706201272} - {fileID: 277152053} - m_Father: {fileID: 25421135} + m_Father: {fileID: 203585998} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -33.149994, y: -2.1000366} + m_SizeDelta: {x: -42.69995, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1594398329 GameObject: @@ -2982,7 +3057,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 11} m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1706201273 @@ -3221,7 +3296,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3231,17 +3306,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3281,12 +3356,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 252.8 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -610 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3891,7 +3966,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3901,17 +3976,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 505.6 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3951,12 +4026,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 252.8 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3}