diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker.png new file mode 100644 index 00000000..a7bf5bf4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker.png.meta new file mode 100644 index 00000000..7b88a174 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c77cb9fe16eb1374aa3691469f598efc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker_a.png b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker_a.png new file mode 100644 index 00000000..efdef76f Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker_a.png.meta new file mode 100644 index 00000000..c4e9fc10 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Brother/marketing_salesclerk_pink_Loudspeaker_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 26444ef9b72c44c48b8ed98b7b1d048b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/UI.meta b/popcorn/Assets/MyGame/Resource/UI.meta index d34f88c0..bfb996eb 100644 --- a/popcorn/Assets/MyGame/Resource/UI.meta +++ b/popcorn/Assets/MyGame/Resource/UI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13fe992b435df9645b6d4d5a4da31161 +guid: bf58b6320372c214e8c208fa6e142bdb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/popcorn/Assets/MyGame/Resource/UI/Prefabs.meta b/popcorn/Assets/MyGame/Resource/UI/Prefabs.meta index 257d8a56..4d3a687f 100644 --- a/popcorn/Assets/MyGame/Resource/UI/Prefabs.meta +++ b/popcorn/Assets/MyGame/Resource/UI/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a249a4f2dee8ece4e8a5ab6cfd9a23b2 +guid: fa0975659d13ed947b3df380fe999f54 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/popcorn/Assets/MyGame/Resource/UI/old.meta b/popcorn/Assets/MyGame/Resource/UI/old.meta index 5c8dbc08..d83e38d7 100644 --- a/popcorn/Assets/MyGame/Resource/UI/old.meta +++ b/popcorn/Assets/MyGame/Resource/UI/old.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f950a6a7b6edf846a8f11c426f443dc +guid: 593dfd314fc19d545bc68689dacfe159 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_HowToPlay_Dither.png b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_HowToPlay_Dither.png new file mode 100644 index 00000000..e833dbe2 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_HowToPlay_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_HowToPlay_Dither.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_HowToPlay_Dither.png.meta new file mode 100644 index 00000000..e33a87d2 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_HowToPlay_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 004fade0ce34e974fb146a0502a917cf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_POP_Dither.png b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_POP_Dither.png new file mode 100644 index 00000000..c54a7371 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_POP_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_POP_Dither.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_POP_Dither.png.meta new file mode 100644 index 00000000..e7566a98 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_POP_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9c52c769006fb6a4f8a13f1fda88494a +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: 94, y: 263, z: 191, w: 44} + 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/UI/ui_Settings_explanation_popcorn_Dither.png b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_popcorn_Dither.png new file mode 100644 index 00000000..c32b6941 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_popcorn_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_popcorn_Dither.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_popcorn_Dither.png.meta new file mode 100644 index 00000000..6c18b7c6 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_popcorn_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 964305483ca17b74b9ea433c844492da +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_stock_Dither.png b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_stock_Dither.png new file mode 100644 index 00000000..deac55f7 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_stock_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_stock_Dither.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_stock_Dither.png.meta new file mode 100644 index 00000000..76d08095 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_Settings_explanation_stock_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b9e09ac9e9faab64887df9fe0b51c833 +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: