diff --git a/Assets/ML-Agents/Timers/Car Customization_timers.json b/Assets/ML-Agents/Timers/Car Customization_timers.json index a853f61..e8f5150 100644 --- a/Assets/ML-Agents/Timers/Car Customization_timers.json +++ b/Assets/ML-Agents/Timers/Car Customization_timers.json @@ -1 +1 @@ -{"count":1,"self":56.8048,"total":57.3738068,"children":{"InitializeActuators":{"count":8,"self":0.00099209999999999988,"total":0.00099209999999999988,"children":null},"InitializeSensors":{"count":8,"self":0.0020247,"total":0.0020247,"children":null},"AgentSendState":{"count":478,"self":0.0334471,"total":0.058982099999999996,"children":{"CollectObservations":{"count":768,"self":0.0075978999999999994,"total":0.0075978999999999994,"children":null},"WriteActionMask":{"count":768,"self":0.0019887,"total":0.0019887,"children":null},"RequestDecision":{"count":768,"self":0.015948399999999998,"total":0.015948399999999998,"children":null}}},"DecideAction":{"count":478,"self":0.4642299,"total":0.46823099999999995,"children":{"RayPerceptionSensor.Perceive":{"count":1536,"self":0.0040011,"total":0.0040011,"children":null}}},"AgentAct":{"count":478,"self":0.0387791,"total":0.0387791,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714149982","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Noah\\Documents\\Unity\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Noah -hubSessionId afc1258c-abe0-4a00-8f4e-1d44662f8e05 -accessToken E8uMA-2GqZxoKnR6eDa7D1Oy5BMcE1EuXtrSjgTRut0005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714150039"}} \ No newline at end of file +{"count":1,"self":183.9980416,"total":186.20727159999998,"children":{"InitializeActuators":{"count":8,"self":0.0009973,"total":0.0009973,"children":null},"InitializeSensors":{"count":8,"self":0.001995,"total":0.001995,"children":null},"AgentSendState":{"count":4754,"self":0.2850662,"total":0.35660929999999996,"children":{"CollectObservations":{"count":7608,"self":0.0369453,"total":0.0369453,"children":null},"WriteActionMask":{"count":7608,"self":0.0116236,"total":0.0116236,"children":null},"RequestDecision":{"count":7608,"self":0.0229742,"total":0.0229742,"children":null}}},"DecideAction":{"count":4754,"self":1.5516733999999999,"total":1.5815298999999998,"children":{"RayPerceptionSensor.Perceive":{"count":15216,"self":0.029856499999999998,"total":0.029856499999999998,"children":null}}},"AgentAct":{"count":4754,"self":0.2680945,"total":0.2680945,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":4,"max":28.08815,"min":22.9229279,"runningAverage":26.5486717,"value":22.9229279,"weightedAverage":26.620079}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714150051","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Noah\\Documents\\Unity\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Noah -hubSessionId afc1258c-abe0-4a00-8f4e-1d44662f8e05 -accessToken E8uMA-2GqZxoKnR6eDa7D1Oy5BMcE1EuXtrSjgTRut0005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714150237"}} \ No newline at end of file diff --git a/Assets/Prefabs/Driving UI.prefab b/Assets/Prefabs/Driving UI.prefab index b2b92e0..cee4202 100644 --- a/Assets/Prefabs/Driving UI.prefab +++ b/Assets/Prefabs/Driving UI.prefab @@ -134,6 +134,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &686871245494680498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6530904654894075424} + - component: {fileID: 4298078564243625219} + - component: {fileID: 6909792850662985518} + m_Layer: 5 + m_Name: Speedometre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6530904654894075424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686871245494680498} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6591880210688179092} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 77, y: 66} + m_SizeDelta: {x: 508.17004, y: 68.92291} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4298078564243625219 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686871245494680498} + m_CullTransparentMesh: 1 +--- !u!114 &6909792850662985518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 686871245494680498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: 123 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: -57.35727} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2249422870405817347 GameObject: m_ObjectHideFlags: 0 @@ -569,6 +703,7 @@ RectTransform: m_Children: - {fileID: 8518173326926186102} - {fileID: 4473337556744181764} + - {fileID: 6530904654894075424} - {fileID: 1862320999672514362} - {fileID: 6636506657744911434} - {fileID: 921006781256657926} @@ -660,7 +795,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &921006781256657926 RectTransform: m_ObjectHideFlags: 0 @@ -764,20 +899,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: TimeOfDay, Assembly-CSharp - m_MethodName: SetTimeOfDay - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: MapSelectorScript, Assembly-CSharp - m_MethodName: SelectMapAndLoadScene + m_TargetAssemblyTypeName: GameController, Assembly-CSharp + m_MethodName: NextCar m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scenes/CityRacetrack.unity b/Assets/Scenes/CityRacetrack.unity index 3b2e5e1..2f7ba49 100644 --- a/Assets/Scenes/CityRacetrack.unity +++ b/Assets/Scenes/CityRacetrack.unity @@ -3244,6 +3244,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6044828091041745544, guid: 7a3d78e18ac1cd7458d86f15c7aedc7a, type: 3} m_PrefabInstance: {fileID: 1965039481} m_PrefabAsset: {fileID: 0} +--- !u!114 &742209470 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6909792850662985518, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 787693911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &778267458 PrefabInstance: m_ObjectHideFlags: 0 @@ -22281,6 +22292,10 @@ PrefabInstance: propertyPath: nextCarbtn value: objectReference: {fileID: 787693914} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: speedometer + value: + objectReference: {fileID: 742209470} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: timeCounter value: diff --git a/Assets/Scenes/ForestRacetrack.unity b/Assets/Scenes/ForestRacetrack.unity index 35620e9..307d2dc 100644 --- a/Assets/Scenes/ForestRacetrack.unity +++ b/Assets/Scenes/ForestRacetrack.unity @@ -1425,140 +1425,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 7862065244346366242, guid: 3b4743a43e04ed145b531ab0f1ae828b, type: 3} m_PrefabInstance: {fileID: 1228275738} m_PrefabAsset: {fileID: 0} ---- !u!1 &1263430742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1263430743} - - component: {fileID: 1263430745} - - component: {fileID: 1263430744} - m_Layer: 5 - m_Name: Speedometre - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1263430743 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1263430742} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4459975215774235059} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 77, y: 66} - m_SizeDelta: {x: 508.17004, y: 68.92291} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1263430744 +--- !u!114 &1263430744 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6909792850662985518, guid: ad34455a014250446a5073260803b0a0, type: 3} + m_PrefabInstance: {fileID: 4459975215774235058} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1263430742} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_text: 123 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: -57.35727} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1263430745 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1263430742} - m_CullTransparentMesh: 1 --- !u!1001 &1281433423 PrefabInstance: m_ObjectHideFlags: 0 @@ -3857,54 +3734,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 556260503} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 11500000, guid: b00fe924fac7ccc488443310caf9e5b9, type: 3} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: NextCar - objectReference: {fileID: 0} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: - objectReference: {fileID: 0} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: GameController, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: - objectReference: {fileID: 0} - - target: {fileID: 710581762558348017, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 4015923860507804037, guid: ad34455a014250446a5073260803b0a0, type: 3} propertyPath: m_Name value: Driving UI objectReference: {fileID: 0} - - target: {fileID: 5715023284740291791, guid: ad34455a014250446a5073260803b0a0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} propertyPath: m_Pivot.x value: 0 @@ -3987,17 +3824,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} - insertIndex: 2 - addedObject: {fileID: 1263430743} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad34455a014250446a5073260803b0a0, type: 3} ---- !u!224 &4459975215774235059 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6591880210688179092, guid: ad34455a014250446a5073260803b0a0, type: 3} - m_PrefabInstance: {fileID: 4459975215774235058} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8684226825208193988 PrefabInstance: m_ObjectHideFlags: 0