Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts: # Assets/ML-Agents/Timers/Car Customization_timers.json
This commit is contained in:
@@ -94,13 +94,13 @@ AnimatorController:
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
m_Controller: {fileID: 0}
|
||||
- m_Name: IsTurning
|
||||
m_Type: 4
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
m_Controller: {fileID: 0}
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
|
||||
BIN
Assets/Brains/IcecreamTrack3.onnx
Normal file
BIN
Assets/Brains/IcecreamTrack3.onnx
Normal file
Binary file not shown.
16
Assets/Brains/IcecreamTrack3.onnx.meta
Normal file
16
Assets/Brains/IcecreamTrack3.onnx.meta
Normal file
@@ -0,0 +1,16 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 51ab194121bd4714e911514655ea2fb4
|
||||
ScriptedImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
script: {fileID: 11500000, guid: 683b6cb6d0a474744822c888b46772c9, type: 3}
|
||||
optimizeModel: 1
|
||||
forceArbitraryBatchSize: 1
|
||||
treatErrorsAsWarnings: 0
|
||||
importMode: 1
|
||||
weightsTypeMode: 0
|
||||
activationTypeMode: 0
|
||||
@@ -1 +1,5 @@
|
||||
{"count":1,"self":25.919055999999998,"total":26.0553273,"children":{"InitializeActuators":{"count":16,"self":0.0020192,"total":0.0020192,"children":null},"InitializeSensors":{"count":16,"self":0.0030050999999999997,"total":0.0030050999999999997,"children":null},"AgentSendState":{"count":623,"self":0.011010899999999999,"total":0.0260053,"children":{"CollectObservations":{"count":16,"self":0.0043517,"total":0.0043517,"children":null},"WriteActionMask":{"count":16,"self":0,"total":0,"children":null},"RequestDecision":{"count":16,"self":0.0106427,"total":0.0106427,"children":null}}},"DecideAction":{"count":623,"self":0.1028321,"total":0.1028321,"children":{"RayPerceptionSensor.Perceive":{"count":32,"self":0,"total":0,"children":null}}},"AgentAct":{"count":623,"self":0.0024088,"total":0.0024088,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715030053","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 241a7e8b-8e59-42dc-ac5d-d2629bbc50e9 -accessToken O1Pft86x9yY_OawA2wu4zp8_DAkDfoE5TpPvbxmFl-c005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1715030079"}}
|
||||
<<<<<<< HEAD
|
||||
{"count":1,"self":25.919055999999998,"total":26.0553273,"children":{"InitializeActuators":{"count":16,"self":0.0020192,"total":0.0020192,"children":null},"InitializeSensors":{"count":16,"self":0.0030050999999999997,"total":0.0030050999999999997,"children":null},"AgentSendState":{"count":623,"self":0.011010899999999999,"total":0.0260053,"children":{"CollectObservations":{"count":16,"self":0.0043517,"total":0.0043517,"children":null},"WriteActionMask":{"count":16,"self":0,"total":0,"children":null},"RequestDecision":{"count":16,"self":0.0106427,"total":0.0106427,"children":null}}},"DecideAction":{"count":623,"self":0.1028321,"total":0.1028321,"children":{"RayPerceptionSensor.Perceive":{"count":32,"self":0,"total":0,"children":null}}},"AgentAct":{"count":623,"self":0.0024088,"total":0.0024088,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1715030053","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 241a7e8b-8e59-42dc-ac5d-d2629bbc50e9 -accessToken O1Pft86x9yY_OawA2wu4zp8_DAkDfoE5TpPvbxmFl-c005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1715030079"}}
|
||||
=======
|
||||
{"count":1,"self":170.6196864,"total":176.9490449,"children":{"InitializeActuators":{"count":8,"self":0.0015007,"total":0.0015007,"children":null},"InitializeSensors":{"count":8,"self":0.0040471,"total":0.0040471,"children":null},"AgentSendState":{"count":7747,"self":0.46807129999999997,"total":0.6147848,"children":{"CollectObservations":{"count":10640,"self":0.0831681,"total":0.0831681,"children":null},"WriteActionMask":{"count":10640,"self":0.012088199999999999,"total":0.012088199999999999,"children":null},"RequestDecision":{"count":10640,"self":0.051457199999999995,"total":0.051457199999999995,"children":null}}},"DecideAction":{"count":7747,"self":5.2107312,"total":5.2949003999999995,"children":{"RayPerceptionSensor.Perceive":{"count":21280,"self":0.084169,"total":0.084169,"children":null}}},"AgentAct":{"count":7747,"self":0.4141276,"total":0.4141276,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":19,"max":25.6498146,"min":21.3881969,"runningAverage":23.8837967,"value":23.16743,"weightedAverage":23.44381}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714735188","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 85d9809b-2b48-49fa-8b19-19b03b8c9de2 -accessToken g69Q3rOF6XhsNSHAe-9n-tjkK-oRlfamVy3fNThRSrk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1714735365"}}
|
||||
>>>>>>> fc9d571b0b6cfc134cf091eb951dace83926ddee
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"count":1,"self":195.41159679999998,"total":198.03848159999998,"children":{"InitializeActuators":{"count":8,"self":0.0020007,"total":0.0020007,"children":null},"InitializeSensors":{"count":8,"self":0.0025236,"total":0.0025236,"children":null},"AgentSendState":{"count":9661,"self":0.5351234,"total":0.6740645,"children":{"CollectObservations":{"count":15464,"self":0.098202299999999992,"total":0.098202299999999992,"children":null},"WriteActionMask":{"count":15464,"self":0.0081061,"total":0.0081061,"children":null},"RequestDecision":{"count":15464,"self":0.0326327,"total":0.0326327,"children":null}}},"DecideAction":{"count":9661,"self":1.2607447999999999,"total":1.296937,"children":{"RayPerceptionSensor.Perceive":{"count":30928,"self":0.0361922,"total":0.0361922,"children":null}}},"AgentAct":{"count":9661,"self":0.6503544,"total":0.6503544,"children":null}},"gauges":{"RacecarTrack3.CumulativeReward":{"count":26,"max":27.7548618,"min":-1.80565119,"runningAverage":20.1893,"value":25.4251633,"weightedAverage":17.6442719}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714049138","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 b034e26d-02c7-41ad-9a20-c198a628a35a -accessToken Dt6gMuGhvx1BDLlNSM4Gg2t5w5_py5VVtuHcl5oYJQk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"City racesm","end_time_seconds":"1714049336"}}
|
||||
{"count":1,"self":72.5527808,"total":72.6327409,"children":{"InitializeActuators":{"count":8,"self":0.0010035999999999999,"total":0.0010035999999999999,"children":null},"InitializeSensors":{"count":8,"self":0.0013766,"total":0.0013766,"children":null},"AgentSendState":{"count":17,"self":0.0076086999999999995,"total":0.016133599999999998,"children":{"CollectObservations":{"count":32,"self":0.001005,"total":0.001005,"children":null},"WriteActionMask":{"count":32,"self":0,"total":0,"children":null},"RequestDecision":{"count":32,"self":0.0075198999999999995,"total":0.0075198999999999995,"children":null}}},"DecideAction":{"count":17,"self":0.0599388,"total":0.0599388,"children":{"RayPerceptionSensor.Perceive":{"count":64,"self":0,"total":0,"children":null}}},"AgentAct":{"count":17,"self":0.0015076999999999998,"total":0.0015076999999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714124476","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":"City racesm","end_time_seconds":"1714124548"}}
|
||||
1
Assets/ML-Agents/Timers/CityRacetrack_timers.json
Normal file
1
Assets/ML-Agents/Timers/CityRacetrack_timers.json
Normal file
@@ -0,0 +1 @@
|
||||
{"count":1,"self":26.095076799999998,"total":26.751341699999998,"children":{"InitializeActuators":{"count":8,"self":0.0009961,"total":0.0009961,"children":null},"InitializeSensors":{"count":8,"self":0.0029674999999999997,"total":0.0029674999999999997,"children":null},"AgentSendState":{"count":1105,"self":0.0747235,"total":0.1041604,"children":{"CollectObservations":{"count":1768,"self":0.0124887,"total":0.0124887,"children":null},"WriteActionMask":{"count":1768,"self":0,"total":0,"children":null},"RequestDecision":{"count":1768,"self":0.0169482,"total":0.0169482,"children":null}}},"DecideAction":{"count":1105,"self":0.4582231,"total":0.46919059999999996,"children":{"RayPerceptionSensor.Perceive":{"count":3536,"self":0.0109675,"total":0.0109675,"children":null}}},"AgentAct":{"count":1105,"self":0.077951899999999991,"total":0.077951899999999991,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714156312","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 HAsa1FnURjmkRUeQ_SpKT3QXzVn9_XUZdrXwm9silxw005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"CityRacetrack","end_time_seconds":"1714156339"}}
|
||||
7
Assets/ML-Agents/Timers/CityRacetrack_timers.json.meta
Normal file
7
Assets/ML-Agents/Timers/CityRacetrack_timers.json.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 492beb31ec749764381a05e45171cba2
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1 +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"}}
|
||||
{"count":1,"self":195.18133759999998,"total":200.6290046,"children":{"InitializeActuators":{"count":16,"self":0.0019947999999999997,"total":0.0019947999999999997,"children":null},"InitializeSensors":{"count":16,"self":0.0019928,"total":0.0019928,"children":null},"AgentSendState":{"count":9607,"self":0.48636199999999996,"total":0.6332255,"children":{"CollectObservations":{"count":14264,"self":0.0816422,"total":0.0816422,"children":null},"WriteActionMask":{"count":14264,"self":0.0139694,"total":0.0139694,"children":null},"RequestDecision":{"count":14264,"self":0.051251899999999996,"total":0.051251899999999996,"children":null}}},"DecideAction":{"count":9607,"self":4.2511976,"total":4.3219647,"children":{"RayPerceptionSensor.Perceive":{"count":28528,"self":0.0707672,"total":0.0707672,"children":null}}},"AgentAct":{"count":9607,"self":0.48747039999999997,"total":0.48747039999999997,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":10,"max":27.585743,"min":15.79072,"runningAverage":22.4482555,"value":21.1429329,"weightedAverage":22.6009483}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714150251","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":"ForestRacetrack","end_time_seconds":"1714150451"}}
|
||||
@@ -1,5 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: d8bb5515cee0b6a4eb5b45eb46ece700
|
||||
=======
|
||||
guid: 6988adb36b3693a46b16dc30340e98ca
|
||||
>>>>>>> f4d4e76f8b5ccb20237103e437b5acd47d7b3c40
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@@ -1,13 +1 @@
|
||||
<<<<<<< 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
|
||||
{"count":1,"self":260.8801792,"total":263.71180169999997,"children":{"InitializeActuators":{"count":2,"self":0.0012793,"total":0.0012793,"children":null},"InitializeSensors":{"count":2,"self":0.0020053,"total":0.0020053,"children":null},"AgentSendState":{"count":12917,"self":0.3768938,"total":0.4890713,"children":{"CollectObservations":{"count":5168,"self":0.058553799999999996,"total":0.058553799999999996,"children":null},"WriteActionMask":{"count":5168,"self":0.0059936999999999994,"total":0.0059936999999999994,"children":null},"RequestDecision":{"count":5168,"self":0.0429868,"total":0.04763,"children":{"RayPerceptionSensor.Perceive":{"count":5168,"self":0.0046432,"total":0.0046432,"children":null}}}}},"DecideAction":{"count":12917,"self":2.0233914,"total":2.0547198,"children":{"RayPerceptionSensor.Perceive":{"count":10336,"self":0.0313284,"total":0.0313284,"children":null}}},"AgentAct":{"count":12917,"self":0.2830542,"total":0.2830542,"children":null}},"gauges":{"BensonV7.CumulativeReward":{"count":1,"max":25.1733932,"min":25.1733932,"runningAverage":25.1733932,"value":25.1733932,"weightedAverage":25.1733932}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713945905","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 985081e8-b814-4bc7-8736-608aea67ce7e -accessToken fMKSu_LeJtSMMwbIluJ0HvaiatLXHDxWic8X4MA6BEQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713946168"}}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"count":1,"self":309.1399424,"total":332.36884549999996,"children":{"InitializeActuators":{"count":8,"self":0.0025664999999999998,"total":0.0025664999999999998,"children":null},"InitializeSensors":{"count":8,"self":0.0032746,"total":0.0032746,"children":null},"AgentSendState":{"count":16365,"self":2.330854,"total":2.7563383,"children":{"CollectObservations":{"count":21936,"self":0.2326556,"total":0.2326556,"children":null},"WriteActionMask":{"count":21936,"self":0.0537007,"total":0.0537007,"children":null},"RequestDecision":{"count":21936,"self":0.1391281,"total":0.1391281,"children":null}}},"DecideAction":{"count":16365,"self":18.895307199999998,"total":19.2007151,"children":{"RayPerceptionSensor.Perceive":{"count":43872,"self":0.30540819999999996,"total":0.30540819999999996,"children":null}}},"AgentAct":{"count":16365,"self":1.2650044,"total":1.2650044,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":24.6894,"min":10.6325016,"runningAverage":18.0623131,"value":14.3437386,"weightedAverage":17.18949}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714118988","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":"WinScreen","end_time_seconds":"1714119320"}}
|
||||
{"count":1,"self":133.92276479999998,"total":139.3228364,"children":{"InitializeActuators":{"count":8,"self":0.0019952999999999998,"total":0.0019952999999999998,"children":null},"InitializeSensors":{"count":8,"self":0.0025589,"total":0.0025589,"children":null},"AgentSendState":{"count":6673,"self":0.4113965,"total":0.5550511,"children":{"CollectObservations":{"count":9992,"self":0.0959213,"total":0.0959213,"children":null},"WriteActionMask":{"count":9992,"self":0.0086997999999999989,"total":0.0086997999999999989,"children":null},"RequestDecision":{"count":9992,"self":0.0390335,"total":0.0390335,"children":null}}},"DecideAction":{"count":6673,"self":4.3918268,"total":4.4624467,"children":{"RayPerceptionSensor.Perceive":{"count":19984,"self":0.0706198,"total":0.0706198,"children":null}}},"AgentAct":{"count":6673,"self":0.37602389999999997,"total":0.37602389999999997,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":15,"max":25.58403,"min":22.7010727,"runningAverage":24.49836,"value":25.538538,"weightedAverage":25.0865955}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714735378","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 85d9809b-2b48-49fa-8b19-19b03b8c9de2 -accessToken g69Q3rOF6XhsNSHAe-9n-tjkK-oRlfamVy3fNThRSrk005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714735517"}}
|
||||
@@ -30,8 +30,137 @@ Transform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1144658963992940466}
|
||||
- {fileID: 4361249635711236569}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3890584208436047927
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4361249635711236569}
|
||||
- component: {fileID: 1542968457024381360}
|
||||
m_Layer: 0
|
||||
m_Name: Audio Source
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4361249635711236569
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3890584208436047927}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.6666665, z: 0}
|
||||
m_LocalScale: {x: 3.333333, y: 3.333333, z: 3.333333}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3118456698246916321}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &1542968457024381360
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3890584208436047927}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: d5e7989d43ab6784a860d563c7c9030a, type: 3}
|
||||
m_PlayOnAwake: 0
|
||||
m_Volume: 0.7
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 400
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1001 &1144658963992848686
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -78,15 +207,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 435868, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 435868, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 435868, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 435868, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -353,6 +482,9 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 198426, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6294030686582083384}
|
||||
- targetCorrespondingSourceObject: {fileID: 198426, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 4309631380998233720}
|
||||
- targetCorrespondingSourceObject: {fileID: 114084, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1025572373165019511}
|
||||
@@ -444,6 +576,11 @@ PrefabInstance:
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 3354527560211728675}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
--- !u!95 &1144658963985576444 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 9509074, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
m_PrefabInstance: {fileID: 1144658963992848686}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1144658963992675708 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 175186, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
@@ -511,7 +648,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 0, z: -1}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: 43.31607, y: 2.554831, z: -15.454433}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: -1, z: 0}
|
||||
m_TwistLimitSpring:
|
||||
@@ -612,7 +749,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 0, z: 1}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: -43.316063, y: -2.5543444, z: 15.45443}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 1, z: 0}
|
||||
m_TwistLimitSpring:
|
||||
@@ -713,7 +850,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 1, z: 0}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: 4.115797, y: -2.6920707, z: 9.896754}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 0, z: 1}
|
||||
m_TwistLimitSpring:
|
||||
@@ -814,7 +951,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: -1, z: 0}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: -22.636595, y: 5.3689423, z: -7.447162}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 0, z: -1}
|
||||
m_TwistLimitSpring:
|
||||
@@ -915,7 +1052,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 1, z: 0}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: -22.63619, y: 5.3688793, z: 7.4471617}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 0, z: 1}
|
||||
m_TwistLimitSpring:
|
||||
@@ -1000,7 +1137,7 @@ Rigidbody:
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
@@ -1016,7 +1153,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 0, z: -1}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: -39.930927, y: 0.000030040741, z: -0.0000038146973}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: -1, z: 0}
|
||||
m_TwistLimitSpring:
|
||||
@@ -1115,7 +1252,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 1, y: 0, z: 0}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: -40.415417, y: 6.1366243, z: 1.9335363e-13}
|
||||
m_ConnectedAnchor: {x: -40.415405, y: 6.136572, z: 1.9335355e-13}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 0, z: 1}
|
||||
m_TwistLimitSpring:
|
||||
@@ -1219,6 +1356,21 @@ Rigidbody:
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &4309631380998233720
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1144658963992784436}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1cf5c39eb580998489213d03ff8a6760, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
animator: {fileID: 1144658963985576444}
|
||||
npcPrefab: {fileID: 1907112288057292323}
|
||||
audio: {fileID: 1542968457024381360}
|
||||
--- !u!1 &1144658963992876170 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 114084, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
|
||||
@@ -1284,7 +1436,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 0, z: -1}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: -28.183737, y: 3.600521, z: 0}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 1, z: 0}
|
||||
m_TwistLimitSpring:
|
||||
@@ -1385,7 +1537,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 1, z: 0}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: 4.115774, y: -2.6920671, z: -9.896754}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 0, z: -1}
|
||||
m_TwistLimitSpring:
|
||||
@@ -1470,7 +1622,7 @@ Rigidbody:
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
@@ -1486,7 +1638,7 @@ CharacterJoint:
|
||||
m_Anchor: {x: 0, y: 0, z: 0}
|
||||
m_Axis: {x: 0, y: 0, z: -1}
|
||||
m_AutoConfigureConnectedAnchor: 1
|
||||
m_ConnectedAnchor: {x: 0, y: 0, z: 0}
|
||||
m_ConnectedAnchor: {x: 39.930927, y: -0.000024795532, z: 0.0000071525574}
|
||||
serializedVersion: 2
|
||||
m_SwingAxis: {x: 0, y: 1, z: 0}
|
||||
m_TwistLimitSpring:
|
||||
|
||||
1046
Assets/Prefabs/Driving UI.prefab
Normal file
1046
Assets/Prefabs/Driving UI.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefabs/Driving UI.prefab.meta
Normal file
7
Assets/Prefabs/Driving UI.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ad34455a014250446a5073260803b0a0
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -50,6 +50,11 @@ MonoBehaviour:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
Colors:
|
||||
- {fileID: 2100000, guid: aa4a216a2af73e349a061c3b08f04fca, type: 2}
|
||||
- {fileID: 2100000, guid: 6519c0a548fad8541a36cb66f9201d08, type: 2}
|
||||
@@ -77,9 +82,41 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 4ad347dab55166f40a93601eb1733707, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
lapAmount: 0
|
||||
checkpoints: []
|
||||
players: []
|
||||
lapAmount: 3
|
||||
checkpoints:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
players:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
playersFinished: []
|
||||
playerTimes: []
|
||||
playerTimesStr: []
|
||||
lapCounter: {fileID: 0}
|
||||
timeCounter: {fileID: 0}
|
||||
startTime: {fileID: 0}
|
||||
DNFTime: {fileID: 0}
|
||||
nextCarbtn: {fileID: 0}
|
||||
--- !u!114 &5539949921570205737
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -95,3 +132,13 @@ MonoBehaviour:
|
||||
NextCarKey: 110
|
||||
NextCarButton: {fileID: 0}
|
||||
PlayerCar: {fileID: 0}
|
||||
cam: {fileID: 0}
|
||||
cars:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
|
||||
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.00027773753, g: 0.000305498, b: 0.00035180224, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -1250,7 +1250,6 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 481224846}
|
||||
- component: {fileID: 481224847}
|
||||
- component: {fileID: 481224849}
|
||||
- component: {fileID: 481224848}
|
||||
m_Layer: 0
|
||||
m_Name: Main garage
|
||||
@@ -1358,102 +1357,6 @@ AudioListener:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 481224845}
|
||||
m_Enabled: 1
|
||||
--- !u!82 &481224849
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 481224845}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: 10cae2fd52e1c0f4eba2e2091d441cd1, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &535753315
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1748,6 +1651,9 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1607325866}
|
||||
- targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1607325868}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
|
||||
--- !u!1001 &727592024
|
||||
PrefabInstance:
|
||||
@@ -4694,6 +4600,102 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
carType:
|
||||
carColor:
|
||||
--- !u!82 &1607325868
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1607325861}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: 10cae2fd52e1c0f4eba2e2091d441cd1, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 0.35
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &1671445827
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -38,7 +38,7 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.4482451, g: 0.49827182, b: 0.57558125, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.4482453, g: 0.49827206, b: 0.5755818, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
@@ -583,7 +583,7 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 287191329}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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
|
||||
@@ -592,7 +592,7 @@ RectTransform:
|
||||
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: 150, y: 120}
|
||||
m_AnchoredPosition: {x: 150, y: 2.5}
|
||||
m_SizeDelta: {x: 250, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &287191331
|
||||
@@ -1092,7 +1092,7 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 521052946}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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
|
||||
@@ -1101,7 +1101,7 @@ RectTransform:
|
||||
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: -150, y: 120}
|
||||
m_AnchoredPosition: {x: -150, y: 2.5}
|
||||
m_SizeDelta: {x: 250, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &521052948
|
||||
@@ -1604,6 +1604,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 841402787}
|
||||
- component: {fileID: 841402788}
|
||||
m_Layer: 0
|
||||
m_Name: CameraRotator
|
||||
m_TagString: Untagged
|
||||
@@ -1627,6 +1628,14 @@ Transform:
|
||||
- {fileID: 333991148}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!81 &841402788
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 841402786}
|
||||
m_Enabled: 1
|
||||
--- !u!4 &845470139 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1828470746108631247, guid: bb42b7aaa687b2f4d811c8cc5d2d259f, type: 3}
|
||||
@@ -2829,8 +2838,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -610, y: 0}
|
||||
m_SizeDelta: {x: -1320, y: -600}
|
||||
m_AnchoredPosition: {x: -610, y: 117.499985}
|
||||
m_SizeDelta: {x: -1320, y: -835}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1526088043
|
||||
MonoBehaviour:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -90,8 +90,6 @@ public class AgentController: Agent
|
||||
// transform.position.y,
|
||||
// transform.position.z + rng
|
||||
// );
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -170,17 +168,11 @@ public class AgentController: Agent
|
||||
totalReward -= 0.0018f;
|
||||
|
||||
float forwardSpeed = Vector3.Dot(transform.forward, rb.velocity);
|
||||
// Calculate how close the car is to top speed
|
||||
// as a number from zero to one
|
||||
|
||||
float speedFactor = Mathf.InverseLerp(0, maxSpeed / 4, forwardSpeed);
|
||||
|
||||
// Use that to calculate how much torque is available
|
||||
// (zero torque at top speed)
|
||||
float currentMotorTorque = Mathf.Lerp(motorTorque, 0, speedFactor);
|
||||
|
||||
// …and to calculate how much to steer
|
||||
// (the car steers more gently at top speed)
|
||||
|
||||
float currentSteerRange = Mathf.Lerp(steeringRange, steeringRangeAtMaxSpeed, speedFactor);
|
||||
|
||||
// Check whether the user input is in the same direction
|
||||
|
||||
@@ -17,58 +17,44 @@ public class GameController :MonoBehaviour
|
||||
public static bool RaceIsStarted { get { return true; } }
|
||||
public static bool RaceIsEnded { get { return false; } }
|
||||
|
||||
//PlayerController m_PlayerCar;
|
||||
//List<PlayerController> Cars = new List<PlayerController>();
|
||||
public List<GameObject> cars;
|
||||
int CurrentCarIndex = 0;
|
||||
|
||||
protected virtual void Awake ()
|
||||
|
||||
private List<string> finished;
|
||||
|
||||
void Start()
|
||||
{
|
||||
|
||||
Instance = this;
|
||||
|
||||
// foreach (var car in cars)
|
||||
// {
|
||||
// var userControl = car.GetComponent<PlayerController>();
|
||||
// var audioListener = car.GetComponent<AudioListener>();
|
||||
|
||||
// if (userControl == null)
|
||||
// {
|
||||
// userControl = car.gameObject.AddComponent<PlayerController> ();
|
||||
// }
|
||||
|
||||
// if (audioListener == null)
|
||||
// {
|
||||
// audioListener = car.gameObject.AddComponent<AudioListener> ();
|
||||
// }
|
||||
|
||||
// userControl.enabled = false;
|
||||
// audioListener.enabled = false;
|
||||
// }
|
||||
finished=gameObject.GetComponent<GameManager>().playersFinished;
|
||||
|
||||
|
||||
// cars[CurrentCarIndex].GetComponent<PlayerController>().enabled = true;
|
||||
// cars[CurrentCarIndex].GetComponent<AudioListener>().enabled = true;
|
||||
}
|
||||
|
||||
void Update ()
|
||||
public void Update ()
|
||||
{
|
||||
|
||||
if (Input.GetKeyDown (NextCarKey))
|
||||
{
|
||||
NextCar ();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void NextCar ()
|
||||
public void NextCar()
|
||||
{
|
||||
// cars[CurrentCarIndex].GetComponent<PlayerController> ().enabled = false;
|
||||
// cars[CurrentCarIndex].GetComponent<AudioListener> ().enabled = false;
|
||||
for (int i = 0; i < cars.Count; i++)
|
||||
{
|
||||
if (finished.Contains(cars[i].name))
|
||||
{
|
||||
cars.Remove(cars[i]);
|
||||
}
|
||||
}
|
||||
|
||||
CurrentCarIndex = LoopClamp (CurrentCarIndex + 1, 0, cars.Count);
|
||||
|
||||
// cars[CurrentCarIndex].GetComponent<PlayerController>().enabled = true;
|
||||
// cars[CurrentCarIndex].GetComponent<AudioListener>().enabled = true;
|
||||
|
||||
|
||||
|
||||
PlayerCar = cars[CurrentCarIndex];
|
||||
|
||||
@@ -90,4 +76,6 @@ public class GameController :MonoBehaviour
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,42 +1,86 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEditor.SearchService;
|
||||
using TMPro;
|
||||
using Unity.VisualScripting;
|
||||
// using UnityEditor.SearchService;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
|
||||
public class GameManager : MonoBehaviour
|
||||
{
|
||||
public int lapAmount;
|
||||
public GameObject[] checkpoints;
|
||||
public GameObject[] players;
|
||||
[HideInInspector] public List<string> playersFinished;
|
||||
[HideInInspector] public List<string> playerTimes;
|
||||
|
||||
[HideInInspector] public float[] playerTimes;
|
||||
[HideInInspector] public string[] playerTimesStr;
|
||||
int[] playerLaps;
|
||||
public TextMeshProUGUI lapCounter;
|
||||
public TextMeshProUGUI timeCounter;
|
||||
public TextMeshProUGUI startTime;
|
||||
public TextMeshProUGUI DNFTime;
|
||||
public TextMeshProUGUI speedometer;
|
||||
public GameObject nextCarbtn;
|
||||
float DNFTimer = 0;
|
||||
private bool hasCountedDown = false;
|
||||
|
||||
private Rigidbody carRB;
|
||||
void Start()
|
||||
{
|
||||
AudioSource backgroundMusic = GameObject.Find("Car Data").GetComponent<AudioSource>();
|
||||
backgroundMusic.Stop();
|
||||
|
||||
// reset laps
|
||||
playerLaps = new int[players.Count()];
|
||||
playerTimes = new float[players.Count()];
|
||||
playerTimesStr = new string[players.Count()];
|
||||
|
||||
for (int i = 0; i < playerLaps.Count(); i++)
|
||||
{
|
||||
playerLaps[i] = 1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < players.Count(); i++)
|
||||
{
|
||||
playerTimes[i] = 0.00000000000f;
|
||||
playerTimesStr[i] = "1000000";
|
||||
}
|
||||
|
||||
DontDestroyOnLoad(gameObject);
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
print("playersfinished: " + playersFinished.Count());
|
||||
if (!hasCountedDown)
|
||||
{
|
||||
StartGame();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
for (int i = 0; i < players.Count(); i++)
|
||||
{
|
||||
GameObject player = players[i];
|
||||
|
||||
if (playersFinished.Contains(player.name) || playersFinished.Contains(player.name + " (player)"))
|
||||
continue;
|
||||
|
||||
try
|
||||
{
|
||||
if (playersFinished.Contains(player.name) || playersFinished.Contains(player.name + " (player)"))
|
||||
continue;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (hasCountedDown)
|
||||
{
|
||||
playerTimes[i] += Time.deltaTime;
|
||||
}
|
||||
bool isAI = true;
|
||||
if (player.GetComponent<PlayerController>().enabled)
|
||||
isAI = false;
|
||||
@@ -54,12 +98,21 @@ public class GameManager : MonoBehaviour
|
||||
else
|
||||
{
|
||||
int checkpointsCollected = player.GetComponent<PlayerController>().checkpointsCollected;
|
||||
carRB = player.GetComponent<Rigidbody>();
|
||||
var carVel = Mathf.Round((Mathf.Abs(carRB.velocity.x) + Mathf.Abs(carRB.velocity.y) + Mathf.Abs(carRB.velocity.z))*6);
|
||||
speedometer.SetText(carVel.ToString());
|
||||
|
||||
if (checkpointsCollected == checkpoints.Count())
|
||||
{
|
||||
player.GetComponent<PlayerController>().checkpointsCollected = 0;
|
||||
|
||||
playerLaps[i] += 1;
|
||||
|
||||
if (playerLaps[i] <= lapAmount)
|
||||
lapCounter.text = "Lap count: " + playerLaps[i] + "/" + lapAmount;
|
||||
}
|
||||
|
||||
timeCounter.text = "Time: " + (Mathf.Round(playerTimes[i]*1000)/1000).ToString();
|
||||
}
|
||||
|
||||
if (playerLaps[i] > lapAmount)
|
||||
@@ -70,21 +123,89 @@ public class GameManager : MonoBehaviour
|
||||
player.GetComponent<AgentController>().enabled = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
playersFinished.Add(player.name + " (player)");
|
||||
player.GetComponent<PlayerController>().enabled = false;
|
||||
|
||||
float time = Random.Range(15f, 40f);
|
||||
playerTimes.Add(time.ToString());
|
||||
|
||||
nextCarbtn.SetActive(true);
|
||||
}
|
||||
playerTimesStr[i] = playerTimes[i].ToString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// race finished
|
||||
if (playersFinished.Count() == players.Count())
|
||||
|
||||
//DNF
|
||||
if (playersFinished.Count() > 0)
|
||||
{
|
||||
DNFTimer += Time.deltaTime;
|
||||
DNFTime.text = "DNF timer: "+(Mathf.Round(60-DNFTimer)).ToString();
|
||||
}
|
||||
|
||||
// race finished
|
||||
if (playersFinished.Count() == players.Count() || DNFTimer > 60)
|
||||
{
|
||||
// sort array
|
||||
float[] fTimes = new float[players.Count()];
|
||||
|
||||
for (int i = 0; i < players.Count(); i++)
|
||||
{
|
||||
fTimes[i] = float.Parse(playerTimesStr[i]);
|
||||
}
|
||||
|
||||
Array.Sort(fTimes);
|
||||
|
||||
for (int i = 0; i < players.Count(); i++)
|
||||
{
|
||||
playerTimesStr[i] = fTimes[i].ToString();
|
||||
|
||||
try
|
||||
{
|
||||
playerTimesStr[i] = playerTimesStr[i].Substring(0, 7);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
for (var i = 0; i < players.Count();i++)
|
||||
{
|
||||
|
||||
if (!playersFinished.Contains(players[i].name) && !playersFinished.Contains(players[i].name + " (player)")){
|
||||
|
||||
playersFinished.Add(players[i].name);
|
||||
}
|
||||
}
|
||||
|
||||
SceneManager.LoadScene("WinScreen");
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
private float sTime = 5;
|
||||
private void StartGame(){
|
||||
sTime -= Time.deltaTime;
|
||||
startTime.text = (Mathf.Round(sTime*10)/10).ToString();
|
||||
if (sTime/60 <= 5 && sTime/60 >= 0)
|
||||
{
|
||||
|
||||
for (var i = 0; i < players.Count(); i++)
|
||||
{
|
||||
players[i].GetComponent<Rigidbody>().isKinematic = true;
|
||||
}
|
||||
} else if (sTime/60 < 0) {
|
||||
|
||||
for (var i = 0; i < players.Count(); i++)
|
||||
{
|
||||
players[i].GetComponent<Rigidbody>().isKinematic = false;
|
||||
}
|
||||
startTime.text = "";
|
||||
hasCountedDown=true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class LapTimer : MonoBehaviour
|
||||
{
|
||||
public float time = 0;
|
||||
private bool startTime = false;
|
||||
|
||||
|
||||
private void OnTriggerEnter(Collider other) {
|
||||
|
||||
if (startTime)
|
||||
{
|
||||
startTime = false;
|
||||
print(time);
|
||||
} else {
|
||||
startTime = true;
|
||||
time=0;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
void FixedUpdate()
|
||||
{
|
||||
|
||||
time +=1;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -8,21 +8,35 @@ public class NPCimproved : MonoBehaviour
|
||||
public GameObject npcPrefab;
|
||||
public AudioSource audio;
|
||||
private bool walking = true;
|
||||
Vector3 rotation;
|
||||
|
||||
private void Start() {
|
||||
rotation = transform.right;
|
||||
}
|
||||
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (walking)
|
||||
{
|
||||
//npcPrefab.transform.position += new Vector3(0,0,0.005f);
|
||||
npcPrefab.transform.position += transform.forward * Time.deltaTime;
|
||||
npcPrefab.transform.position = new Vector3(npcPrefab.transform.position.x, 0, npcPrefab.transform.position.z);
|
||||
}
|
||||
// if (walking)
|
||||
// {
|
||||
// npcPrefab.transform.position += new Vector3(0,0,0.005f);
|
||||
// npcPrefab.transform.position += transform.forward * Time.deltaTime;
|
||||
// npcPrefab.transform.position = new Vector3(npcPrefab.transform.position.x, 0, npcPrefab.transform.position.z);
|
||||
// }
|
||||
|
||||
//animator.SetBool("IsTurning", false);
|
||||
|
||||
}
|
||||
|
||||
private void FixedUpdate() {
|
||||
if (walking)
|
||||
{
|
||||
npcPrefab.transform.position += rotation * 0.07f;
|
||||
npcPrefab.transform.position = new Vector3(npcPrefab.transform.position.x, 0, npcPrefab.transform.position.z);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Disabels the animation controller, to simulate getting hit by car
|
||||
void OnCollisionEnter(Collision col) {
|
||||
@@ -37,7 +51,7 @@ public class NPCimproved : MonoBehaviour
|
||||
}
|
||||
if (col.gameObject.tag == "Wall")
|
||||
{
|
||||
|
||||
rotation = Quaternion.AngleAxis(120, Vector3.up) * rotation;
|
||||
npcPrefab.transform.eulerAngles += new Vector3(0,120,0);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
|
||||
public class PlayerController : MonoBehaviour
|
||||
@@ -15,6 +16,9 @@ public class PlayerController : MonoBehaviour
|
||||
public Rigidbody rigidBody;
|
||||
[HideInInspector] public int checkpointsCollected = 0;
|
||||
public GameObject[] checkpoints;
|
||||
Vector3 startPosition;
|
||||
Quaternion startRotation;
|
||||
KeyCode resetCarKey = KeyCode.Backspace;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
@@ -23,6 +27,9 @@ public class PlayerController : MonoBehaviour
|
||||
{
|
||||
rigidBody = GetComponent<Rigidbody> ();
|
||||
}
|
||||
|
||||
startPosition = transform.position;
|
||||
startRotation = transform.rotation;
|
||||
|
||||
|
||||
// Find all child GameObjects that have the WheelControl script attached
|
||||
@@ -36,26 +43,15 @@ public class PlayerController : MonoBehaviour
|
||||
float vInput = Input.GetAxis("Vertical");
|
||||
float hInput = Input.GetAxis("Horizontal");
|
||||
|
||||
// Calculate current speed in relation to the forward direction of the car
|
||||
// (this returns a negative number when traveling backwards)
|
||||
|
||||
float forwardSpeed = Vector3.Dot(transform.forward, rigidBody.velocity);
|
||||
|
||||
|
||||
// Calculate how close the car is to top speed
|
||||
// as a number from zero to one
|
||||
float speedFactor = Mathf.InverseLerp(0, maxSpeed / 4, forwardSpeed);
|
||||
|
||||
// Use that to calculate how much torque is available
|
||||
// (zero torque at top speed)
|
||||
float currentMotorTorque = Mathf.Lerp(motorTorque, 0, speedFactor);
|
||||
|
||||
// …and to calculate how much to steer
|
||||
// (the car steers more gently at top speed)
|
||||
|
||||
float currentSteerRange = Mathf.Lerp(steeringRange, steeringRangeAtMaxSpeed, speedFactor);
|
||||
|
||||
// Check whether the user input is in the same direction
|
||||
// as the car's velocity
|
||||
|
||||
bool isAccelerating = Mathf.Sign(vInput) == Mathf.Sign(forwardSpeed);
|
||||
|
||||
bool isStopping = vInput == 0; // range
|
||||
@@ -125,10 +121,50 @@ public class PlayerController : MonoBehaviour
|
||||
private void Update() {
|
||||
Transform currentCheckpoint = checkpoints[checkpointsCollected].transform;
|
||||
float checkpintDistance = distanceToCheckpoint(currentCheckpoint);
|
||||
|
||||
|
||||
if (checkpintDistance < 0.1f)
|
||||
// send back to previous checkpoint if stuck
|
||||
|
||||
if (Input.GetKeyDown(resetCarKey))
|
||||
{
|
||||
if (checkpointsCollected == 0)
|
||||
{
|
||||
transform.position = startPosition;
|
||||
transform.rotation = startRotation;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
transform.position = new Vector3(
|
||||
checkpoints[checkpointsCollected - 1].transform.position.x,
|
||||
transform.position.y + 3,
|
||||
checkpoints[checkpointsCollected - 1].transform.position.z
|
||||
);
|
||||
|
||||
transform.eulerAngles = new Vector3(
|
||||
transform.eulerAngles.x,
|
||||
checkpoints[checkpointsCollected - 1].transform.eulerAngles.y,
|
||||
transform.eulerAngles.z
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if (checkpintDistance < 0.5f)
|
||||
{
|
||||
checkpointsCollected += 1;
|
||||
currentCheckpoint.GetComponent<Checkpoint>().isVisible = false;
|
||||
|
||||
Transform nextCheckpoint;
|
||||
|
||||
if (checkpointsCollected <= checkpoints.Count() - 1)
|
||||
nextCheckpoint = checkpoints[checkpointsCollected].transform;
|
||||
else
|
||||
nextCheckpoint = checkpoints[0].transform;
|
||||
|
||||
nextCheckpoint.GetComponent<Checkpoint>().isVisible = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
20
Assets/Scripts/TheTowersMustFall.cs
Normal file
20
Assets/Scripts/TheTowersMustFall.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class TheTowersMustFall : MonoBehaviour
|
||||
{
|
||||
Animator animator;
|
||||
KeyCode hitTowersButton = KeyCode.L;
|
||||
void Start()
|
||||
{
|
||||
animator = GetComponent<Animator>();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if (Input.GetKeyDown(hitTowersButton))
|
||||
animator.SetBool("Fall", true);
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/TheTowersMustFall.cs.meta
Normal file
11
Assets/Scripts/TheTowersMustFall.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9447c82152d77e143b1f39f2d4f2292e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
31
Assets/Scripts/Unused/LapTimer.cs
Normal file
31
Assets/Scripts/Unused/LapTimer.cs
Normal file
@@ -0,0 +1,31 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class LapTimer : MonoBehaviour
|
||||
{
|
||||
// public List<float> times;
|
||||
// private bool startTime = false;
|
||||
|
||||
|
||||
// private void OnTriggerEnter(Collider other) {
|
||||
|
||||
// if (startTime)
|
||||
// {
|
||||
// startTime = false;
|
||||
// print(time);
|
||||
// } else {
|
||||
// startTime = true;
|
||||
// }
|
||||
|
||||
|
||||
// }
|
||||
|
||||
|
||||
// void FixedUpdate()
|
||||
// {
|
||||
|
||||
// time +=1;
|
||||
|
||||
// }
|
||||
}
|
||||
92
Assets/Scripts/WinScript.cs
Normal file
92
Assets/Scripts/WinScript.cs
Normal file
@@ -0,0 +1,92 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using TMPro;
|
||||
using Unity.VisualScripting;
|
||||
using System.Linq;
|
||||
public class WinScript : MonoBehaviour
|
||||
{
|
||||
public TextMeshProUGUI MainText;
|
||||
public TextMeshProUGUI MainText2;
|
||||
public List<string> leaderboard;
|
||||
public string[] time;
|
||||
public GameObject[] Garages;
|
||||
|
||||
private GameObject currentGarage;
|
||||
|
||||
void Start()
|
||||
{
|
||||
foreach (GameObject carGarage in Garages)
|
||||
{
|
||||
carGarage.SetActive(false);
|
||||
}
|
||||
leaderboard = GameObject.Find("GameManager").GetComponent<GameManager>().playersFinished;
|
||||
time = GameObject.Find("GameManager").GetComponent<GameManager>().playerTimesStr;
|
||||
if (leaderboard[0].Contains("player")){
|
||||
|
||||
}
|
||||
if (leaderboard[0].Contains("Racecar"))
|
||||
{
|
||||
currentGarage = Garages[6];
|
||||
Garages[6].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("Hotrod"))
|
||||
{
|
||||
currentGarage = Garages[2];
|
||||
Garages[2].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("Icecream"))
|
||||
{
|
||||
currentGarage = Garages[5];
|
||||
Garages[5].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("Musclecar"))
|
||||
{
|
||||
currentGarage = Garages[1];
|
||||
Garages[1].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("Pickup"))
|
||||
{
|
||||
currentGarage = Garages[3];
|
||||
Garages[3].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("SchoolBus"))
|
||||
{
|
||||
currentGarage = Garages[7];
|
||||
Garages[7].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("Sportscar"))
|
||||
{
|
||||
currentGarage = Garages[4];
|
||||
Garages[4].SetActive(true);
|
||||
}
|
||||
else if (leaderboard[0].Contains("Streetracist"))
|
||||
{
|
||||
currentGarage = Garages[0];
|
||||
Garages[0].SetActive(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void FixedUpdate() {
|
||||
MainText.text = "Leaderboard: ";
|
||||
MainText2.text = "Time: ";
|
||||
for (var i = 0; i < leaderboard.Count; i++){
|
||||
MainText.text += "\n" + (i+1) + "." + leaderboard[i];
|
||||
if (time[i] == "1000000"){
|
||||
MainText2.text += "\n(DNF)";
|
||||
continue;
|
||||
}
|
||||
MainText2.text += "\n(" + time[i] + ")";
|
||||
}
|
||||
currentGarage.transform.eulerAngles += Vector3.up * 0.7f;
|
||||
//currentRotation = CurrentCar.transform.rotation;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
11
Assets/Scripts/WinScript.cs.meta
Normal file
11
Assets/Scripts/WinScript.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b13d76627d1fce14691aad7164419d13
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Sounds/Aurea Carmina.mp3
Normal file
BIN
Assets/Sounds/Aurea Carmina.mp3
Normal file
Binary file not shown.
23
Assets/Sounds/Aurea Carmina.mp3.meta
Normal file
23
Assets/Sounds/Aurea Carmina.mp3.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9dbf5fdfbadcb2844afbea5ae1833581
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Sounds/Cipher2.mp3
Normal file
BIN
Assets/Sounds/Cipher2.mp3
Normal file
Binary file not shown.
23
Assets/Sounds/Cipher2.mp3.meta
Normal file
23
Assets/Sounds/Cipher2.mp3.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0ec4461d6a3762242bd78865e611d97a
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Sounds/Local Forecast.mp3
Normal file
BIN
Assets/Sounds/Local Forecast.mp3
Normal file
Binary file not shown.
23
Assets/Sounds/Local Forecast.mp3.meta
Normal file
23
Assets/Sounds/Local Forecast.mp3.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2bfef0b8adddc1d4ba188c9f05311534
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Sounds/oof-97698.mp3
Normal file
BIN
Assets/Sounds/oof-97698.mp3
Normal file
Binary file not shown.
23
Assets/Sounds/oof-97698.mp3.meta
Normal file
23
Assets/Sounds/oof-97698.mp3.meta
Normal file
@@ -0,0 +1,23 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d5e7989d43ab6784a860d563c7c9030a
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -43,9 +43,9 @@ AnimatorStateTransition:
|
||||
m_Mute: 0
|
||||
m_IsExit: 0
|
||||
serializedVersion: 3
|
||||
m_TransitionDuration: 0.012783408
|
||||
m_TransitionDuration: 0.6141238
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.3120151
|
||||
m_ExitTime: 0.4280422
|
||||
m_HasExitTime: 1
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 0
|
||||
@@ -64,8 +64,8 @@ AnimatorController:
|
||||
m_Type: 9
|
||||
m_DefaultFloat: 0
|
||||
m_DefaultInt: 0
|
||||
m_DefaultBool: 1
|
||||
m_Controller: {fileID: 0}
|
||||
m_DefaultBool: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
@@ -90,7 +90,7 @@ AnimatorStateMachine:
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 7207422066676919104}
|
||||
m_Position: {x: 360, y: 120, z: 0}
|
||||
m_Position: {x: 350, y: 120, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: -2509353387458069387}
|
||||
m_Position: {x: 350, y: -30, z: 0}
|
||||
@@ -125,7 +125,7 @@ AnimatorState:
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: 6099b927b557800408b96e0aff7f3185, type: 2}
|
||||
m_Motion: {fileID: 7400000, guid: 5798ed78f4546ab4fa7792d829e5c4b4, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
|
||||
Reference in New Issue
Block a user