diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 8b910f71..d33fe8d1 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -3546,7 +3546,7 @@ PrefabInstance: - target: {fileID: 1453251556377932392, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_Name - value: Controller + value: Pan objectReference: {fileID: 0} - target: {fileID: 1453251556377932393, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Controller.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab similarity index 94% rename from popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Controller.prefab rename to popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab index 17cc246b..3f75f794 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Controller.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab @@ -10,9 +10,10 @@ GameObject: m_Component: - component: {fileID: 1453251556377932393} - component: {fileID: 1453251556377932374} + - component: {fileID: 6246736712845388240} - component: {fileID: 1453251556377932375} m_Layer: 0 - m_Name: Controller + m_Name: Pan m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32,6 +33,7 @@ Transform: - {fileID: 4153689350625529431} - {fileID: 3218397595738205000} - {fileID: 1453251556440263711} + - {fileID: 4247238323914700099} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -48,6 +50,56 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lerpTime: 17.89 +--- !u!212 &6246736712845388240 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1453251556377932392} + 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: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!61 &1453251556377932375 BoxCollider2D: m_ObjectHideFlags: 0 @@ -58,21 +110,21 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.78931236, y: -1.7900486} + m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} + border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 9.2, y: 7.82} - newSize: {x: 7.6, y: 6.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 0.16, y: 0.16} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 10.7786255, y: 9.201298} + m_Size: {x: 0.16, y: 0.16} m_EdgeRadius: 0 --- !u!1 &1453251556405238015 GameObject: @@ -289,6 +341,77 @@ Transform: m_Father: {fileID: 1453251556377932393} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &9079615097348292987 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4247238323914700099} + - component: {fileID: 4685874355392668516} + - component: {fileID: 2853966910811461020} + m_Layer: 0 + m_Name: Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4247238323914700099 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9079615097348292987} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 53.092102, y: 53.092102, z: 53.092102} + m_Children: [] + m_Father: {fileID: 1453251556377932393} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4685874355392668516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9079615097348292987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 722195db1b0214a7ab110e4cf4c2a7ce, type: 3} + m_Name: + m_EditorClassIdentifier: + lerpTime: 17.89 +--- !u!61 &2853966910811461020 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9079615097348292987} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.01752165, y: -0.033450425} + m_SpriteTilingProperty: + border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 1 + serializedVersion: 2 + m_Size: {x: 0.20566246, y: 0.172743} + m_EdgeRadius: 0 --- !u!1001 &6531004224066189 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Controller.prefab.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Controller.prefab.meta rename to popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab.meta