From b53b24c9648bbe8a2c0de3d3ba32d72cc323a787 Mon Sep 17 00:00:00 2001 From: Sc0rch-thinks Date: Thu, 8 Aug 2024 14:22:58 +0800 Subject: [PATCH] game:add raycast and door functionality --- .../Assets/Prefabs/AIPerson.prefab | 170 ++--- .../kitchenCounterCabinateLarge.prefab | 579 +++++++++++++----- .../Assets/Scenes/SampleScene.unity | 231 ++++++- RunningLateGame/Assets/Scripts/AiCar.cs | 1 - RunningLateGame/Assets/Scripts/Door.cs | 86 +++ RunningLateGame/Assets/Scripts/Door.cs.meta | 11 + .../Assets/Scripts/Interactable.cs | 11 + .../Assets/Scripts/Interactable.cs.meta | 11 + RunningLateGame/Assets/Scripts/Player.cs | 42 ++ RunningLateGame/Assets/Scripts/Player.cs.meta | 11 + .../InputSystem/StarterAssets.inputactions | 32 +- .../ProjectSettings/TagManager.asset | 1 + 12 files changed, 965 insertions(+), 221 deletions(-) create mode 100644 RunningLateGame/Assets/Scripts/Door.cs create mode 100644 RunningLateGame/Assets/Scripts/Door.cs.meta create mode 100644 RunningLateGame/Assets/Scripts/Interactable.cs create mode 100644 RunningLateGame/Assets/Scripts/Interactable.cs.meta create mode 100644 RunningLateGame/Assets/Scripts/Player.cs create mode 100644 RunningLateGame/Assets/Scripts/Player.cs.meta diff --git a/RunningLateGame/Assets/Prefabs/AIPerson.prefab b/RunningLateGame/Assets/Prefabs/AIPerson.prefab index 6c5e12d..c43347c 100644 --- a/RunningLateGame/Assets/Prefabs/AIPerson.prefab +++ b/RunningLateGame/Assets/Prefabs/AIPerson.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3962373163873555533} - m_Layer: 0 + m_Layer: 8 m_Name: UpperChest m_TagString: Untagged m_Icon: {fileID: 0} @@ -43,7 +43,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5366619559905680836} - m_Layer: 0 + m_Layer: 8 m_Name: Left_ThumbProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -75,7 +75,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5195416362117146787} - m_Layer: 0 + m_Layer: 8 m_Name: Right_IndexDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -107,7 +107,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7011579125444701837} - m_Layer: 0 + m_Layer: 8 m_Name: Right_Foot m_TagString: Untagged m_Icon: {fileID: 0} @@ -139,7 +139,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2967114082343032010} - m_Layer: 0 + m_Layer: 8 m_Name: Left_RingIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -171,7 +171,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 619963659087793168} - m_Layer: 0 + m_Layer: 8 m_Name: Left_ToesEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -202,7 +202,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6176244484961473445} - m_Layer: 0 + m_Layer: 8 m_Name: Right_ThumbDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -234,7 +234,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3958877502865080117} - m_Layer: 0 + m_Layer: 8 m_Name: Right_RingProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -266,7 +266,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3256206865120322462} - m_Layer: 0 + m_Layer: 8 m_Name: Right_UpperLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -298,7 +298,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3022810626484931941} - m_Layer: 0 + m_Layer: 8 m_Name: Left_PinkyDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -329,7 +329,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7000854119521611830} - m_Layer: 0 + m_Layer: 8 m_Name: Right_PinkyDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -360,7 +360,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3102589634804902018} - m_Layer: 0 + m_Layer: 8 m_Name: Right_MiddleDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -392,7 +392,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8006069385987109679} - m_Layer: 0 + m_Layer: 8 m_Name: Left_PinkyDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -424,7 +424,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7711739447253320690} - m_Layer: 0 + m_Layer: 8 m_Name: Left_ThumbIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -456,7 +456,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4642519068789186343} - m_Layer: 0 + m_Layer: 8 m_Name: Left_ThumbDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -487,7 +487,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8505802208921458619} - m_Layer: 0 + m_Layer: 8 m_Name: Left_Shoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -519,7 +519,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6176260713218820384} - m_Layer: 0 + m_Layer: 8 m_Name: Left_IndexIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -551,7 +551,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4798944858724247461} - m_Layer: 0 + m_Layer: 8 m_Name: Left_Toes m_TagString: Untagged m_Icon: {fileID: 0} @@ -583,7 +583,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8121175322163774821} - m_Layer: 0 + m_Layer: 8 m_Name: Right_ThumbDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -614,7 +614,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6715762529278451360} - m_Layer: 0 + m_Layer: 8 m_Name: Left_LowerLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -646,7 +646,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 240426543223473328} - m_Layer: 0 + m_Layer: 8 m_Name: Right_Shoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -678,7 +678,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7013896188592591812} - m_Layer: 0 + m_Layer: 8 m_Name: Right_Eye m_TagString: Untagged m_Icon: {fileID: 0} @@ -709,7 +709,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8419262013088509369} - m_Layer: 0 + m_Layer: 8 m_Name: Left_MiddleIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -741,7 +741,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7554148478423152539} - m_Layer: 0 + m_Layer: 8 m_Name: Skeleton m_TagString: Untagged m_Icon: {fileID: 0} @@ -773,7 +773,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5152687755362031986} - m_Layer: 0 + m_Layer: 8 m_Name: Right_PinkyIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -808,7 +808,7 @@ GameObject: - component: {fileID: 8179579322411983252} - component: {fileID: 3313027092289172340} - component: {fileID: 4317789146800536370} - m_Layer: 0 + m_Layer: 8 m_Name: AIPerson m_TagString: Untagged m_Icon: {fileID: 0} @@ -891,7 +891,7 @@ NavMeshAgent: m_Height: 1.7 m_BaseOffset: -0.08 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 0 + m_ObstacleAvoidanceType: 3 --- !u!1 &3344627563321929878 GameObject: m_ObjectHideFlags: 0 @@ -901,7 +901,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2019904226317147332} - m_Layer: 0 + m_Layer: 8 m_Name: Hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -935,7 +935,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5621204117401932109} - m_Layer: 0 + m_Layer: 8 m_Name: Right_PinkyProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -967,7 +967,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8699388891600528951} - m_Layer: 0 + m_Layer: 8 m_Name: Right_PinkyDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1000,7 +1000,8 @@ GameObject: m_Component: - component: {fileID: 3787934284119550692} - component: {fileID: 4366289886226962748} - m_Layer: 0 + - component: {fileID: 878280137332734117} + m_Layer: 8 m_Name: Armature_Mesh m_TagString: Untagged m_Icon: {fileID: 0} @@ -1145,6 +1146,29 @@ SkinnedMeshRenderer: m_Center: {x: -0.000000059604645, y: -0.09214255, z: 0.026248634} m_Extent: {x: 0.52818453, y: 0.88092995, z: 0.22050177} m_DirtyAABB: 0 +--- !u!136 &878280137332734117 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3597841629992087818} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.3 + m_Height: 1.94 + m_Direction: 1 + m_Center: {x: -0.000000059604645, y: 0.88895607, z: 0.010348976} --- !u!1 &3609670818274640614 GameObject: m_ObjectHideFlags: 0 @@ -1154,7 +1178,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 386002690245104799} - m_Layer: 0 + m_Layer: 8 m_Name: Left_IndexProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1186,7 +1210,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4307160147621886750} - m_Layer: 0 + m_Layer: 8 m_Name: Spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -1218,7 +1242,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3524756280673846585} - m_Layer: 0 + m_Layer: 8 m_Name: Right_LowerLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1250,7 +1274,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2839093439733604793} - m_Layer: 0 + m_Layer: 8 m_Name: Left_MiddleDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -1281,7 +1305,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2665005099411226170} - m_Layer: 0 + m_Layer: 8 m_Name: Left_ThumbDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1313,7 +1337,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 236708469217814956} - m_Layer: 0 + m_Layer: 8 m_Name: Left_MiddleDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1345,7 +1369,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3198200789677499350} - m_Layer: 0 + m_Layer: 8 m_Name: Left_RingDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -1376,7 +1400,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4395696606851227240} - m_Layer: 0 + m_Layer: 8 m_Name: Left_RingDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1408,7 +1432,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2772628168277832850} - m_Layer: 0 + m_Layer: 8 m_Name: Right_MiddleIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -1440,7 +1464,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6873904479860966995} - m_Layer: 0 + m_Layer: 8 m_Name: Right_Toes m_TagString: Untagged m_Icon: {fileID: 0} @@ -1472,7 +1496,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1458999189628030197} - m_Layer: 0 + m_Layer: 8 m_Name: Right_MiddleDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -1503,7 +1527,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9029818822408888807} - m_Layer: 0 + m_Layer: 8 m_Name: Right_LowerArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1535,7 +1559,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4905376335019674443} - m_Layer: 0 + m_Layer: 8 m_Name: Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -1568,7 +1592,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6231929811791263041} - m_Layer: 0 + m_Layer: 8 m_Name: Left_PinkyIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -1600,7 +1624,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6431873093560559153} - m_Layer: 0 + m_Layer: 8 m_Name: Geometry m_TagString: Untagged m_Icon: {fileID: 0} @@ -1632,7 +1656,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5914648899255829734} - m_Layer: 0 + m_Layer: 8 m_Name: Left_Hand m_TagString: Untagged m_Icon: {fileID: 0} @@ -1668,7 +1692,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6875777664503365058} - m_Layer: 0 + m_Layer: 8 m_Name: Left_UpperArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -1700,7 +1724,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7707607070409624333} - m_Layer: 0 + m_Layer: 8 m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -1734,7 +1758,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5570644308555133529} - m_Layer: 0 + m_Layer: 8 m_Name: Right_IndexProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1766,7 +1790,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5280399068523713522} - m_Layer: 0 + m_Layer: 8 m_Name: Right_ThumbIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -1798,7 +1822,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1266341608403405616} - m_Layer: 0 + m_Layer: 8 m_Name: Right_RingDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -1829,7 +1853,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1931430260465170871} - m_Layer: 0 + m_Layer: 8 m_Name: Left_UpperLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1861,7 +1885,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2103173100992958261} - m_Layer: 0 + m_Layer: 8 m_Name: Left_MiddleProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -1893,7 +1917,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4922579285560154414} - m_Layer: 0 + m_Layer: 8 m_Name: Right_IndexIntermediate m_TagString: Untagged m_Icon: {fileID: 0} @@ -1925,7 +1949,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7494103683833549261} - m_Layer: 0 + m_Layer: 8 m_Name: Chest m_TagString: Untagged m_Icon: {fileID: 0} @@ -1957,7 +1981,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 249525412801892506} - m_Layer: 0 + m_Layer: 8 m_Name: Left_Foot m_TagString: Untagged m_Icon: {fileID: 0} @@ -1989,7 +2013,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4722492084324317791} - m_Layer: 0 + m_Layer: 8 m_Name: Left_IndexDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -2021,7 +2045,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5780947548475785363} - m_Layer: 0 + m_Layer: 8 m_Name: Right_Hand m_TagString: Untagged m_Icon: {fileID: 0} @@ -2057,7 +2081,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5659422364275761206} - m_Layer: 0 + m_Layer: 8 m_Name: Left_RingProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -2089,7 +2113,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8125889961122125747} - m_Layer: 0 + m_Layer: 8 m_Name: Right_MiddleProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -2121,7 +2145,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1841336346693632138} - m_Layer: 0 + m_Layer: 8 m_Name: Left_IndexDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -2152,7 +2176,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6675638322514576362} - m_Layer: 0 + m_Layer: 8 m_Name: Right_RingDistal m_TagString: Untagged m_Icon: {fileID: 0} @@ -2184,7 +2208,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 322000471187448665} - m_Layer: 0 + m_Layer: 8 m_Name: Left_LowerArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2216,7 +2240,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2117708831132661165} - m_Layer: 0 + m_Layer: 8 m_Name: Neck_Twist_A m_TagString: Untagged m_Icon: {fileID: 0} @@ -2247,7 +2271,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6899658393901547788} - m_Layer: 0 + m_Layer: 8 m_Name: Right_UpperArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2279,7 +2303,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 57764926992391932} - m_Layer: 0 + m_Layer: 8 m_Name: Left_Eye m_TagString: Untagged m_Icon: {fileID: 0} @@ -2310,7 +2334,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2104047543313887036} - m_Layer: 0 + m_Layer: 8 m_Name: Right_ToesEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -2341,7 +2365,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 59252199260487086} - m_Layer: 0 + m_Layer: 8 m_Name: Right_ThumbProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -2373,7 +2397,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3882448417401280913} - m_Layer: 0 + m_Layer: 8 m_Name: Jaw m_TagString: Untagged m_Icon: {fileID: 0} @@ -2404,7 +2428,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1869481168920427225} - m_Layer: 0 + m_Layer: 8 m_Name: Left_PinkyProximal m_TagString: Untagged m_Icon: {fileID: 0} @@ -2436,7 +2460,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5272249139244046494} - m_Layer: 0 + m_Layer: 8 m_Name: Right_IndexDistalEnd m_TagString: Untagged m_Icon: {fileID: 0} @@ -2467,7 +2491,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8701217485302779977} - m_Layer: 0 + m_Layer: 8 m_Name: Right_RingIntermediate m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/RunningLateGame/Assets/Prefabs/kitchenCounterCabinateLarge.prefab b/RunningLateGame/Assets/Prefabs/kitchenCounterCabinateLarge.prefab index 9cd1abf..d4e4abe 100644 --- a/RunningLateGame/Assets/Prefabs/kitchenCounterCabinateLarge.prefab +++ b/RunningLateGame/Assets/Prefabs/kitchenCounterCabinateLarge.prefab @@ -1,117 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &3168702218647024620 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalPosition.x - value: 489.22064 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.0000009536743 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalPosition.z - value: 500.3694 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -3057147933212194604, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 25f214a0122f90f43b9d7c18b1421573, type: 2} - - target: {fileID: -267388480630076389, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 25f214a0122f90f43b9d7c18b1421573, type: 2} - - target: {fileID: 919132149155446097, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_Name - value: kitchenCounterCabinateLarge - objectReference: {fileID: 0} - - target: {fileID: 6586021526396857556, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 25f214a0122f90f43b9d7c18b1421573, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -4069390665337379458, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - insertIndex: -1 - addedObject: {fileID: 5830510307120772111} - - targetCorrespondingSourceObject: {fileID: -413930134452501938, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - insertIndex: -1 - addedObject: {fileID: 7529824132152120585} - - targetCorrespondingSourceObject: {fileID: -5757406101998815754, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - insertIndex: -1 - addedObject: {fileID: 7733882852380317600} - - targetCorrespondingSourceObject: {fileID: -1163416789225216097, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - insertIndex: -1 - addedObject: {fileID: 8936381634242955624} - m_SourcePrefab: {fileID: 100100000, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, type: 3} ---- !u!1 &2008860822826321434 stripped +--- !u!1 &2008860822826321434 GameObject: - m_CorrespondingSourceObject: {fileID: -5757406101998815754, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - m_PrefabInstance: {fileID: 3168702218647024620} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!65 &7733882852380317600 -BoxCollider: + serializedVersion: 6 + m_Component: + - component: {fileID: 5856815492098900995} + - component: {fileID: 7579323334939743443} + - component: {fileID: 6319524955309604855} + m_Layer: 0 + m_Name: doorRight + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5856815492098900995 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2008860822826321434} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.4400024, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2252731438763817233} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7579323334939743443 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008860822826321434} + m_Mesh: {fileID: 6309839297837962469, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, type: 3} +--- !u!23 &6319524955309604855 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008860822826321434} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 25f214a0122f90f43b9d7c18b1421573, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2826030966751858365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3203119935959061511} + m_Layer: 0 + m_Name: kitchenCounterCabinateLarge + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3203119935959061511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2826030966751858365} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1358988859607359566} + - {fileID: 2252731438763817233} + - {fileID: 3321896635977710116} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3674930622227669883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2252731438763817233} + - component: {fileID: 2310741353161921642} + - component: {fileID: 4799748244365357666} + m_Layer: 0 + m_Name: doors + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2252731438763817233 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3674930622227669883} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.5354309, y: 0.048, z: 0.75601196} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5149923011813672614} + - {fileID: 5856815492098900995} + m_Father: {fileID: 3203119935959061511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2310741353161921642 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3674930622227669883} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -124,14 +171,138 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.71999997, y: 0.864, z: 0.10360512} - m_Center: {x: -0.36000004, y: 0.432, z: 0.015802527} ---- !u!1 &4909991740354843763 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1163416789225216097, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - m_PrefabInstance: {fileID: 3168702218647024620} + m_Size: {x: 1.4921265, y: 0.81350815, z: 0.1640625} + m_Center: {x: 0.72106934, y: 0.4414417, z: -0.0010070801} +--- !u!114 &4799748244365357666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3674930622227669883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e6fbbdbfbe973146843edb02f35a3ee, type: 3} + m_Name: + m_EditorClassIdentifier: + doors: + - doorObject: {fileID: 5888475605046112674} + startPosition: {x: 0, y: 0, z: 0} + type: 1 + endPosition: {x: 0, y: 90, z: 0} + - doorObject: {fileID: 2008860822826321434} + startPosition: {x: 0, y: 0, z: 0} + type: 1 + endPosition: {x: 0, y: 90, z: 0} + duration: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 1 + outSlope: 1 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 1 + outSlope: 1 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &4909991740354843763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3321896635977710116} + - component: {fileID: 5444572150096596428} + - component: {fileID: 5322066142593491601} + - component: {fileID: 8936381634242955624} + m_Layer: 0 + m_Name: shelf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3321896635977710116 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4909991740354843763} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.81551754, y: 0.48000002, z: 0.0011206795} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3203119935959061511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5444572150096596428 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4909991740354843763} + m_Mesh: {fileID: 5727281425797814915, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, type: 3} +--- !u!23 &5322066142593491601 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4909991740354843763} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -7791486788655378091, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, type: 3} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &8936381634242955624 BoxCollider: m_ObjectHideFlags: 0 @@ -153,39 +324,173 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.3421848, y: 0.012, z: 0.6839999} m_Center: {x: -0.007269889, y: 0, z: 0.342} ---- !u!1 &5888475605046112674 stripped +--- !u!1 &5888475605046112674 GameObject: - m_CorrespondingSourceObject: {fileID: -413930134452501938, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - m_PrefabInstance: {fileID: 3168702218647024620} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!65 &7529824132152120585 -BoxCollider: + serializedVersion: 6 + m_Component: + - component: {fileID: 5149923011813672614} + - component: {fileID: 7030067956953748755} + - component: {fileID: 9109561347382967096} + m_Layer: 0 + m_Name: doorLeft + m_TagString: Interactable + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5149923011813672614 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5888475605046112674} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.72, y: 0.864, z: 0.10360512} - m_Center: {x: 0.35999984, y: 0.432, z: 0.015802527} ---- !u!1 &7818217209032136338 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4069390665337379458, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, - type: 3} - m_PrefabInstance: {fileID: 3168702218647024620} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2252731438763817233} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7030067956953748755 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5888475605046112674} + m_Mesh: {fileID: -3932981460893855642, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, type: 3} +--- !u!23 &9109561347382967096 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5888475605046112674} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 25f214a0122f90f43b9d7c18b1421573, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7818217209032136338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1358988859607359566} + - component: {fileID: 5831572669635102296} + - component: {fileID: 8115277956429340472} + - component: {fileID: 5830510307120772111} + m_Layer: 0 + m_Name: case3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1358988859607359566 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7818217209032136338} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.000000016982574, y: 0, z: 0.000000017139977} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3203119935959061511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5831572669635102296 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7818217209032136338} + m_Mesh: {fileID: -6794553912762883607, guid: ac9f854fab6555c4c9dfe24f5fb5e6a9, type: 3} +--- !u!23 &8115277956429340472 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7818217209032136338} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 25f214a0122f90f43b9d7c18b1421573, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &5830510307120772111 MeshCollider: m_ObjectHideFlags: 0 diff --git a/RunningLateGame/Assets/Scenes/SampleScene.unity b/RunningLateGame/Assets/Scenes/SampleScene.unity index be7ee99..c85da71 100644 --- a/RunningLateGame/Assets/Scenes/SampleScene.unity +++ b/RunningLateGame/Assets/Scenes/SampleScene.unity @@ -122,6 +122,29 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &165273283 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4465937683457646742, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + m_PrefabInstance: {fileID: 7156582456560016067} + m_PrefabAsset: {fileID: 0} +--- !u!114 &165273285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 165273283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4995ad0b66292c144ab3819605824571, type: 3} + m_Name: + m_EditorClassIdentifier: + playerPosition: {fileID: 804785954} + seeDistance: 3 + raycastLayers: + serializedVersion: 2 + m_Bits: 439 --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -210,13 +233,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410087039} serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 590, y: 873, z: 551} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &410087042 MonoBehaviour: m_ObjectHideFlags: 0 @@ -240,6 +263,12 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 +--- !u!4 &804785954 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + m_PrefabInstance: {fileID: 7156582456560016067} + m_PrefabAsset: {fileID: 0} --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -382,6 +411,39 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1571449651 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3597841629992087818, guid: aebcdae242e01f94b8df85895a81a0ff, + type: 3} + m_PrefabInstance: {fileID: 1703341036} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1571449655 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571449651} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &1703341036 PrefabInstance: m_ObjectHideFlags: 0 @@ -510,6 +572,11 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} + - target: {fileID: 3012751955993575718, guid: aebcdae242e01f94b8df85895a81a0ff, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3055510960465791665, guid: aebcdae242e01f94b8df85895a81a0ff, type: 3} propertyPath: m_Layer @@ -585,6 +652,16 @@ PrefabInstance: propertyPath: m_ObstacleAvoidanceType value: 3 objectReference: {fileID: 0} + - target: {fileID: 4366289886226962748, guid: aebcdae242e01f94b8df85895a81a0ff, + type: 3} + propertyPath: m_DynamicOccludee + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4366289886226962748, guid: aebcdae242e01f94b8df85895a81a0ff, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4425903669328537713, guid: aebcdae242e01f94b8df85895a81a0ff, type: 3} propertyPath: m_Layer @@ -775,6 +852,11 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} + - target: {fileID: 8179579322411983252, guid: aebcdae242e01f94b8df85895a81a0ff, + type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8299562521504900798, guid: aebcdae242e01f94b8df85895a81a0ff, type: 3} propertyPath: m_Layer @@ -818,7 +900,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3597841629992087818, guid: aebcdae242e01f94b8df85895a81a0ff, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1571449655} m_SourcePrefab: {fileID: 100100000, guid: aebcdae242e01f94b8df85895a81a0ff, type: 3} --- !u!1 &2031846085 GameObject: @@ -1036,6 +1122,124 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a270ba76a3b8cc0458007401cf8f08bf, type: 3} +--- !u!1001 &4834154634042796457 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2310741353161921642, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2826030966751858365, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_Name + value: kitchenCounterCabinateLarge + objectReference: {fileID: 0} + - target: {fileID: 2826030966751858365, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalPosition.x + value: 490.80618 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.000010728836 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalPosition.z + value: 506.85104 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3203119935959061511, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[0].type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[1].type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[0].endPosition.x + value: -0.7 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[0].endPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[1].endPosition.x + value: 2.3 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[1].endPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[0].startPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4799748244365357666, guid: 3c28246fe5bc0ae4f88829be9303d243, + type: 3} + propertyPath: doors.Array.data[1].startPosition.x + value: 440002 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3c28246fe5bc0ae4f88829be9303d243, type: 3} --- !u!1001 &7156582456560016067 PrefabInstance: m_ObjectHideFlags: 0 @@ -1049,6 +1253,11 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 88901804746851737, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} - target: {fileID: 126756064612061490, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} propertyPath: m_Layer @@ -1147,7 +1356,7 @@ PrefabInstance: - target: {fileID: 1276608354021537599, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} propertyPath: m_LocalPosition.y - value: 0.79 + value: 0.94 objectReference: {fileID: 0} - target: {fileID: 1276608354021537599, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} @@ -1209,6 +1418,11 @@ PrefabInstance: propertyPath: FootstepAudioVolume value: 0.093 objectReference: {fileID: 0} + - target: {fileID: 1475518765439445092, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: GroundLayers.m_Bits + value: 129 + objectReference: {fileID: 0} - target: {fileID: 1518818056364163934, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} propertyPath: m_Layer @@ -1603,7 +1817,11 @@ PrefabInstance: - {fileID: 488862059449181983, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4465937683457646742, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 165273285} m_SourcePrefab: {fileID: 100100000, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: @@ -1616,3 +1834,4 @@ SceneRoots: - {fileID: 2243028174331468478} - {fileID: 1703341036} - {fileID: 2031846087} + - {fileID: 4834154634042796457} diff --git a/RunningLateGame/Assets/Scripts/AiCar.cs b/RunningLateGame/Assets/Scripts/AiCar.cs index 8404db8..fc40a6c 100644 --- a/RunningLateGame/Assets/Scripts/AiCar.cs +++ b/RunningLateGame/Assets/Scripts/AiCar.cs @@ -47,7 +47,6 @@ private void Awake() private void Update() { _currentState = _nextState; - Debug.Log(_currentState); } private void ChangeState() diff --git a/RunningLateGame/Assets/Scripts/Door.cs b/RunningLateGame/Assets/Scripts/Door.cs new file mode 100644 index 0000000..808cdce --- /dev/null +++ b/RunningLateGame/Assets/Scripts/Door.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Door : Interactable +{ + public enum DoorType + { + Sliding, + Rotating + } + + public List doors; + + public float duration; + public AnimationCurve curve; + private bool _isOpen; + private bool _opening; + + + public override void Interact() + { + if (!_opening) StartCoroutine(OpenDoor()); + } + + private IEnumerator OpenDoor() + { + _opening = true; + float currentDuration = 0; + while (_opening) + { + currentDuration += Time.deltaTime; + var t = currentDuration / duration; + foreach (var variable in doors) + if (!_isOpen) + { + if (variable.type == DoorType.Sliding) + variable.doorObject.transform.localPosition = Vector3.Lerp(variable.startPosition, + variable.endPosition, + curve.Evaluate(t)); + else if (variable.type == DoorType.Rotating) + variable.doorObject.transform.localEulerAngles = Vector3.Slerp(variable.startPosition, + variable.endPosition, + curve.Evaluate(t)); + } + else + { + if (variable.type == DoorType.Sliding) + variable.doorObject.transform.localPosition = Vector3.Lerp(variable.endPosition, + variable.startPosition, + curve.Evaluate(t)); + else if (variable.type == DoorType.Rotating) + variable.doorObject.transform.localEulerAngles = Vector3.Slerp(variable.endPosition, + variable.startPosition, + curve.Evaluate(t)); + } + + + if (currentDuration >= duration) + { + currentDuration = 0; + _opening = false; + if (_isOpen) + { + _isOpen = false; + } + else + { + _isOpen = true; + } + } + + yield return new WaitForEndOfFrame(); + } + } + + [Serializable] + public struct DoorInput + { + public GameObject doorObject; + public Vector3 startPosition; + public DoorType type; + public Vector3 endPosition; + } +} \ No newline at end of file diff --git a/RunningLateGame/Assets/Scripts/Door.cs.meta b/RunningLateGame/Assets/Scripts/Door.cs.meta new file mode 100644 index 0000000..8b48cdf --- /dev/null +++ b/RunningLateGame/Assets/Scripts/Door.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1e6fbbdbfbe973146843edb02f35a3ee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RunningLateGame/Assets/Scripts/Interactable.cs b/RunningLateGame/Assets/Scripts/Interactable.cs new file mode 100644 index 0000000..dd8cb02 --- /dev/null +++ b/RunningLateGame/Assets/Scripts/Interactable.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Interactable : MonoBehaviour +{ + public virtual void Interact() + { + + } +} diff --git a/RunningLateGame/Assets/Scripts/Interactable.cs.meta b/RunningLateGame/Assets/Scripts/Interactable.cs.meta new file mode 100644 index 0000000..8fd4199 --- /dev/null +++ b/RunningLateGame/Assets/Scripts/Interactable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9466b92232859164b8a5079c408ce420 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RunningLateGame/Assets/Scripts/Player.cs b/RunningLateGame/Assets/Scripts/Player.cs new file mode 100644 index 0000000..0cb8044 --- /dev/null +++ b/RunningLateGame/Assets/Scripts/Player.cs @@ -0,0 +1,42 @@ +using UnityEngine; + + +public class Player : MonoBehaviour +{ + public RaycastHit Hit; + [SerializeField] private Transform playerPosition; + [SerializeField] private float seeDistance; + private Interactable _currentInteractable; + private bool _active; + private bool _raycast; + public LayerMask raycastLayers; + + + private void Update() + { + _raycast = Physics.Raycast( + playerPosition.position, + playerPosition.TransformDirection(Vector3.forward), + out Hit, + seeDistance, + raycastLayers + ); + Debug.DrawRay( + playerPosition.position, + playerPosition.TransformDirection(Vector3.forward) * seeDistance, + Color.green + ); + } + + private void OnAction() + { + Debug.Log("test"); + if (_raycast) + { + if (Hit.transform.CompareTag("Interactable")) + { + Hit.transform.GetComponent().Interact(); + } + } + } +} \ No newline at end of file diff --git a/RunningLateGame/Assets/Scripts/Player.cs.meta b/RunningLateGame/Assets/Scripts/Player.cs.meta new file mode 100644 index 0000000..f53f534 --- /dev/null +++ b/RunningLateGame/Assets/Scripts/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4995ad0b66292c144ab3819605824571 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RunningLateGame/Assets/Starter Assets/Runtime/InputSystem/StarterAssets.inputactions b/RunningLateGame/Assets/Starter Assets/Runtime/InputSystem/StarterAssets.inputactions index 13307f4..bb19d03 100644 --- a/RunningLateGame/Assets/Starter Assets/Runtime/InputSystem/StarterAssets.inputactions +++ b/RunningLateGame/Assets/Starter Assets/Runtime/InputSystem/StarterAssets.inputactions @@ -11,7 +11,8 @@ "id": "6bc1aaf4-b110-4ff7-891e-5b9fe6f32c4d", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true }, { "name": "Look", @@ -19,7 +20,8 @@ "id": "2690c379-f54d-45be-a724-414123833eb4", "expectedControlType": "Vector2", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": true }, { "name": "Jump", @@ -27,7 +29,8 @@ "id": "8c4abdf8-4099-493a-aa1a-129acec7c3df", "expectedControlType": "Button", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false }, { "name": "Sprint", @@ -35,7 +38,17 @@ "id": "980e881e-182c-404c-8cbf-3d09fdb48fef", "expectedControlType": "", "processors": "", - "interactions": "" + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Action", + "type": "Button", + "id": "23716198-d983-446c-b5d8-12f815535366", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -214,6 +227,17 @@ "action": "Sprint", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "88e90771-1f54-402e-91d3-c854e598f230", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/RunningLateGame/ProjectSettings/TagManager.asset b/RunningLateGame/ProjectSettings/TagManager.asset index 3d740a2..110ac51 100644 --- a/RunningLateGame/ProjectSettings/TagManager.asset +++ b/RunningLateGame/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - CinemachineTarget + - Interactable layers: - Default - TransparentFX