Merge branch 'master' of ooftooft.net:Racesm
# Conflicts: # Assets/ML-Agents/Timers/Racetrack mini_timers.json
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,66 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!850595691 &4890085278179872738
|
||||
LightingSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Demo DaySettings
|
||||
serializedVersion: 6
|
||||
m_GIWorkflowMode: 0
|
||||
m_EnableBakedLightmaps: 0
|
||||
m_EnableRealtimeLightmaps: 0
|
||||
m_RealtimeEnvironmentLighting: 1
|
||||
m_BounceScale: 1
|
||||
m_AlbedoBoost: 1
|
||||
m_IndirectOutputScale: 1
|
||||
m_UsingShadowmask: 0
|
||||
m_BakeBackend: 0
|
||||
m_LightmapMaxSize: 1024
|
||||
m_BakeResolution: 40
|
||||
m_Padding: 2
|
||||
m_LightmapCompression: 3
|
||||
m_AO: 0
|
||||
m_AOMaxDistance: 1
|
||||
m_CompAOExponent: 1
|
||||
m_CompAOExponentDirect: 0
|
||||
m_ExtractAO: 0
|
||||
m_MixedBakeMode: 0
|
||||
m_LightmapsBakeMode: 1
|
||||
m_FilterMode: 1
|
||||
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ExportTrainingData: 0
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_RealtimeResolution: 2
|
||||
m_ForceWhiteAlbedo: 0
|
||||
m_ForceUpdates: 0
|
||||
m_FinalGather: 0
|
||||
m_FinalGatherRayCount: 256
|
||||
m_FinalGatherFiltering: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRSampling: 1
|
||||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 512
|
||||
m_PVREnvironmentSampleCount: 512
|
||||
m_PVREnvironmentReferencePointCount: 2048
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_PVRBounces: 2
|
||||
m_PVRMinBounces: 2
|
||||
m_PVREnvironmentImportanceSampling: 0
|
||||
m_PVRFilteringMode: 2
|
||||
m_PVRDenoiserTypeDirect: 0
|
||||
m_PVRDenoiserTypeIndirect: 0
|
||||
m_PVRDenoiserTypeAO: 0
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_PVRTiledBaking: 0
|
||||
m_NumRaysToShootPerTexel: -1
|
||||
m_RespectSceneVisibilityWhenBakingGI: 0
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 25e498c4d2b855947abb03d41c36507e
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 4890085278179872738
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
1
Assets/ML-Agents/Timers/ForestRacetrack_timers.json
Normal file
1
Assets/ML-Agents/Timers/ForestRacetrack_timers.json
Normal file
@@ -0,0 +1 @@
|
||||
{"count":1,"self":21.5131744,"total":23.13593,"children":{"InitializeActuators":{"count":8,"self":0.0025478,"total":0.0025478,"children":null},"InitializeSensors":{"count":8,"self":0.0029984,"total":0.0029984,"children":null},"AgentSendState":{"count":909,"self":0.13680989999999998,"total":0.1972582,"children":{"CollectObservations":{"count":1456,"self":0.031240499999999997,"total":0.031240499999999997,"children":null},"WriteActionMask":{"count":1456,"self":0.0027826,"total":0.0027826,"children":null},"RequestDecision":{"count":1456,"self":0.0264252,"total":0.0264252,"children":null}}},"DecideAction":{"count":909,"self":1.2634709,"total":1.28315,"children":{"RayPerceptionSensor.Perceive":{"count":2912,"self":0.019679099999999998,"total":0.019679099999999998,"children":null}}},"AgentAct":{"count":909,"self":0.1368018,"total":0.1368018,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714118759","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId f8278c6f-053c-492d-a479-00a9dbf73437 -accessToken 1rPuSgTkgUUOXMaGthhixd2ZEngLQ-H31CETUrEqtzM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"ForestRacetrack","end_time_seconds":"1714118782"}}
|
||||
@@ -1 +1 @@
|
||||
{"count":1,"self":50.872592,"total":50.954067699999996,"children":{"InitializeActuators":{"count":1,"self":0.0010263,"total":0.0010263,"children":null},"InitializeSensors":{"count":1,"self":0.0015439,"total":0.0015439,"children":null},"AgentSendState":{"count":2204,"self":0.0344133,"total":0.038423599999999995,"children":{"CollectObservations":{"count":86,"self":0.0009994,"total":0.0009994,"children":null},"WriteActionMask":{"count":86,"self":0.0010086,"total":0.0010086,"children":null},"RequestDecision":{"count":86,"self":0.0010004,"total":0.0020023,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010019,"total":0.0010019,"children":null}}}}},"DecideAction":{"count":2204,"self":0.035701699999999996,"total":0.035701699999999996,"children":null},"AgentAct":{"count":2204,"self":0.0047789,"total":0.0047789,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714050106","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId 9c1f01bb-11a4-4f0f-a783-b9132e478973 -accessToken 4E81NOgN5ztdhX4t4u3WEoX4xouq9HnIn-2L54HpD0Y005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Map selector","end_time_seconds":"1714050157"}}
|
||||
{"count":1,"self":25.826839999999997,"total":27.046067599999997,"children":{"InitializeActuators":{"count":8,"self":0.0010014,"total":0.0010014,"children":null},"InitializeSensors":{"count":8,"self":0.0020006,"total":0.0020006,"children":null},"AgentSendState":{"count":675,"self":0.09180859999999999,"total":0.1420426,"children":{"CollectObservations":{"count":1080,"self":0.018719799999999998,"total":0.018719799999999998,"children":null},"WriteActionMask":{"count":1080,"self":0.0025432,"total":0.0025432,"children":null},"RequestDecision":{"count":1080,"self":0.028971,"total":0.028971,"children":null}}},"DecideAction":{"count":675,"self":0.92951109999999992,"total":0.9457123,"children":{"RayPerceptionSensor.Perceive":{"count":2160,"self":0.0162012,"total":0.0162012,"children":null}}},"AgentAct":{"count":675,"self":0.128471,"total":0.128471,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714118721","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId f8278c6f-053c-492d-a479-00a9dbf73437 -accessToken 1rPuSgTkgUUOXMaGthhixd2ZEngLQ-H31CETUrEqtzM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Map selector","end_time_seconds":"1714118748"}}
|
||||
@@ -1 +1,13 @@
|
||||
<<<<<<< HEAD
|
||||
{"count":1,"self":130.6553984,"total":134.4493369,"children":{"InitializeActuators":{"count":8,"self":0.0010198,"total":0.0010198,"children":null},"InitializeSensors":{"count":8,"self":0.0030066999999999997,"total":0.0030066999999999997,"children":null},"AgentSendState":{"count":6496,"self":0.3408002,"total":0.42935599999999996,"children":{"CollectObservations":{"count":10400,"self":0.0540232,"total":0.0540232,"children":null},"WriteActionMask":{"count":10400,"self":0.0082496,"total":0.0082496,"children":null},"RequestDecision":{"count":10400,"self":0.026282999999999997,"total":0.026282999999999997,"children":null}}},"DecideAction":{"count":6496,"self":2.8975516,"total":2.9549209,"children":{"RayPerceptionSensor.Perceive":{"count":20800,"self":0.057369199999999995,"total":0.057369199999999995,"children":null}}},"AgentAct":{"count":6496,"self":0.4041279,"total":0.4041279,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":24.5043068,"min":20.8994446,"runningAverage":22.6464348,"value":20.8994446,"weightedAverage":22.3884468}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714118530","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":"Racetrack mini","end_time_seconds":"1714118664"}}
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
{"count":1,"self":8.4118592,"total":8.6212582,"children":{"InitializeActuators":{"count":8,"self":0.0015846999999999999,"total":0.0015846999999999999,"children":null},"InitializeSensors":{"count":8,"self":0.0026517,"total":0.0026517,"children":null},"AgentSendState":{"count":165,"self":0.0284722,"total":0.0438079,"children":{"CollectObservations":{"count":264,"self":0.0020005,"total":0.0020005,"children":null},"WriteActionMask":{"count":264,"self":0.00051959999999999994,"total":0.00051959999999999994,"children":null},"RequestDecision":{"count":264,"self":0.0128156,"total":0.0128156,"children":null}}},"DecideAction":{"count":165,"self":0.1331645,"total":0.13570669999999999,"children":{"RayPerceptionSensor.Perceive":{"count":528,"self":0.0025421999999999997,"total":0.0025421999999999997,"children":null}}},"AgentAct":{"count":165,"self":0.0246146,"total":0.0246146,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714115397","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId f8278c6f-053c-492d-a479-00a9dbf73437 -accessToken 1rPuSgTkgUUOXMaGthhixd2ZEngLQ-H31CETUrEqtzM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1714115406"}}
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
{"count":1,"self":52.366592,"total":53.0602252,"children":{"InitializeActuators":{"count":8,"self":0.001,"total":0.001,"children":null},"InitializeSensors":{"count":8,"self":0.0030047999999999997,"total":0.0030047999999999997,"children":null},"AgentSendState":{"count":2421,"self":0.1186515,"total":0.1531092,"children":{"CollectObservations":{"count":3880,"self":0.020620199999999998,"total":0.020620199999999998,"children":null},"WriteActionMask":{"count":3880,"self":0.0038607,"total":0.0038607,"children":null},"RequestDecision":{"count":3880,"self":0.0099768,"total":0.0099768,"children":null}}},"DecideAction":{"count":2421,"self":0.3727546,"total":0.38228779999999996,"children":{"RayPerceptionSensor.Perceive":{"count":7760,"self":0.0095332,"total":0.0095332,"children":null}}},"AgentAct":{"count":2421,"self":0.15323209999999998,"total":0.15323209999999998,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":1,"max":24.2250633,"min":24.2250633,"runningAverage":24.2250633,"value":24.2250633,"weightedAverage":24.2250633}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714115875","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":"Racetrack mini","end_time_seconds":"1714115928"}}
|
||||
=======
|
||||
{"count":1,"self":77.2914176,"total":88.8739126,"children":{"InitializeActuators":{"count":8,"self":0.0059371,"total":0.0059371,"children":null},"InitializeSensors":{"count":8,"self":0.0019879,"total":0.0019879,"children":null},"AgentSendState":{"count":4180,"self":0.83452129999999991,"total":1.0729148,"children":{"CollectObservations":{"count":6688,"self":0.1623398,"total":0.1623398,"children":null},"WriteActionMask":{"count":6688,"self":0.0225535,"total":0.0225535,"children":null},"RequestDecision":{"count":6688,"self":0.0535002,"total":0.0535002,"children":null}}},"DecideAction":{"count":4180,"self":9.6043296,"total":9.7296031,"children":{"RayPerceptionSensor.Perceive":{"count":13376,"self":0.1252737,"total":0.1252737,"children":null}}},"AgentAct":{"count":4180,"self":0.7690629,"total":0.7690629,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":20,"max":25.1789246,"min":-0.826870739,"runningAverage":10.11593,"value":25.0408516,"weightedAverage":15.8942223}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714115839","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":"Racetrack mini","end_time_seconds":"1714115927"}}
|
||||
>>>>>>> d491c6dee7672d848b4f6de15eb4260fa3aef046
|
||||
>>>>>>> 55d93fe847a3f9f20fddf621f05aa62eaa6f0e48
|
||||
>>>>>>> 50c949f0cb8ee052c50c63755f03e263ce8efc2d
|
||||
|
||||
@@ -1 +1,5 @@
|
||||
<<<<<<< HEAD
|
||||
{"count":1,"self":11.8450048,"total":11.9435941,"children":{"InitializeActuators":{"count":1,"self":0.0010058,"total":0.0010058,"children":null},"InitializeSensors":{"count":1,"self":0.003534,"total":0.003534,"children":null},"AgentSendState":{"count":328,"self":0.0489465,"total":0.0925339,"children":{"CollectObservations":{"count":328,"self":0.0435874,"total":0.0435874,"children":null}}}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714116338","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\hassa\\OneDrive\\Skrivebord\\alt pro\\Unity stuff\\Unity ting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-hassa -hubSessionId f8278c6f-053c-492d-a479-00a9dbf73437 -accessToken 1rPuSgTkgUUOXMaGthhixd2ZEngLQ-H31CETUrEqtzM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1714116350"}}
|
||||
=======
|
||||
{"count":1,"self":15.556857599999999,"total":16.1084672,"children":{"InitializeActuators":{"count":8,"self":0.0069818,"total":0.0069818,"children":null},"InitializeSensors":{"count":8,"self":0.0019955,"total":0.0019955,"children":null},"AgentSendState":{"count":570,"self":0.0815235,"total":0.11306559999999999,"children":{"CollectObservations":{"count":912,"self":0.016867,"total":0.016867,"children":null},"WriteActionMask":{"count":912,"self":0.0010308,"total":0.0010308,"children":null},"RequestDecision":{"count":912,"self":0.0136443,"total":0.0136443,"children":null}}},"DecideAction":{"count":570,"self":0.32478579999999996,"total":0.3337745,"children":{"RayPerceptionSensor.Perceive":{"count":1824,"self":0.0089886999999999988,"total":0.0089886999999999988,"children":null}}},"AgentAct":{"count":570,"self":0.0937756,"total":0.0937756,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":8,"max":-0.0181858838,"min":-0.132031038,"runningAverage":-0.06643952,"value":-0.0427289754,"weightedAverage":-0.0568303242}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714113351","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":"mini_racetrack3","end_time_seconds":"1714113367"}}
|
||||
>>>>>>> 55d93fe847a3f9f20fddf621f05aa62eaa6f0e48
|
||||
|
||||
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.44783193, g: 0.4978208, b: 0.5754451, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.4482451, g: 0.49827182, b: 0.57558125, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -548,6 +548,7 @@ PrefabInstance:
|
||||
- {fileID: 8294937918364224223, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
|
||||
- {fileID: 6493244483487560032, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
|
||||
- {fileID: 3639310642003440231, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
|
||||
- {fileID: 1023705412061189779, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3}
|
||||
@@ -1631,6 +1632,140 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1828470746108631247, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
|
||||
m_PrefabInstance: {fileID: 1409977001}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &902861123
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 902861124}
|
||||
- component: {fileID: 902861126}
|
||||
- component: {fileID: 902861125}
|
||||
m_Layer: 5
|
||||
m_Name: TellSelectedMap
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &902861124
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 902861123}
|
||||
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: 1978614972}
|
||||
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: 0, y: 200}
|
||||
m_SizeDelta: {x: 500, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &902861125
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 902861123}
|
||||
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: test
|
||||
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: 36
|
||||
m_fontSizeBase: 36
|
||||
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: 0}
|
||||
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 &902861126
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 902861123}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &935790745
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1996,6 +2131,100 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1096132570}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1179479087
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1179479088}
|
||||
- component: {fileID: 1179479089}
|
||||
m_Layer: 0
|
||||
m_Name: NightLight
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1179479088
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1179479087}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.17250393, y: -0.5262795, z: 0.16878895, w: 0.81534195}
|
||||
m_LocalPosition: {x: 0, y: 3, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1193353612}
|
||||
m_LocalEulerAnglesHint: {x: 27.320002, y: -64.21, z: 6.0520005}
|
||||
--- !u!108 &1179479089
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1179479087}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 10
|
||||
m_Type: 1
|
||||
m_Shape: 0
|
||||
m_Color: {r: 0.26379493, g: 0.40115762, b: 0.9811321, a: 1}
|
||||
m_Intensity: 1.2
|
||||
m_Range: 10
|
||||
m_SpotAngle: 30
|
||||
m_InnerSpotAngle: 21.80208
|
||||
m_CookieSize: 10
|
||||
m_Shadows:
|
||||
m_Type: 2
|
||||
m_Resolution: 3
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 1
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!1 &1181192970
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2008,7 +2237,7 @@ GameObject:
|
||||
- component: {fileID: 1181192973}
|
||||
- component: {fileID: 1181192972}
|
||||
m_Layer: 5
|
||||
m_Name: MainText
|
||||
m_Name: TellSelectedTime
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -2053,7 +2282,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text:
|
||||
m_text: test
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
@@ -2159,8 +2388,15 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: ab14f81283cca7e4c91a272a9773809d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
DayLight: {fileID: 1348142924}
|
||||
NightLight: {fileID: 1179479087}
|
||||
skyboxMaterial:
|
||||
MainText: {fileID: 1181192972}
|
||||
DaySkybox: {fileID: 2100000, guid: 86301280b87f5bb4bbf7633b535e2fc0, type: 2}
|
||||
NightSkybox: {fileID: 2100000, guid: 1c8ac9deb3459a4448cc882add76b675, type: 2}
|
||||
Lights:
|
||||
- {fileID: 1348142924}
|
||||
- {fileID: 1179479087}
|
||||
TellTime: {fileID: 1181192972}
|
||||
--- !u!4 &1193353612
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2173,7 +2409,9 @@ Transform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 1348142926}
|
||||
- {fileID: 1179479088}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &1272827913 stripped
|
||||
@@ -2319,6 +2557,100 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5a9f1aa26b2a080419f59c5b5385d3b4, type: 3}
|
||||
--- !u!1 &1348142924
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1348142926}
|
||||
- component: {fileID: 1348142925}
|
||||
m_Layer: 0
|
||||
m_Name: DayLight
|
||||
m_TagString: Wall
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!108 &1348142925
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1348142924}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 10
|
||||
m_Type: 1
|
||||
m_Shape: 0
|
||||
m_Color: {r: 0.84483033, g: 0.84313726, b: 0.99215686, a: 1}
|
||||
m_Intensity: 1
|
||||
m_Range: 10
|
||||
m_SpotAngle: 30
|
||||
m_InnerSpotAngle: 21.80208
|
||||
m_CookieSize: 10
|
||||
m_Shadows:
|
||||
m_Type: 2
|
||||
m_Resolution: 3
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 1
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!4 &1348142926
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1348142924}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
|
||||
m_LocalPosition: {x: 0, y: 3, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1193353612}
|
||||
m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
|
||||
--- !u!1001 &1409977001
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2588,7 +2920,8 @@ MonoBehaviour:
|
||||
- {fileID: 541536234}
|
||||
- {fileID: 1769403741}
|
||||
CameraRotator: {fileID: 841402786}
|
||||
scene: 0
|
||||
scene:
|
||||
TellMap: {fileID: 902861125}
|
||||
--- !u!4 &1569276544 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1122406829654900761, guid: 5a9f1aa26b2a080419f59c5b5385d3b4, type: 3}
|
||||
@@ -3171,6 +3504,7 @@ RectTransform:
|
||||
- {fileID: 59547259}
|
||||
- {fileID: 1623944368}
|
||||
- {fileID: 1181192971}
|
||||
- {fileID: 902861124}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
||||
@@ -3,23 +3,26 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine.UI;
|
||||
using TMPro;
|
||||
|
||||
public class MapSelectorScript : MonoBehaviour
|
||||
{
|
||||
public GameObject[] Maps;
|
||||
GameObject currentMap;
|
||||
quaternion currentRotation;
|
||||
public GameObject CameraRotator;
|
||||
public int scene;
|
||||
public string scene = "ForestRacetrack";
|
||||
public TextMeshProUGUI TellMap;
|
||||
|
||||
void Start()
|
||||
{
|
||||
DisableAllMaps();
|
||||
SelectMap(0);
|
||||
DisableAllMaps();
|
||||
ChangeToTrack2();
|
||||
}
|
||||
private void FixedUpdate()
|
||||
{
|
||||
CameraRotator.transform.eulerAngles += Vector3.up * 0.7f;
|
||||
TellMap.text = "Selected map: \n" + scene;
|
||||
}
|
||||
|
||||
void DisableAllMaps()
|
||||
@@ -33,20 +36,18 @@ public class MapSelectorScript : MonoBehaviour
|
||||
void SelectMap(int index)
|
||||
{
|
||||
DisableAllMaps();
|
||||
|
||||
currentMap = Maps[index];
|
||||
currentMap.SetActive(true);
|
||||
Maps[index].SetActive(true);
|
||||
}
|
||||
|
||||
public void ChangeToTrack2()
|
||||
{
|
||||
scene = 2;
|
||||
scene = "ForestRacetrack";
|
||||
SelectMap(0);
|
||||
}
|
||||
|
||||
public void ChangeToTrack3()
|
||||
{
|
||||
scene = 3;
|
||||
scene = "CityRacetrack";
|
||||
SelectMap(1);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ public class SkyboxLoader : MonoBehaviour
|
||||
void Awake()
|
||||
{
|
||||
skyboxToLoad = GameObject.Find("SkyboxManager").GetComponent<TimeOfDay>().skyboxMaterial;
|
||||
Debug.Log("Skybox: " + skyboxToLoad);
|
||||
if (skyboxToLoad == "Day")
|
||||
{
|
||||
RenderSettings.skybox = skyboxDay;
|
||||
|
||||
@@ -6,26 +6,46 @@ using TMPro;
|
||||
|
||||
public class TimeOfDay : MonoBehaviour
|
||||
{
|
||||
public string skyboxMaterial = "not selected";
|
||||
public GameObject DayLight;
|
||||
public GameObject NightLight;
|
||||
public string skyboxMaterial = "Night";
|
||||
public Material DaySkybox;
|
||||
public Material NightSkybox;
|
||||
public GameObject[] Lights;
|
||||
|
||||
public static TimeOfDay Instance;
|
||||
public TextMeshProUGUI MainText;
|
||||
public TextMeshProUGUI TellTime;
|
||||
void DisableAllLights()
|
||||
{
|
||||
foreach (GameObject light in Lights)
|
||||
{
|
||||
light.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void ChangeToDayTime()
|
||||
{
|
||||
NightLight.SetActive(false);
|
||||
RenderSettings.skybox = DaySkybox;
|
||||
DayLight.SetActive(true);
|
||||
skyboxMaterial = "Day";
|
||||
}
|
||||
public void ChangeToNightTime()
|
||||
{
|
||||
skyboxMaterial = "Night";
|
||||
DayLight.SetActive(false);
|
||||
RenderSettings.skybox = NightSkybox;
|
||||
NightLight.SetActive(true);
|
||||
skyboxMaterial = "Night"; ;
|
||||
}
|
||||
private void Awake()
|
||||
{
|
||||
Instance = this;
|
||||
DontDestroyOnLoad(gameObject);
|
||||
DisableAllLights();
|
||||
ChangeToNightTime();
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
MainText.text = "Selected time of day: \n" + skyboxMaterial;
|
||||
TellTime.text = "Selected time of day: \n" + skyboxMaterial;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,10 +12,10 @@ EditorBuildSettings:
|
||||
path: Assets/Scenes/Map selector.unity
|
||||
guid: 3bfd8ede691814e41941f96acfa07d03
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Racetrack mini.unity
|
||||
path: Assets/Scenes/ForestRacetrack.unity
|
||||
guid: 9b5f77be9dfb7c14cba3af351597ec83
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/mini_racetrack3.unity
|
||||
path: Assets/Scenes/CityRacetrack.unity
|
||||
guid: 2d4634271c08833499c8478f17c7a330
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/WinScreen.unity
|
||||
|
||||
Reference in New Issue
Block a user