From 274f5f7cace3751020a92c01dcd85693d7ae5633 Mon Sep 17 00:00:00 2001 From: Janis Date: Sun, 4 Dec 2022 15:09:42 +0100 Subject: [PATCH] place streets --- Assets/Prefab/Node.prefab | 2 +- Assets/Prefab/OneWayStreet.prefab | 172 +++++++++ Assets/Prefab/OneWayStreet.prefab.meta | 7 + Assets/Prefab/OneWayStreetPO.prefab | 196 ++++++++++ Assets/Prefab/OneWayStreetPO.prefab.meta | 7 + Assets/Scenes/SampleScene.unity | 199 +--------- .../Scripts/BuildingSystem/StreetBuilding.cs | 56 +++ .../BuildingSystem/StreetBuilding.cs.meta | 11 + Assets/Scripts/PlaceableObject.cs | 38 ++ Assets/Scripts/PlaceableObject.cs.meta | 11 + Assets/Scripts/PlaceableObjectChild.cs | 31 ++ Assets/Scripts/PlaceableObjectChild.cs.meta | 11 + Assets/Scripts/PrefabDictionary.cs | 2 + Assets/Scripts/TrafficSystem/Street.cs | 6 +- .../Scripts/TrafficSystem/StreetContainer.cs | 6 + .../TrafficSystem/StreetContainer.cs.meta | 11 + .../TrafficSystem/TrafficParticipant.cs | 74 +++- UserSettings/Layouts/default-2021.dwlt | 343 ++++++------------ 18 files changed, 745 insertions(+), 438 deletions(-) create mode 100644 Assets/Prefab/OneWayStreet.prefab create mode 100644 Assets/Prefab/OneWayStreet.prefab.meta create mode 100644 Assets/Prefab/OneWayStreetPO.prefab create mode 100644 Assets/Prefab/OneWayStreetPO.prefab.meta create mode 100644 Assets/Scripts/BuildingSystem/StreetBuilding.cs create mode 100644 Assets/Scripts/BuildingSystem/StreetBuilding.cs.meta create mode 100644 Assets/Scripts/PlaceableObject.cs create mode 100644 Assets/Scripts/PlaceableObject.cs.meta create mode 100644 Assets/Scripts/PlaceableObjectChild.cs create mode 100644 Assets/Scripts/PlaceableObjectChild.cs.meta create mode 100644 Assets/Scripts/TrafficSystem/StreetContainer.cs create mode 100644 Assets/Scripts/TrafficSystem/StreetContainer.cs.meta diff --git a/Assets/Prefab/Node.prefab b/Assets/Prefab/Node.prefab index db5ed1c..c238da9 100644 --- a/Assets/Prefab/Node.prefab +++ b/Assets/Prefab/Node.prefab @@ -63,4 +63,4 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.1 + m_Radius: 0.06 diff --git a/Assets/Prefab/OneWayStreet.prefab b/Assets/Prefab/OneWayStreet.prefab new file mode 100644 index 0000000..24f70c9 --- /dev/null +++ b/Assets/Prefab/OneWayStreet.prefab @@ -0,0 +1,172 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3507984408736830881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3507984408736830887} + - component: {fileID: 4373278067013931366} + m_Layer: 0 + m_Name: OneWayStreet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3507984408736830887 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3507984408736830881} + 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: 3507984409357578320} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4373278067013931366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3507984408736830881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51e2ae474deec9241b41be37ee06f5cf, type: 3} + m_Name: + m_EditorClassIdentifier: + streetObject: {fileID: 3507984409357578323} +--- !u!1 &3507984409357578323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3507984409357578320} + - component: {fileID: 3507984409357578321} + - component: {fileID: 5127064513516543494} + - component: {fileID: 1253709196921217761} + m_Layer: 0 + m_Name: streetObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3507984409357578320 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3507984409357578323} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3507984408736830887} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3507984409357578321 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3507984409357578323} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.33597365, g: 0.35987362, b: 0.4716981, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &5127064513516543494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3507984409357578323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b794f37801ab66d4496dd16ee2294dee, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &1253709196921217761 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3507984409357578323} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Prefab/OneWayStreet.prefab.meta b/Assets/Prefab/OneWayStreet.prefab.meta new file mode 100644 index 0000000..90e661c --- /dev/null +++ b/Assets/Prefab/OneWayStreet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e5756f8beb5c58842922847cb8e0d875 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/OneWayStreetPO.prefab b/Assets/Prefab/OneWayStreetPO.prefab new file mode 100644 index 0000000..446a8a5 --- /dev/null +++ b/Assets/Prefab/OneWayStreetPO.prefab @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4378804637319760041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4378804637319760054} + - component: {fileID: 6750555896683950434} + m_Layer: 0 + m_Name: OneWayStreetPO + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4378804637319760054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637319760041} + 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: 4378804637511363665} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6750555896683950434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637319760041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eb76ac910e345a428730df4c72c835b, type: 3} + m_Name: + m_EditorClassIdentifier: + childObject: {fileID: 4378804637511363667} + placeable: 1 +--- !u!1 &4378804637511363667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4378804637511363665} + - component: {fileID: 4378804637511363664} + - component: {fileID: 8629378905046913581} + - component: {fileID: 2156778682419509481} + - component: {fileID: 15892159919980060} + m_Layer: 0 + m_Name: streetObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4378804637511363665 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637511363667} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4378804637319760054} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4378804637511363664 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637511363667} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0.91796017, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &8629378905046913581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637511363667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69d68f14c2a51dc4d94160eafca27a7e, type: 3} + m_Name: + m_EditorClassIdentifier: + placeable: 1 +--- !u!50 &2156778682419509481 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637511363667} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 0.0001 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 7 +--- !u!61 &15892159919980060 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4378804637511363667} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Prefab/OneWayStreetPO.prefab.meta b/Assets/Prefab/OneWayStreetPO.prefab.meta new file mode 100644 index 0000000..d7ff307 --- /dev/null +++ b/Assets/Prefab/OneWayStreetPO.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 28a297c5a2d61c142b7389275670314c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 3a978ee..96e30fa 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -123,22 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &333016202 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 487205225613997102, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - m_PrefabInstance: {fileID: 487205225903872164} - m_PrefabAsset: {fileID: 0} ---- !u!114 &333016203 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 487205225613997103, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - m_PrefabInstance: {fileID: 487205225903872164} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 333016202} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 23522bc3f6b64e9478f91a82fa664918, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -221,7 +205,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1432161433 GameObject: @@ -254,7 +238,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nextNode: {fileID: 0} - currentTrafficNode: {fileID: 333016203} + currentNode: {fileID: 0} --- !u!212 &1432161435 SpriteRenderer: m_ObjectHideFlags: 0 @@ -315,109 +299,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432161433} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3, y: -3.05, z: 0} + m_LocalPosition: {x: -24.08, y: -3.05, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1549916940 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549916943} - - component: {fileID: 1549916942} - - component: {fileID: 1549916941} - m_Layer: 0 - m_Name: Street - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1549916941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549916940} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b794f37801ab66d4496dd16ee2294dee, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &1549916942 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549916940} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.33597365, g: 0.35987362, b: 0.4716981, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1549916943 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549916940} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.17, y: -0.20593682, z: 0} - m_LocalScale: {x: 18.39, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1992284311 GameObject: @@ -430,6 +317,7 @@ GameObject: - component: {fileID: 1992284313} - component: {fileID: 1992284312} - component: {fileID: 1992284314} + - component: {fileID: 1992284315} m_Layer: 0 m_Name: GameManager m_TagString: GameManager @@ -464,7 +352,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1992284314 MonoBehaviour: @@ -478,65 +366,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9bf91a6c0d2139a4dba9954918414857, type: 3} m_Name: m_EditorClassIdentifier: - nodePrefab: {fileID: 333016202} ---- !u!1001 &487205225903872164 -PrefabInstance: + nodePrefab: {fileID: 487205225613997102, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} + oneWayStreetPO: {fileID: 4378804637319760041, guid: 28a297c5a2d61c142b7389275670314c, type: 3} + oneWayStreet: {fileID: 3507984408736830881, guid: e5756f8beb5c58842922847cb8e0d875, type: 3} +--- !u!114 &1992284315 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalPosition.x - value: -12.7 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalPosition.y - value: -3.2 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997096, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 487205225613997102, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: m_Name - value: Node - objectReference: {fileID: 0} - - target: {fileID: 487205225613997103, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} - propertyPath: nextTrafficNodes.Array.data[0] - value: - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: def66282a1c498e4c906a02f6bbd214e, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1992284311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab8ef902838d7534bb1b8062f24d5f82, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scripts/BuildingSystem/StreetBuilding.cs b/Assets/Scripts/BuildingSystem/StreetBuilding.cs new file mode 100644 index 0000000..5a6b79e --- /dev/null +++ b/Assets/Scripts/BuildingSystem/StreetBuilding.cs @@ -0,0 +1,56 @@ +using UnityEngine; + +public class StreetBuilding : MonoBehaviour +{ + + GameObject currentStreetPO; + Vector3 startPosition; + + private void Update() + { + if (Input.GetKeyDown(KeyCode.H)) + { + if (currentStreetPO == null) + { + StartBuilding(); + } + else + { + StopBuilding(); + } + } + + if (currentStreetPO != null && Input.GetKeyDown(KeyCode.J)) + { + if (currentStreetPO.GetComponent().placeable) + { + PlaceBuilding(); + } + + } + } + + private void StartBuilding() + { + startPosition = Camera.main.ScreenToWorldPoint(Input.mousePosition); + startPosition.z = 0; + + currentStreetPO = Instantiate(PrefabDictionary.instance.oneWayStreetPO, startPosition, Quaternion.identity); + } + + private void StopBuilding() + { + Destroy(currentStreetPO); + currentStreetPO = null; + startPosition = Vector3.zero; + } + + private void PlaceBuilding() + { + Transform placedTransform = currentStreetPO.transform; + + Instantiate(PrefabDictionary.instance.oneWayStreet, placedTransform.position, placedTransform.rotation).transform.localScale = placedTransform.localScale; + + StopBuilding(); + } +} diff --git a/Assets/Scripts/BuildingSystem/StreetBuilding.cs.meta b/Assets/Scripts/BuildingSystem/StreetBuilding.cs.meta new file mode 100644 index 0000000..88c3ac0 --- /dev/null +++ b/Assets/Scripts/BuildingSystem/StreetBuilding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab8ef902838d7534bb1b8062f24d5f82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlaceableObject.cs b/Assets/Scripts/PlaceableObject.cs new file mode 100644 index 0000000..1483a2a --- /dev/null +++ b/Assets/Scripts/PlaceableObject.cs @@ -0,0 +1,38 @@ +using UnityEngine; + +public class PlaceableObject : MonoBehaviour +{ + public GameObject childObject; + public bool placeable = true; + + + private void Update() + { + ScaleOnMousePosition(); + RotateToMousePosition(); + + placeable = childObject.GetComponent().placeable; + } + + float AngleBetweenTwoPoints(Vector3 a, Vector3 b) + { + return Mathf.Atan2(a.y - b.y, a.x - b.x) * Mathf.Rad2Deg; + } + + void RotateToMousePosition() + { + Vector3 mousePosition = Camera.main.ScreenToWorldPoint(Input.mousePosition); + mousePosition.z = 0; + float angle = AngleBetweenTwoPoints(transform.position, mousePosition); + transform.rotation = Quaternion.Euler(new Vector3(0f, 0f, angle)); + } + void ScaleOnMousePosition() + { + Vector3 mousePosition = Camera.main.ScreenToWorldPoint(Input.mousePosition); + mousePosition.z = 0; + + transform.localScale = new Vector3(-Vector3.Distance(mousePosition, transform.position), 1, 1); + } + + +} diff --git a/Assets/Scripts/PlaceableObject.cs.meta b/Assets/Scripts/PlaceableObject.cs.meta new file mode 100644 index 0000000..60b4aab --- /dev/null +++ b/Assets/Scripts/PlaceableObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1eb76ac910e345a428730df4c72c835b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlaceableObjectChild.cs b/Assets/Scripts/PlaceableObjectChild.cs new file mode 100644 index 0000000..03afe10 --- /dev/null +++ b/Assets/Scripts/PlaceableObjectChild.cs @@ -0,0 +1,31 @@ +using UnityEngine; + +public class PlaceableObjectChild : MonoBehaviour +{ + + public bool placeable = true; + + private void Update() + { + transform.localPosition = new Vector3(0.5f, 0f, 0f); + if (placeable) + { + GetComponent().color = Color.blue; + } + else + { + GetComponent().color = Color.red; + } + } + + private void OnCollisionStay2D(Collision2D collision) + { + placeable = false; + + } + + private void OnCollisionExit2D(Collision2D collision) + { + placeable = true; + } +} diff --git a/Assets/Scripts/PlaceableObjectChild.cs.meta b/Assets/Scripts/PlaceableObjectChild.cs.meta new file mode 100644 index 0000000..bec688e --- /dev/null +++ b/Assets/Scripts/PlaceableObjectChild.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 69d68f14c2a51dc4d94160eafca27a7e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PrefabDictionary.cs b/Assets/Scripts/PrefabDictionary.cs index c5ae56f..fcc5635 100644 --- a/Assets/Scripts/PrefabDictionary.cs +++ b/Assets/Scripts/PrefabDictionary.cs @@ -4,6 +4,8 @@ public class PrefabDictionary : MonoBehaviour public static PrefabDictionary instance; public GameObject nodePrefab; + public GameObject oneWayStreetPO; + public GameObject oneWayStreet; void Awake() { diff --git a/Assets/Scripts/TrafficSystem/Street.cs b/Assets/Scripts/TrafficSystem/Street.cs index c9b30cf..7816518 100644 --- a/Assets/Scripts/TrafficSystem/Street.cs +++ b/Assets/Scripts/TrafficSystem/Street.cs @@ -5,7 +5,7 @@ public class Street : MonoBehaviour { private List nodes = new List(); - private void Awake() + private void Start() { nodes.Add(Instantiate(PrefabDictionary.instance.nodePrefab, transform).GetComponent()); nodes.Add(Instantiate(PrefabDictionary.instance.nodePrefab, transform).GetComponent()); @@ -14,10 +14,10 @@ public class Street : MonoBehaviour nodes[0].AddNextNode(nodes[1]); - CreateNode(new Vector3(0, 0, 0)); + /*CreateNode(new Vector3(0, 0, 0)); CreateNode(new Vector3(-0.25f, 0, 0)); RemoveNode(CreateNode(new Vector3(0.33f, 0, 0))); - CreateNode(new Vector3(-0.12f, 0, 0)); + CreateNode(new Vector3(-0.12f, 0, 0));*/ } private TrafficNode[] getNearestNodes(float positionX) diff --git a/Assets/Scripts/TrafficSystem/StreetContainer.cs b/Assets/Scripts/TrafficSystem/StreetContainer.cs new file mode 100644 index 0000000..e392684 --- /dev/null +++ b/Assets/Scripts/TrafficSystem/StreetContainer.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class StreetContainer : MonoBehaviour +{ + public GameObject streetObject; +} diff --git a/Assets/Scripts/TrafficSystem/StreetContainer.cs.meta b/Assets/Scripts/TrafficSystem/StreetContainer.cs.meta new file mode 100644 index 0000000..6568177 --- /dev/null +++ b/Assets/Scripts/TrafficSystem/StreetContainer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 51e2ae474deec9241b41be37ee06f5cf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/TrafficSystem/TrafficParticipant.cs b/Assets/Scripts/TrafficSystem/TrafficParticipant.cs index 4560d50..a1dd77b 100644 --- a/Assets/Scripts/TrafficSystem/TrafficParticipant.cs +++ b/Assets/Scripts/TrafficSystem/TrafficParticipant.cs @@ -6,47 +6,84 @@ public class TrafficParticipant : MonoBehaviour private TrafficNode nextNode; [SerializeField] - private TrafficNode currentTrafficNode; + private TrafficNode currentNode; + + private bool onNodeNetwork = false; + private float speed = 1f; - private void Start() - { - if (nextNode == null) - { - ChooseNextNode(); - } - } private void Update() { - speed = currentTrafficNode.GetSpeed(); - if (nextNode != null) + if (currentNode) { - transform.position = Vector3.MoveTowards(transform.position, nextNode.transform.position, speed * Time.deltaTime); if (transform.position == nextNode.transform.position) + speed = currentNode.GetSpeed(); + + if (onNodeNetwork) { - Arrived(); - ChooseNextNode(); + if (nextNode != null) + { + transform.position = Vector3.MoveTowards(transform.position, nextNode.transform.position, speed * Time.deltaTime); + if (transform.position == nextNode.transform.position) + { + Arrived(); + ChooseNextNode(); + } + } + else + { + ChooseNextNode(); + } } + else // Align to node network + { + transform.position = Vector3.MoveTowards(transform.position, currentNode.transform.position, speed * Time.deltaTime); + if (transform.position == currentNode.transform.position) + { + onNodeNetwork = true; + ChooseNextNode(); + } + } + } else { - ChooseNextNode(); + currentNode = GetNearestNode(); } + + } + + private TrafficNode GetNearestNode() + { + GameObject[] allTrafficNodes = GameObject.FindGameObjectsWithTag("TrafficNode"); + + if (allTrafficNodes.Length > 0) + { + GameObject nearestNodeObject = allTrafficNodes[0]; + + foreach (GameObject nodeObject in GameObject.FindGameObjectsWithTag("TrafficNode")) + { + if ((transform.position - nodeObject.transform.position).sqrMagnitude < (transform.position - nearestNodeObject.transform.position).sqrMagnitude) + { + nearestNodeObject = nodeObject; + } + } + return nearestNodeObject.GetComponent(); + } + return null; } private void Arrived() { - Debug.Log("Arrived"); - currentTrafficNode = nextNode; + currentNode = nextNode; nextNode = null; } private void ChooseNextNode() { - //Debug.Log("Choose next node"); if (nextNode == null) { - nextNode = currentTrafficNode.GetNextTrafficNodes()[Random.Range(0, (currentTrafficNode.GetNextTrafficNodes().Count))]; + nextNode = currentNode.GetNextTrafficNodes()[Random.Range(0, (currentNode.GetNextTrafficNodes().Count))]; } } @@ -55,7 +92,6 @@ public class TrafficParticipant : MonoBehaviour if (nextNode != null) { Gizmos.color = Color.red; - Gizmos.DrawLine(transform.position, nextNode.transform.position); } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index e859eec..920e95d 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 137 - y: 535 - width: 641 - height: 497 - m_ShowMode: 0 - m_Title: Preferences - m_RootView: {fileID: 4} - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,62 +19,12 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 9} - m_MinSize: {x: 875, y: 371} + m_Title: Scene + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: PreferenceSettingsWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 641 - height: 497 - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 641 - height: 497 - m_MinSize: {x: 310, y: 221} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 592 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,19 +37,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 6} + - {fileID: 9} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1920 height: 939 - m_MinSize: {x: 503, y: 321} - m_MaxSize: {x: 16192, y: 12117} + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 69 ---- !u!114 &6 + controlID: 44 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -144,12 +70,12 @@ MonoBehaviour: height: 939 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -167,15 +93,15 @@ MonoBehaviour: x: 0 y: 0 width: 363 - height: 556 + height: 606 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 18} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -185,24 +111,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 556 + y: 606 width: 1466 - height: 383 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + height: 333 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &9 + - {fileID: 12} + - {fileID: 17} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -215,22 +141,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} - - {fileID: 11} + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 height: 989 - m_MinSize: {x: 875, y: 371} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -252,7 +178,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -273,7 +199,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -286,19 +212,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 13} - - {fileID: 8} + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1466 height: 939 - m_MinSize: {x: 403, y: 321} - m_MaxSize: {x: 8096, y: 12117} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 101 ---- !u!114 &13 + controlID: 45 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -311,19 +237,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 14} + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1466 - height: 556 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + height: 606 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 102 ---- !u!114 &14 + controlID: 46 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -333,7 +259,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -341,71 +267,16 @@ MonoBehaviour: x: 363 y: 0 width: 1103 - height: 556 + height: 606 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} - - {fileID: 20} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13855, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 310, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Preferences - m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 137 - y: 535 - width: 641 - height: 476 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 0} - m_Scope: 0 - m_SplitterFlex: 0.2 - m_SearchText: e - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 71137e95 - m_LastClickedID: -1786899599 - m_ExpandedIDs: 2956c29689577ec10000000001fecd11 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: e ---- !u!114 &16 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -425,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 629 + x: -1920 + y: 679 width: 1465 - height: 362 + height: 312 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -446,22 +317,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/TrafficSystem + - Assets/Prefab m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/TrafficSystem + - Assets/Prefab m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\Janis\TrafficAI m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 60650000 - m_LastClickedID: 25952 - m_ExpandedIDs: 00000000246500005c65000000ca9a3bffffff7f + m_SelectedIDs: 5c790000 + m_LastClickedID: 31068 + m_ExpandedIDs: 00000000be5f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -489,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: + m_ExpandedIDs: 00000000be5f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -514,8 +385,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 60790000 + m_LastClickedInstanceID: 31072 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -533,7 +404,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -545,7 +416,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -560,7 +431,7 @@ MonoBehaviour: m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector + m_Text: Debug m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -582,11 +453,11 @@ MonoBehaviour: m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: - m_InspectorMode: 0 + m_InspectorMode: 1 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -609,7 +480,7 @@ MonoBehaviour: x: 0 y: 73 width: 362 - height: 535 + height: 585 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -617,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 64650000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 20fbffff + m_ExpandedIDs: 2afbffff745f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -635,7 +506,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -643,7 +514,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -666,7 +537,7 @@ MonoBehaviour: x: 363 y: 73 width: 1101 - height: 535 + height: 585 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -923,9 +794,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.47390243, y: 0.13225184, z: 0.027552458} + m_Target: {x: -2.5165825, y: 4.253081, z: 0.12071203} speed: 2 - m_Value: {x: -0.41518578, y: 0.115865804, z: 0.024138726} + m_Value: {x: -2.5165825, y: 4.253081, z: 0.12071203} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -976,9 +847,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.2447534 + m_Target: 9.641667 speed: 2 - m_Value: 7.586129 + m_Value: 9.641667 m_Ortho: m_Target: 1 speed: 2 @@ -1003,7 +874,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1023,10 +894,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 363 + y: 73 + width: 1101 + height: 585 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1034,17 +905,17 @@ MonoBehaviour: m_SerializedViewNames: [] m_SerializedViewValues: [] m_PlayModeViewName: GameView - m_ShowGizmos: 0 + m_ShowGizmos: 1 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1532, y: 769} + m_TargetSize: {x: 1101, y: 564} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 + m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 - m_Gizmos: 0 + m_Gizmos: 1 m_Stats: 0 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: @@ -1052,10 +923,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -384.5 - m_VBaseRangeMax: 384.5 + m_HBaseRangeMin: -550.5 + m_HBaseRangeMax: 550.5 + m_VBaseRangeMin: -282 + m_VBaseRangeMax: 282 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1064,7 +935,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1073,29 +944,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1532 - height: 769 + width: 1101 + height: 564 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 550.5, y: 282} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -384.5 - width: 1532 - height: 769 + x: -550.5 + y: -282 + width: 1101 + height: 564 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_LastWindowPixelSize: {x: 1101, y: 585} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1115,10 +986,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 679 + width: 1465 + height: 312 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default