diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_defo_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_defo_Dither.png new file mode 100644 index 00000000..95d4d7e5 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_defo_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_defo_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_defo_Dither.png.meta new file mode 100644 index 00000000..b78df60b --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_defo_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: eec1c209826c64ee992031fcf2063f7b +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/marketing/marketing_cart_logo_defo_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_logo_defo_Dither.png new file mode 100644 index 00000000..d5908209 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_logo_defo_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_logo_defo_Dither.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_logo_defo_Dither.png.meta new file mode 100644 index 00000000..a5c97ebf --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/marketing_cart_logo_defo_Dither.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 4717ef924abc849e18f0fa060a7420d3 +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/marketing/ui_marketing_StockMeter_b_defo.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b_defo.png new file mode 100644 index 00000000..16310c44 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b_defo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b_defo.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b_defo.png.meta new file mode 100644 index 00000000..46678143 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_b_defo.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 689a549b288e841bd8ccd6abedae2cf4 +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/marketing/ui_marketing_StockMeter_defo.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_defo.png new file mode 100644 index 00000000..6e9539be Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_defo.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_defo.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_defo.png.meta new file mode 100644 index 00000000..815099de --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_defo.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 86062d3d3af094019a8a3cb208366af5 +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: 9 + spritePivot: {x: 0.58631194, y: 0.515432} + 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/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index c3ef16b8..29716e06 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1760,7 +1760,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 438315598} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.72, y: -2.45, z: 0} + m_LocalPosition: {x: 3.68, y: -2.45, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 699827849} @@ -1809,7 +1809,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 4 - m_Sprite: {fileID: 21300000, guid: 19e47aa2657cc1f47adfca0ad007a309, type: 3} + m_Sprite: {fileID: 21300000, guid: 86062d3d3af094019a8a3cb208366af5, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -2072,7 +2072,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 456610254} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.32, y: 0.19, z: 0} + m_LocalPosition: {x: -0.22, y: 0.35, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 438315599} @@ -2117,7 +2117,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 39338f73bd1e4f443958fdf6e03d345b, type: 3} + m_Sprite: {fileID: 21300000, guid: 689a549b288e841bd8ccd6abedae2cf4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -7395,7 +7395,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 7dd324e32c7db624e8c74fea88f45ca7, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c2a241c79997427ba36c3cb6e5e3eba, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -13696,7 +13696,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1806801954} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.188, y: -0.97, z: 0} + m_LocalPosition: {x: -0.188, y: -1.039, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 438315599} @@ -19141,7 +19141,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1987982869} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.39, y: 3.05, z: 0} + m_LocalPosition: {x: -0.39, y: 3.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1482901211} @@ -19186,7 +19186,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 6 - m_Sprite: {fileID: 21300000, guid: cee29e082ddcf9743ab95cb745d03b2f, type: 3} + m_Sprite: {fileID: 21300000, guid: 4717ef924abc849e18f0fa060a7420d3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0