diff --git a/popcorn/Assets/MyGame/Resources/FryingPan/FryingPan_usually_Dither.png b/popcorn/Assets/MyGame/Resources/FryingPan/FryingPan_usually_Dither.png index 0c485b28..4a8ff337 100644 Binary files a/popcorn/Assets/MyGame/Resources/FryingPan/FryingPan_usually_Dither.png and b/popcorn/Assets/MyGame/Resources/FryingPan/FryingPan_usually_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png index cc7ce116..aa5b6cde 100644 Binary files a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png and b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resources/Stove/background_cooking.png b/popcorn/Assets/MyGame/Resources/Stove/background_cooking.png new file mode 100644 index 00000000..61272985 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Stove/background_cooking.png differ diff --git a/popcorn/Assets/MyGame/Resources/Stove/background_cooking.png.meta b/popcorn/Assets/MyGame/Resources/Stove/background_cooking.png.meta new file mode 100644 index 00000000..6502d615 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Stove/background_cooking.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 267757b8be4e4e24ba872ae78c021570 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/popcorn/popcorn_corn_usually.png b/popcorn/Assets/MyGame/Resources/popcorn/popcorn_corn_usually.png index eeb1e94c..c8092eb1 100644 Binary files a/popcorn/Assets/MyGame/Resources/popcorn/popcorn_corn_usually.png and b/popcorn/Assets/MyGame/Resources/popcorn/popcorn_corn_usually.png differ diff --git a/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_burnt.png b/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_burnt.png index 1162f02c..4a83888a 100644 Binary files a/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_burnt.png and b/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_burnt.png differ diff --git a/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_simple.png b/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_simple.png index 3935f8b9..8a870d35 100644 Binary files a/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_simple.png and b/popcorn/Assets/MyGame/Resources/popcorn/popcorn_unfinished_simple.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index e50dfd30..bd93405d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -146,7 +146,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 162168169} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.06, z: 0} + m_LocalPosition: {x: 0, y: -0.7, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1448897407} @@ -426,7 +426,7 @@ GameObject: - component: {fileID: 1129457738} - component: {fileID: 1129457739} m_Layer: 0 - m_Name: Stove_Stand + m_Name: background_cooking m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -485,7 +485,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -2 - m_Sprite: {fileID: 21300000, guid: 9c796118ae6e88d40afcb4580b6c3a15, type: 3} + m_Sprite: {fileID: 21300000, guid: 267757b8be4e4e24ba872ae78c021570, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -742,7 +742,7 @@ PrefabInstance: - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalPosition.y - value: 0.25 + value: -0.55 objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3}