diff --git a/Assets/Prefabs/Environment/Campfire.prefab b/Assets/Prefabs/Environment/Campfire.prefab index 5768470..8056f1f 100644 --- a/Assets/Prefabs/Environment/Campfire.prefab +++ b/Assets/Prefabs/Environment/Campfire.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1371915555411544299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5625649335891309414} + - component: {fileID: 7113383151244089569} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5625649335891309414 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371915555411544299} + m_LocalRotation: {x: 0.65327996, y: -0.65328187, z: -0.27059913, w: 0.27059993} + m_LocalPosition: {x: 0.35355392, y: 0, z: 0.35355285} + m_LocalScale: {x: 0.20000005, y: 0.30800003, z: 0.19999997} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &7113383151244089569 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371915555411544299} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1791762180592942439 GameObject: m_ObjectHideFlags: 0 @@ -34,12 +79,21 @@ Transform: - {fileID: 3464217916028558321} - {fileID: 5299650773545078260} - {fileID: 8703236790229133739} - - {fileID: 664587661892241191} - {fileID: 4407621139176341806} - {fileID: 8279143985661205166} - {fileID: 7662489421148146333} - {fileID: 2738699342724056705} - {fileID: 2650369790819247459} + - {fileID: 664587661892241191} + - {fileID: 7718709751212286797} + - {fileID: 6089077563547696242} + - {fileID: 4156360846149110260} + - {fileID: 4109995755422174495} + - {fileID: 7724563746990570415} + - {fileID: 7434620718805260811} + - {fileID: 8238404264633614976} + - {fileID: 5625649335891309414} + - {fileID: 2090421256027592799} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -107,6 +161,7 @@ MonoBehaviour: Flame: {fileID: 1683130550026608685} Sfx: {fileID: 8651001597528790401} DebugDisableFuelMechanic: 0 + FuelTickingMultiplier: 1 GoodFuelAmount: 30 TooLowFuelColor: {r: 1, g: 0.791215, b: 0.6273585, a: 0} RandomVarianceDuration: 0.2 @@ -133,6 +188,51 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &2339043119612587123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4156360846149110260} + - component: {fileID: 8049694327762447393} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4156360846149110260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2339043119612587123} + m_LocalRotation: {x: 0.70710576, y: -0.7071079, z: -0.0000020862656, w: 0.000002086272} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 0.20000005, y: 0.308, z: 0.19999996} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &8049694327762447393 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2339043119612587123} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2924572221968050171 GameObject: m_ObjectHideFlags: 0 @@ -162,7 +262,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &5633977716718901277 CapsuleCollider: @@ -207,7 +307,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &6967554575247233918 AudioSource: @@ -336,7 +436,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} - m_RootOrder: 3 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3313787702854768125 BoxCollider: @@ -349,7 +449,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.6, y: 0.2, z: 1} + m_Size: {x: 0.415, y: 0.2, z: 1} m_Center: {x: 0, y: 0.041, z: 0} --- !u!65 &6502800549939180594 BoxCollider: @@ -362,8 +462,53 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 0.2, z: 0.6} + m_Size: {x: 1, y: 0.2, z: 0.415} m_Center: {x: 0, y: 0.041, z: 0} +--- !u!1 &4482256503298048154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6089077563547696242} + - component: {fileID: 8698156186511277178} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6089077563547696242 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4482256503298048154} + m_LocalRotation: {x: -0, y: -0, z: -0.70710576, w: 0.7071079} + m_LocalPosition: {x: 0, y: 0, z: -0.5} + m_LocalScale: {x: 0.20000003, y: 0.308, z: 0.2} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &8698156186511277178 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4482256503298048154} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4797807552203538256 GameObject: m_ObjectHideFlags: 0 @@ -456,6 +601,109 @@ Light: m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &5097898437728974139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7724563746990570415} + - component: {fileID: 8723905734847916696} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7724563746990570415 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5097898437728974139} + m_LocalRotation: {x: 0.5000015, y: -0.50000304, z: 0.49999705, w: -0.49999854} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: 0.20000005, y: 0.30800003, z: 0.19999999} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &8723905734847916696 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5097898437728974139} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5623304128708221221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7718709751212286797} + - component: {fileID: 880546277585717695} + - component: {fileID: 765978058300409518} + m_Layer: 9 + m_Name: Collider (In-between cardinal directions) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7718709751212286797 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5623304128708221221} + m_LocalRotation: {x: -0, y: -0.38268274, z: -0, w: 0.9238798} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: -45.000004, z: 0} +--- !u!65 &880546277585717695 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5623304128708221221} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.415, y: 0.2, z: 1} + m_Center: {x: 0, y: 0.041, z: 0} +--- !u!65 &765978058300409518 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5623304128708221221} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.2, z: 0.415} + m_Center: {x: 0, y: 0.041, z: 0} --- !u!1 &5974196502008569916 GameObject: m_ObjectHideFlags: 0 @@ -5219,6 +5467,51 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &6363289086465875682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2090421256027592799} + - component: {fileID: 8733883861562233048} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2090421256027592799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6363289086465875682} + m_LocalRotation: {x: 0.270601, y: -0.27060187, z: 0.6532791, w: -0.6532811} + m_LocalPosition: {x: -0.35355392, y: 0, z: -0.35355282} + m_LocalScale: {x: 0.20000006, y: 0.308, z: 0.19999999} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &8733883861562233048 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6363289086465875682} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7439796550306582221 GameObject: m_ObjectHideFlags: 0 @@ -5229,7 +5522,6 @@ GameObject: m_Component: - component: {fileID: 4407621139176341806} - component: {fileID: 7258398958978246311} - - component: {fileID: 8853093424384417278} m_Layer: 12 m_Name: Wall for Player m_TagString: Untagged @@ -5249,7 +5541,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &7258398958978246311 CapsuleCollider: @@ -5262,25 +5554,99 @@ CapsuleCollider: m_IsTrigger: 0 m_Enabled: 1 m_Radius: 0.7 - m_Height: 10 + m_Height: 4 m_Direction: 1 - m_Center: {x: 0, y: 4.3, z: 0} ---- !u!208 &8853093424384417278 -NavMeshObstacle: + m_Center: {x: 0, y: 1.3, z: 0} +--- !u!1 &7959790756124424377 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7439796550306582221} + serializedVersion: 6 + m_Component: + - component: {fileID: 8238404264633614976} + - component: {fileID: 2171793155104907949} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8238404264633614976 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7959790756124424377} + m_LocalRotation: {x: 0.6532815, y: -0.6532835, z: 0.27059522, w: -0.27059606} + m_LocalPosition: {x: -0.35355285, y: 0, z: 0.35355392} + m_LocalScale: {x: 0.20000006, y: 0.30800003, z: 0.19999999} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &2171793155104907949 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7959790756124424377} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 - m_Shape: 0 - m_Extents: {x: 0.5, y: 5, z: 0.5} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 4.3, z: 0} - m_TimeToStationary: 0.5 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8129157652200422431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7434620718805260811} + - component: {fileID: 8985515613940314759} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7434620718805260811 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8129157652200422431} + m_LocalRotation: {x: 0.27059716, y: -0.270598, z: -0.65328074, w: 0.6532827} + m_LocalPosition: {x: 0.35355285, y: 0, z: -0.3535539} + m_LocalScale: {x: 0.20000005, y: 0.308, z: 0.20000002} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &8985515613940314759 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8129157652200422431} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8502149746935864804 GameObject: m_ObjectHideFlags: 0 @@ -5310,7 +5676,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &964052589141395917 AudioSource: @@ -5409,6 +5775,51 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &8759335128311602713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4109995755422174495} + - component: {fileID: 611749352677393472} + m_Layer: 9 + m_Name: Collider (Donut) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4109995755422174495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8759335128311602713} + m_LocalRotation: {x: 0.49999854, y: -0.5, z: -0.5, w: 0.5000015} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 0.20000005, y: 0.30800003, z: 0.2} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} +--- !u!136 &611749352677393472 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8759335128311602713} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &9045967002764336402 GameObject: m_ObjectHideFlags: 0 @@ -5438,7 +5849,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &957089656851647374 AudioSource: diff --git a/Assets/Prefabs/Environment/DeadTree.prefab b/Assets/Prefabs/Environment/DeadTree.prefab index 905dfe1..ba64faf 100644 --- a/Assets/Prefabs/Environment/DeadTree.prefab +++ b/Assets/Prefabs/Environment/DeadTree.prefab @@ -45,22 +45,6 @@ CapsuleCollider: m_Height: 0.03 m_Direction: 2 m_Center: {x: 0.0002456251, y: 0.0014098934, z: 0.014013803} ---- !u!208 &5413880215650817137 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4546180240118410074} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.0025, y: 0.0025, z: 0.014} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 0.001, z: 0.014} - m_TimeToStationary: 0.5 --- !u!1001 &5491765641430381139 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/LefaTree.prefab b/Assets/Prefabs/Environment/LefaTree.prefab index 885ba64..079cd7d 100644 --- a/Assets/Prefabs/Environment/LefaTree.prefab +++ b/Assets/Prefabs/Environment/LefaTree.prefab @@ -14,22 +14,6 @@ CapsuleCollider: m_Height: 3.3 m_Direction: 1 m_Center: {x: 0.02, y: 1.35, z: -0.15} ---- !u!208 &1931913819206286181 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4234420637803406081} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.25, y: 1.35, z: 0.25} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0.02, y: 1.35, z: -0.15} - m_TimeToStationary: 0.5 --- !u!1 &6700814859666117554 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Log.prefab b/Assets/Prefabs/Environment/Log.prefab index fe07ad0..186233b 100644 --- a/Assets/Prefabs/Environment/Log.prefab +++ b/Assets/Prefabs/Environment/Log.prefab @@ -1,66 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &88365349353915788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4554968707355299899} - - component: {fileID: 5409517528740176079} - - component: {fileID: 9118223714586610837} - m_Layer: 0 - m_Name: Collider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4554968707355299899 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88365349353915788} - m_LocalRotation: {x: -0, y: -0.10402069, z: -0, w: 0.99457514} - m_LocalPosition: {x: 0.03, y: 0.27141744, z: -0.021} - m_LocalScale: {x: 3.4379, y: 0.54283494, z: 0.73788685} - m_Children: [] - m_Father: {fileID: 1537215554624875642} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -11.942, z: 0} ---- !u!65 &5409517528740176079 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88365349353915788} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!208 &9118223714586610837 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 88365349353915788} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.5, y: 0.5, z: 0.5} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 0, z: 0} - m_TimeToStationary: 0.5 --- !u!1 &110889063446132937 GameObject: m_ObjectHideFlags: 0 @@ -75,7 +14,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 4294967295 m_IsActive: 1 --- !u!4 &1537215554624875642 Transform: @@ -89,10 +28,23 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5208747214434309696} - - {fileID: 4554968707355299899} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &7512525720554362074 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9084453306067018835} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 14 + m_Mesh: {fileID: 2534964839176971238, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3} --- !u!1001 &951274577046027610 PrefabInstance: m_ObjectHideFlags: 0 @@ -180,8 +132,19 @@ PrefabInstance: propertyPath: m_Name value: log objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3} +--- !u!1 &9084453306067018835 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + m_PrefabInstance: {fileID: 951274577046027610} + m_PrefabAsset: {fileID: 0} --- !u!4 &5208747214434309696 stripped Transform: m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, diff --git a/Assets/Prefabs/Environment/PineTree.prefab b/Assets/Prefabs/Environment/PineTree.prefab index 3823b80..f4ab426 100644 --- a/Assets/Prefabs/Environment/PineTree.prefab +++ b/Assets/Prefabs/Environment/PineTree.prefab @@ -45,22 +45,6 @@ CapsuleCollider: m_Height: 3.4 m_Direction: 1 m_Center: {x: 0, y: 1.3, z: 0} ---- !u!208 &3561374758336752680 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6126701630107862393} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.375, y: 1.3, z: 0.375} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 1.3, z: 0} - m_TimeToStationary: 0.5 --- !u!1001 &2749315332302543984 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Tent.prefab b/Assets/Prefabs/Environment/Tent.prefab index 6b16494..5c4f8fa 100644 --- a/Assets/Prefabs/Environment/Tent.prefab +++ b/Assets/Prefabs/Environment/Tent.prefab @@ -14,22 +14,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: -1 m_Mesh: {fileID: -2989305052099074096, guid: b6af29ffe256fbe458269e5e3d7470b0, type: 3} ---- !u!208 &631874104980113124 -NavMeshObstacle: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2810726785596125069} - m_Enabled: 1 - serializedVersion: 3 - m_Shape: 1 - m_Extents: {x: 0.011000001, y: 0.013, z: 0.008} - m_MoveThreshold: 0.1 - m_Carve: 1 - m_CarveOnlyStationary: 1 - m_Center: {x: 0, y: 0, z: 0.008} - m_TimeToStationary: 0.5 --- !u!1 &5298320185909332155 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/VRScene.unity b/Assets/Scenes/VRScene.unity index ddfe2d3..2a4e367 100644 --- a/Assets/Scenes/VRScene.unity +++ b/Assets/Scenes/VRScene.unity @@ -16080,11 +16080,6 @@ PrefabInstance: propertyPath: m_Name value: Log objectReference: {fileID: 0} - - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, - type: 3} - propertyPath: m_StaticEditorFlags - value: 119 - objectReference: {fileID: 0} - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} propertyPath: m_LocalPosition.x @@ -16140,11 +16135,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -3.0440001 objectReference: {fileID: 0} - - target: {fileID: 9084453306067018835, guid: 3d3251a3aedb46143931b1ea4eaa4138, - type: 3} - propertyPath: m_StaticEditorFlags - value: 119 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} --- !u!4 &1443403128 stripped @@ -18406,6 +18396,16 @@ PrefabInstance: propertyPath: m_Volume value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 7258398958978246311, guid: 8ee6eecf5317b4841817712d24763e37, + type: 3} + propertyPath: m_Height + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 7258398958978246311, guid: 8ee6eecf5317b4841817712d24763e37, + type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_LocalPosition.x