diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png b/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png index 904407d4..7d42c198 100644 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png and b/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png.meta index 0f06ea2e..cbb1fd19 100644 --- a/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png.meta +++ b/popcorn/Assets/MyGame/Resource/UI/ui_cooking_TemperatureMeter.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 50, y: 46, z: 50, w: 46} + spriteBorder: {x: 129, y: 46, z: 129, w: 46} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 1b25667b..cd453b41 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -432,17 +432,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 404298883} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.29786387, w: 0.9546083} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1110039801} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 44.1, y: 0} - m_SizeDelta: {x: 62, y: 66} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 34.659} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.5, y: 0} + m_SizeDelta: {x: 48, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &404298885 MonoBehaviour: @@ -463,7 +463,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b3b7877149a08ec4084da937cedc2bf0, type: 3} + m_Sprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2497,6 +2497,80 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &919536236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 919536237} + - component: {fileID: 919536239} + - component: {fileID: 919536238} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &919536237 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919536236} + 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: 1759816008} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -720, y: 66} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &919536238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919536236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 041ad2539ff56d945ab2da4be6a02f04, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &919536239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919536236} + m_CullTransparentMesh: 0 --- !u!1 &934697755 GameObject: m_ObjectHideFlags: 0 @@ -2529,10 +2603,10 @@ RectTransform: m_Father: {fileID: 1488490346} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -46.699997, y: 0} - m_SizeDelta: {x: 62, y: 66} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.5, y: 0} + m_SizeDelta: {x: 67, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &934697757 MonoBehaviour: @@ -2553,7 +2627,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de3039dcec529e24e9e46cbcb91e6609, type: 3} + m_Sprite: {fileID: 21300000, guid: a9d669186411b2b4da1511f59a91b4c9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8722,7 +8796,8 @@ RectTransform: 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_Children: + - {fileID: 919536237} m_Father: {fileID: 1693325335} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}