diff --git a/popcorn/Assets/MyGame/Resources/FryingPan/FryingPan_usually_Dither.png b/popcorn/Assets/MyGame/Resources/FryingPan/FryingPan_usually_Dither.png index a907e79b..0c485b28 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 03e7302f..cc7ce116 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/Stove_usually_Stand.png b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Stand.png new file mode 100644 index 00000000..352bda85 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Stand.png differ diff --git a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Stand.png.meta b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Stand.png.meta new file mode 100644 index 00000000..ab75227b --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Stand.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9c796118ae6e88d40afcb4580b6c3a15 +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/UI.meta b/popcorn/Assets/MyGame/Resources/UI.meta deleted file mode 100644 index 21b70fb8..00000000 --- a/popcorn/Assets/MyGame/Resources/UI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9674aff1c4b852649b5048244a9d7610 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab b/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab index 7e89b3d1..da0a9859 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Controller.prefab @@ -91,7 +91,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.2, y: 0.2} + m_Size: {x: 7.6, y: 6.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -114,8 +114,8 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 7.6, y: 6.5} - newSize: {x: 0.2, y: 0.2} + oldSize: {x: 8.74, y: 7.4} + newSize: {x: 7.6, y: 6.5} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index d3ab6f3a..e50dfd30 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -146,11 +146,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 162168169} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1448897407} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &162168171 SpriteRenderer: @@ -415,6 +415,87 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d5a5f132babc4b3e9790ccbeb891054, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1129457737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1129457738} + - component: {fileID: 1129457739} + m_Layer: 0 + m_Name: Stove_Stand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1129457738 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129457737} + 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: 1448897407} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1129457739 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129457737} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -2 + m_Sprite: {fileID: 21300000, guid: 9c796118ae6e88d40afcb4580b6c3a15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 12.42, y: 8.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1448897406 GameObject: m_ObjectHideFlags: 0 @@ -442,6 +523,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1129457738} - {fileID: 162168170} m_Father: {fileID: 0} m_RootOrder: 3 @@ -655,12 +737,12 @@ PrefabInstance: - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.81 objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.25 objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3}