Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json
This commit is contained in:
Ciakon
2024-04-26 13:32:35 +02:00
parent a9a1c44e75 2a3284ac7c
commit 57d61eb26b
4 changed files with 53 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/ML-Agents/Timers/ForestRacetrack_timers.json
View File

@@ -1 +1,9 @@
<<<<<<< HEAD
{"count":1,"self":54.697376,"total":56.2490324,"children":{"InitializeActuators":{"count":8,"self":0.0015032,"total":0.0015032,"children":null},"InitializeSensors":{"count":8,"self":0.0028936,"total":0.0028936,"children":null},"AgentSendState":{"count":2580,"self":0.1613813,"total":0.21219159999999998,"children":{"CollectObservations":{"count":4128,"self":0.029130899999999998,"total":0.029130899999999998,"children":null},"WriteActionMask":{"count":4128,"self":0.0045593,"total":0.0045593,"children":null},"RequestDecision":{"count":4128,"self":0.0171201,"total":0.0171201,"children":null}}},"DecideAction":{"count":2580,"self":1.1775138,"total":1.1990912,"children":{"RayPerceptionSensor.Perceive":{"count":8256,"self":0.0215774,"total":0.0215774,"children":null}}},"AgentAct":{"count":2580,"self":0.1349573,"total":0.1349573,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":5,"max":25.06042,"min":23.94484,"runningAverage":24.5239849,"value":24.1170235,"weightedAverage":24.5986176}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714131023","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714131080"}} {"count":1,"self":54.697376,"total":56.2490324,"children":{"InitializeActuators":{"count":8,"self":0.0015032,"total":0.0015032,"children":null},"InitializeSensors":{"count":8,"self":0.0028936,"total":0.0028936,"children":null},"AgentSendState":{"count":2580,"self":0.1613813,"total":0.21219159999999998,"children":{"CollectObservations":{"count":4128,"self":0.029130899999999998,"total":0.029130899999999998,"children":null},"WriteActionMask":{"count":4128,"self":0.0045593,"total":0.0045593,"children":null},"RequestDecision":{"count":4128,"self":0.0171201,"total":0.0171201,"children":null}}},"DecideAction":{"count":2580,"self":1.1775138,"total":1.1990912,"children":{"RayPerceptionSensor.Perceive":{"count":8256,"self":0.0215774,"total":0.0215774,"children":null}}},"AgentAct":{"count":2580,"self":0.1349573,"total":0.1349573,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":5,"max":25.06042,"min":23.94484,"runningAverage":24.5239849,"value":24.1170235,"weightedAverage":24.5986176}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714131023","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714131080"}}
=======
<<<<<<< HEAD
{"count":1,"self":32.8065536,"total":36.7679407,"children":{"InitializeActuators":{"count":8,"self":0.0040387999999999995,"total":0.0040387999999999995,"children":null},"InitializeSensors":{"count":8,"self":0.0029939999999999997,"total":0.0029939999999999997,"children":null},"AgentSendState":{"count":1587,"self":0.3011096,"total":0.3888908,"children":{"CollectObservations":{"count":2544,"self":0.044843,"total":0.044843,"children":null},"WriteActionMask":{"count":2544,"self":0.0105366,"total":0.0105366,"children":null},"RequestDecision":{"count":2544,"self":0.032401599999999996,"total":0.032401599999999996,"children":null}}},"DecideAction":{"count":1587,"self":3.2400292,"total":3.2936266,"children":{"RayPerceptionSensor.Perceive":{"count":5088,"self":0.053597399999999996,"total":0.053597399999999996,"children":null}}},"AgentAct":{"count":1587,"self":0.2688357,"total":0.2688357,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714130182","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714130219"}}
=======
{"count":1,"self":8.7055952,"total":8.8210854,"children":{"InitializeActuators":{"count":8,"self":0.0010003,"total":0.0010003,"children":null},"InitializeSensors":{"count":8,"self":0.0035110999999999996,"total":0.0035110999999999996,"children":null},"AgentSendState":{"count":44,"self":0.0055582,"total":0.018727499999999998,"children":{"CollectObservations":{"count":72,"self":0.0019789,"total":0.0019789,"children":null},"WriteActionMask":{"count":72,"self":0,"total":0,"children":null},"RequestDecision":{"count":72,"self":0.0111904,"total":0.0111904,"children":null}}},"DecideAction":{"count":44,"self":0.0842009,"total":0.0842009,"children":{"RayPerceptionSensor.Perceive":{"count":144,"self":0,"total":0,"children":null}}},"AgentAct":{"count":44,"self":0.0080505,"total":0.0080505,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714129909","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714129918"}}
>>>>>>> 8744c617fc8715a42e6dd73e481f756db2205086
>>>>>>> 2a3284ac7c7577c027d1ab933ed82def95da0f94

4
Assets/ML-Agents/Timers/WinScreen_timers.json
View File

@@ -1 +1,5 @@
<<<<<<< HEAD
{"count":1,"self":119.0030848,"total":122.1256981,"children":{"InitializeActuators":{"count":8,"self":0.002503,"total":0.002503,"children":null},"InitializeSensors":{"count":8,"self":0.0015129,"total":0.0015129,"children":null},"AgentSendState":{"count":4974,"self":0.3274958,"total":0.40929109999999996,"children":{"CollectObservations":{"count":7960,"self":0.041415299999999995,"total":0.041415299999999995,"children":null},"WriteActionMask":{"count":7960,"self":0.0062821,"total":0.0062821,"children":null},"RequestDecision":{"count":7960,"self":0.0340979,"total":0.0340979,"children":null}}},"DecideAction":{"count":4974,"self":2.3696098,"total":2.4060512999999997,"children":{"RayPerceptionSensor.Perceive":{"count":15920,"self":0.0364415,"total":0.0364415,"children":null}}},"AgentAct":{"count":4974,"self":0.30275369999999996,"total":0.30275369999999996,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":25.9936028,"min":22.422739,"runningAverage":23.9171925,"value":25.9936028,"weightedAverage":24.25875}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714130760","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714130882"}} {"count":1,"self":119.0030848,"total":122.1256981,"children":{"InitializeActuators":{"count":8,"self":0.002503,"total":0.002503,"children":null},"InitializeSensors":{"count":8,"self":0.0015129,"total":0.0015129,"children":null},"AgentSendState":{"count":4974,"self":0.3274958,"total":0.40929109999999996,"children":{"CollectObservations":{"count":7960,"self":0.041415299999999995,"total":0.041415299999999995,"children":null},"WriteActionMask":{"count":7960,"self":0.0062821,"total":0.0062821,"children":null},"RequestDecision":{"count":7960,"self":0.0340979,"total":0.0340979,"children":null}}},"DecideAction":{"count":4974,"self":2.3696098,"total":2.4060512999999997,"children":{"RayPerceptionSensor.Perceive":{"count":15920,"self":0.0364415,"total":0.0364415,"children":null}}},"AgentAct":{"count":4974,"self":0.30275369999999996,"total":0.30275369999999996,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":25.9936028,"min":22.422739,"runningAverage":23.9171925,"value":25.9936028,"weightedAverage":24.25875}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714130760","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714130882"}}
=======
{"count":1,"self":314.6955008,"total":335.1372398,"children":{"InitializeActuators":{"count":8,"self":0.0019959,"total":0.0019959,"children":null},"InitializeSensors":{"count":8,"self":0.0019916,"total":0.0019916,"children":null},"AgentSendState":{"count":8217,"self":1.5569809,"total":1.9225938,"children":{"CollectObservations":{"count":12800,"self":0.2236146,"total":0.2236146,"children":null},"WriteActionMask":{"count":12800,"self":0.041617299999999996,"total":0.041617299999999996,"children":null},"RequestDecision":{"count":12800,"self":0.100381,"total":0.100381,"children":null}}},"DecideAction":{"count":8217,"self":17.056696,"total":17.3266492,"children":{"RayPerceptionSensor.Perceive":{"count":25600,"self":0.2699526,"total":0.2699526,"children":null}}},"AgentAct":{"count":8217,"self":1.1885037,"total":1.1885037,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":21,"max":25.5467758,"min":21.5942726,"runningAverage":24.3378487,"value":24.4405937,"weightedAverage":24.7650566}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714130246","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714130581"}}
>>>>>>> 2a3284ac7c7577c027d1ab933ed82def95da0f94

189
Assets/Scenes/WinScreen.unity
View File

@@ -25,8 +25,8 @@ RenderSettings:
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1 m_AmbientIntensity: 1
m_AmbientMode: 0 m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SubtractiveShadowColor: {r: 0, g: 0, b: 0, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_SkyboxMaterial: {fileID: 10756, guid: 0000000000000000e000000000000000, type: 0}
m_HaloStrength: 0.5 m_HaloStrength: 0.5
m_FlareStrength: 1 m_FlareStrength: 1
m_FlareFadeSpeed: 3 m_FlareFadeSpeed: 3
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} m_IndirectSpecularColor: {r: NaN, g: NaN, b: NaN, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@@ -377,7 +377,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -385,7 +385,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -426,6 +426,7 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 0 insertIndex: 0
@@ -452,7 +453,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -460,7 +461,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -501,6 +502,7 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 0 insertIndex: 0
@@ -646,127 +648,6 @@ RectTransform:
m_AnchoredPosition: {x: 928, y: 230} m_AnchoredPosition: {x: 928, y: 230}
m_SizeDelta: {x: 1000, y: 400} m_SizeDelta: {x: 1000, y: 400}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &783549761
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 783549765}
- component: {fileID: 783549764}
- component: {fileID: 783549763}
- component: {fileID: 783549762}
m_Layer: 5
m_Name: Play
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &783549762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 783549763}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &783549763
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.23031552, g: 0.8490566, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 61583fba956632548911dbe60ba47876, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &783549764
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
m_CullTransparentMesh: 1
--- !u!224 &783549765
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 783549761}
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: 476199421}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 960, y: 148}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &784053825 --- !u!1001 &784053825
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -980,15 +861,6 @@ MonoBehaviour:
- {fileID: 1977529810} - {fileID: 1977529810}
- {fileID: 1257793076} - {fileID: 1257793076}
- {fileID: 1433079962} - {fileID: 1433079962}
Cars:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
--- !u!1001 &850453472 --- !u!1001 &850453472
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1177,13 +1049,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 869443461} m_GameObject: {fileID: 869443461}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0.05988247, y: -0, z: -0, w: 0.9982055}
m_LocalPosition: {x: 0, y: 1, z: -10} m_LocalPosition: {x: 0.75, y: 1.5, z: -9.44}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 6.866, y: 0, z: 0}
--- !u!1001 &874635445 --- !u!1001 &874635445
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1202,7 +1074,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -1210,7 +1082,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -1260,6 +1132,7 @@ PrefabInstance:
- {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 0 insertIndex: 0
@@ -1281,7 +1154,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -1289,7 +1162,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -1330,6 +1203,7 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 0 insertIndex: 0
@@ -1390,7 +1264,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 6bb0646f945fbe54f8d856b346e6c2f3, type: 2} m_Material: {fileID: 2100000, guid: a21417e157ac92141a0b12b3c32f207f, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -1633,7 +1507,7 @@ PrefabInstance:
m_Modifications: m_Modifications:
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -1641,7 +1515,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -1682,6 +1556,7 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 0 insertIndex: 0
@@ -2183,7 +2058,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -2191,7 +2066,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -2250,7 +2125,8 @@ PrefabInstance:
- {fileID: 662159084959827516, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 662159084959827516, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 6655979825460257188, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 6655979825460257188, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 6692659148362127303, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 6692659148362127303, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_RemovedGameObjects: [] m_RemovedGameObjects:
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
@@ -2536,7 +2412,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -2544,7 +2420,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -2593,6 +2469,7 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 0 insertIndex: 0
@@ -2622,7 +2499,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -3 value: -1.25
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@@ -2630,7 +2507,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: -4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@@ -2666,7 +2543,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - target: {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
propertyPath: car propertyPath: car
@@ -2680,6 +2557,7 @@ PrefabInstance:
- {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 6033441500748191172, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - {fileID: 1754551253132073341, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
- {fileID: 7539952653933852043, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
m_AddedGameObjects: m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} - targetCorrespondingSourceObject: {fileID: 4396357477850336864, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3}
insertIndex: 1 insertIndex: 1
@@ -2707,4 +2585,3 @@ SceneRoots:
- {fileID: 2076255753} - {fileID: 2076255753}
- {fileID: 874635445} - {fileID: 874635445}
- {fileID: 1050167112} - {fileID: 1050167112}
- {fileID: 783549765}

11
Assets/Scripts/WinScript.cs
View File

@@ -65,17 +65,18 @@ public class WinScript : MonoBehaviour
Garages[0].SetActive(true); Garages[0].SetActive(true);
} }
} }
}
private void FixedUpdate() {
MainText.text = "Leaderboard: "; MainText.text = "Leaderboard: ";
MainText2.text = "Time: "; MainText2.text = "Time: ";
for (var i = 0; i < leaderboard.Count; i++){ for (var i = 0; i < leaderboard.Count; i++){
MainText.text += "\n" + (i+1) + "." + leaderboard[i]; MainText.text += "\n" + (i+1) + "." + leaderboard[i];
MainText2.text += "\n(" + time[i] + ")"; MainText2.text += "\n(" + time[i] + ")";
} }
}
private void FixedUpdate() {
currentGarage.transform.eulerAngles += Vector3.up * 0.7f; currentGarage.transform.eulerAngles += Vector3.up * 0.7f;
//currentRotation = CurrentCar.transform.rotation; //currentRotation = CurrentCar.transform.rotation;
} }