diff --git a/Assets/Scenes/City.unity b/Assets/Scenes/City.unity index d70e8472..23c40b38 100644 --- a/Assets/Scenes/City.unity +++ b/Assets/Scenes/City.unity @@ -145,17 +145,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce, type: 3} propertyPath: m_LocalPosition.x - value: 132.91 + value: 117.64 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce, type: 3} propertyPath: m_LocalPosition.y - value: 6.9 + value: 6.27 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce, type: 3} propertyPath: m_LocalPosition.z - value: 259.91 + value: 260.09 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: b0ee1e3722bb9474480ad9392cddebce, type: 3} @@ -557,13 +557,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 35419153} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: -0.7071068, w: 0} - m_LocalPosition: {x: 0.0323, y: 0.0094, z: 0.001} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 7.89, y: 0, z: 0.643} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 531238452} - m_LocalEulerAnglesHint: {x: 180, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &37693064 GameObject: m_ObjectHideFlags: 0 @@ -1649,6 +1649,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &300262795 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 100000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_Name + value: Natures_Grass Bar (1) + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalPosition.x + value: 130.67 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalPosition.y + value: 6.3495736 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalPosition.z + value: 262.95 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} --- !u!1 &311736547 GameObject: m_ObjectHideFlags: 0 @@ -2557,8 +2614,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 9.128487, y: 10.450258, z: 14.347183} - m_Center: {x: -4.0642433, y: 4.725129, z: -0.5655594} + m_Size: {x: 7.6450577, y: 10.450258, z: 17.31015} + m_Center: {x: 1.829319, y: 4.725129, z: -0.22538757} --- !u!208 &531238456 NavMeshObstacle: m_ObjectHideFlags: 0 @@ -4538,6 +4595,63 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} m_Center: {x: 0, y: 0, z: 0.0008000004} +--- !u!1001 &888067361 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 100000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_Name + value: Natures_Grass Bar + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalPosition.x + value: 130.67 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalPosition.y + value: 6.3495736 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalPosition.z + value: 257.24 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c07ada992c3586e4dbf557bc4b8718cf, type: 3} --- !u!1 &908315045 GameObject: m_ObjectHideFlags: 0 @@ -4674,6 +4788,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 908315045} m_CullTransparentMesh: 1 +--- !u!1 &919472167 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 2d5fb229ae2945742b900a405a5e7a0b, + type: 3} + m_PrefabInstance: {fileID: 1471188299} + m_PrefabAsset: {fileID: 0} --- !u!1 &933971540 GameObject: m_ObjectHideFlags: 0 @@ -5787,6 +5907,7 @@ Transform: - {fileID: 234772311} - {fileID: 129979466} - {fileID: 1606525992} + - {fileID: 1471188300} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1305860727 @@ -5902,12 +6023,12 @@ PrefabInstance: - target: {fileID: 6810174282485301373, guid: 758a716d956c738488e7ea1225505687, type: 3} propertyPath: m_LocalPosition.x - value: -5.04 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6810174282485301373, guid: 758a716d956c738488e7ea1225505687, type: 3} propertyPath: m_LocalPosition.y - value: -0.56 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6810174282485301373, guid: 758a716d956c738488e7ea1225505687, type: 3} @@ -6376,6 +6497,102 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _areaName: Central ave. +--- !u!1001 &1471188299 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1305860726} + m_Modifications: + - target: {fileID: 100000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_Name + value: Natures_House Floor + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalScale.x + value: 1.4524999 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalPosition.x + value: -9.5 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.07999992 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalPosition.z + value: -10.139252 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 2d5fb229ae2945742b900a405a5e7a0b, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1471188304} + m_SourcePrefab: {fileID: 100100000, guid: 2d5fb229ae2945742b900a405a5e7a0b, type: 3} +--- !u!4 &1471188300 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 2d5fb229ae2945742b900a405a5e7a0b, + type: 3} + m_PrefabInstance: {fileID: 1471188299} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1471188304 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919472167} + 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: 3.0000005, y: 0.20000076, z: 10.000002} + m_Center: {x: 0, y: 0.099999994, z: 0} --- !u!4 &1475504624 stripped Transform: m_CorrespondingSourceObject: {fileID: 3014838044305660136, guid: b64ae4c0433f8c44eada97d1cf57b92d, @@ -7773,7 +7990,7 @@ Transform: m_GameObject: {fileID: 1880854722} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 156.01277, y: 6.35, z: 236.35649} + m_LocalPosition: {x: 142, y: 6.35, z: 246.37} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8534,3 +8751,5 @@ SceneRoots: - {fileID: 495189437} - {fileID: 959365028} - {fileID: 1569330942} + - {fileID: 888067361} + - {fileID: 300262795} diff --git a/Assets/Scenes/City/NavMesh-NavMesh Surface.asset b/Assets/Scenes/City/NavMesh-NavMesh Surface.asset index 2273bb21..4278ce00 100644 Binary files a/Assets/Scenes/City/NavMesh-NavMesh Surface.asset and b/Assets/Scenes/City/NavMesh-NavMesh Surface.asset differ