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

Merge branch 'master' of git@ooftooft.net:Racesm.git

Browse Source 
# Conflicts:
#	Assets/ML-Agents/Timers/ForestRacetrack_timers.json
#	Assets/ML-Agents/Timers/WinScreen_timers.json
#	Assets/Scenes/WinScreen.unity
This commit is contained in:
magn9775
2024-04-26 12:33:32 +02:00
parent 1336a2a08e
commit 2632b3b2d1
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 58f7e79a87c79824597746e8c1bfe400
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f58d25b9e504a4f41ab4a71cf87c1845
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -1,5 +1 @@
<<<<<<< HEAD {"count":1,"self":199.1533184,"total":218.8379795,"children":{"InitializeActuators":{"count":8,"self":0.0019921,"total":0.0019921,"children":null},"InitializeSensors":{"count":8,"self":0.0030242999999999997,"total":0.0030242999999999997,"children":null},"AgentSendState":{"count":10664,"self":1.5327274,"total":1.9015727,"children":{"CollectObservations":{"count":12680,"self":0.2323625,"total":0.2323625,"children":null},"WriteActionMask":{"count":12680,"self":0.046358899999999995,"total":0.046358899999999995,"children":null},"RequestDecision":{"count":12680,"self":0.090123899999999993,"total":0.090123899999999993,"children":null}}},"DecideAction":{"count":10664,"self":16.3909248,"total":16.650102999999998,"children":{"RayPerceptionSensor.Perceive":{"count":25360,"self":0.2591788,"total":0.2591788,"children":null}}},"AgentAct":{"count":10664,"self":1.1259698,"total":1.1259698,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":21,"max":25.5732841,"min":19.9673977,"runningAverage":24.3276081,"value":25.3809662,"weightedAverage":25.0823269}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714127324","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714127543"}}
{"count":1,"self":151.5671552,"total":159.4234014,"children":{"InitializeActuators":{"count":8,"self":0.0039895,"total":0.0039895,"children":null},"InitializeSensors":{"count":8,"self":0.0029920999999999997,"total":0.0029920999999999997,"children":null},"AgentSendState":{"count":5608,"self":0.6404556,"total":0.7972872,"children":{"CollectObservations":{"count":4928,"self":0.0867767,"total":0.0867767,"children":null},"WriteActionMask":{"count":4928,"self":0.017532199999999998,"total":0.017532199999999998,"children":null},"RequestDecision":{"count":4928,"self":0.0525227,"total":0.0525227,"children":null}}},"DecideAction":{"count":5608,"self":6.5150619999999995,"total":6.624032,"children":{"RayPerceptionSensor.Perceive":{"count":9856,"self":0.10897,"total":0.10897,"children":null}}},"AgentAct":{"count":5608,"self":0.4279439,"total":0.4279439,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":7,"max":25.59539,"min":20.5583878,"runningAverage":23.1924419,"value":23.1277428,"weightedAverage":23.0449276}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714126497","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8c17471b-7795-4082-905c-75744d6a077b -accessToken hv3zp4IA8nxcowfZc35r5tDHrlmzUZoExTBgESksngo005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714126657"}}
=======
{"count":1,"self":299.9013632,"total":307.61609189999996,"children":{"InitializeActuators":{"count":8,"self":0.0010006,"total":0.0010006,"children":null},"InitializeSensors":{"count":8,"self":0.0015026,"total":0.0015026,"children":null},"AgentSendState":{"count":15142,"self":0.7721819,"total":0.9181054,"children":{"CollectObservations":{"count":21584,"self":0.0768378,"total":0.0768378,"children":null},"WriteActionMask":{"count":21584,"self":0.026219799999999998,"total":0.026219799999999998,"children":null},"RequestDecision":{"count":21584,"self":0.0428659,"total":0.0428659,"children":null}}},"DecideAction":{"count":15142,"self":6.0027792,"total":6.0986367999999995,"children":{"RayPerceptionSensor.Perceive":{"count":43168,"self":0.0958574,"total":0.0958574,"children":null}}},"AgentAct":{"count":15142,"self":0.6944775,"total":0.6944775,"children":null}},"gauges":{"Benson Track2.CumulativeReward":{"count":21,"max":25.388195,"min":17.5381966,"runningAverage":23.97337,"value":24.9569759,"weightedAverage":24.8837566}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714125978","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId a6f45e0e-41b6-4c96-a70e-ec8e10ca5aa9 -accessToken LhF-MiZYoHmiI2p1_6JvQZvJ6QUPd4VyLbrTbhNHTT8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"WinScreen","end_time_seconds":"1714126286"}}
>>>>>>> 49b4414155257b40f20687a86068adc472c780dd