diff --git a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png similarity index 100% rename from popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png rename to popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png diff --git a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png.meta b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png.meta rename to popcorn/Assets/MyGame/Resources/Stove/Stove_usually_Dither.png.meta diff --git a/popcorn/Assets/MyGame/Resources/UI.meta b/popcorn/Assets/MyGame/Resources/UI.meta new file mode 100644 index 00000000..21b70fb8 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9674aff1c4b852649b5048244a9d7610 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 486a850b..d3ab6f3a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -121,6 +121,87 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &162168169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 162168170} + - component: {fileID: 162168171} + m_Layer: 0 + m_Name: Stove + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &162168170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_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 &162168171 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 162168169} + 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: -1 + m_Sprite: {fileID: 21300000, guid: f9cd635480d222f42a428758b5be7ede, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.8, y: 7.18} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &420543913 GameObject: m_ObjectHideFlags: 0 @@ -172,7 +253,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} + m_ReferenceResolution: {x: 1242, y: 2208} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 @@ -213,7 +294,7 @@ RectTransform: m_Children: - {fileID: 676036207} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -284,7 +365,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &676036206 GameObject: @@ -334,6 +415,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3d5a5f132babc4b3e9790ccbeb891054, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1448897406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1448897407} + m_Layer: 0 + m_Name: ' cooking' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1448897407 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1448897406} + 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: + - {fileID: 162168170} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1673325601 GameObject: m_ObjectHideFlags: 0 @@ -378,7 +490,7 @@ Camera: far clip plane: 10 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 11.04 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -462,7 +574,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 14 + orthographic size: 11.04 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -525,6 +637,21 @@ PrefabInstance: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_LocalPosition.x