From 3420d14cdc0bc595b4e5b0eee3bb8d7b508fb4b7 Mon Sep 17 00:00:00 2001 From: Krazerleo Date: Wed, 4 May 2022 23:57:38 +0700 Subject: [PATCH] merge --- .../Timers/Greatest_map_ever_timers.json | 2 +- Assets/Prefabs/Bot.prefab | 3 +- .../Greatest_map_ever/Greatest_map_ever.unity | 29 ++++++++++- Assets/Settings/Game Settings.asset | 50 ++++++++++--------- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json b/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json index 9a97eb3..b96488e 100644 --- a/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json +++ b/Assets/ML-Agents/Timers/Greatest_map_ever_timers.json @@ -1 +1 @@ -{"count":1,"self":16.593504,"total":17.166309,"children":{"InitializeActuators":{"count":2,"self":0.0019996,"total":0.0019996,"children":null},"InitializeSensors":{"count":2,"self":0.0030004,"total":0.0030004,"children":null},"AgentSendState":{"count":612,"self":0.016998,"total":0.549809,"children":{"CollectObservations":{"count":1224,"self":0.0230042,"total":0.0230042,"children":null},"WriteActionMask":{"count":1224,"self":0.0060088,"total":0.0060088,"children":null},"RequestDecision":{"count":1224,"self":0.503798,"total":0.503798,"children":null}}},"DecideAction":{"count":612,"self":0.0089991,"total":0.0089991,"children":null},"AgentAct":{"count":612,"self":0.006997,"total":0.006997,"children":null}},"gauges":{"My Behavior.CumulativeReward":{"count":14,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1650253950","unity_version":"2019.4.35f1","command_line_arguments":"C:\\Program Files\\unityeditorfolder\\2019.4.35f1\\Editor\\Unity.exe -projectpath F:\\SigmaRiskManagment\\real shooter Git Version -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-1IWpvtxiu_rvPpHhMWpzt -hubSessionId b1d8b690-be9f-11ec-92bc-6fd1276b6775 -accessToken D1AF5mitRE4Vh3s6p7rpmGuqcqvTsZJKmoGtSNfyNNs009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Greatest_map_ever","end_time_seconds":"1650253967"}} \ No newline at end of file +{"count":1,"self":5.2745576,"total":5.3091238,"children":{"InitializeActuators":{"count":2,"self":0.0019998999999999998,"total":0.0019998999999999998,"children":null},"InitializeSensors":{"count":2,"self":0.0030009999999999998,"total":0.0030009999999999998,"children":null},"AgentSendState":{"count":18,"self":0.0019986,"total":0.0175794,"children":{"CollectObservations":{"count":36,"self":0.0009994,"total":0.0009994,"children":null},"WriteActionMask":{"count":36,"self":0.0005783,"total":0.0005783,"children":null},"RequestDecision":{"count":36,"self":0.0140031,"total":0.0140031,"children":null}}},"DecideAction":{"count":18,"self":0.0089876,"total":0.0089876,"children":null},"AgentAct":{"count":18,"self":0.0009983,"total":0.0009983,"children":null}},"gauges":{"My Behavior.CumulativeReward":{"count":2,"max":0,"min":0,"runningAverage":0,"value":0,"weightedAverage":0}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1651670021","unity_version":"2019.4.35f1","command_line_arguments":"C:\\Program Files\\unityeditorfolder\\2019.4.35f1\\Editor\\Unity.exe -projectpath F:\\SigmaRiskManagment\\real shooter Git Version -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-9THNgaHTf51SEKo5URf9r -hubSessionId bf0b1ec0-c926-11ec-9066-7725c5249b8e -accessToken pLNs79-R0y77otVjQKfPq_jck-T6ncSnk21wIQRhdZw009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Greatest_map_ever","end_time_seconds":"1651670026"}} \ No newline at end of file diff --git a/Assets/Prefabs/Bot.prefab b/Assets/Prefabs/Bot.prefab index eedbf35..619d624 100755 --- a/Assets/Prefabs/Bot.prefab +++ b/Assets/Prefabs/Bot.prefab @@ -143,7 +143,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BrainParameters: - VectorObservationSize: 1 + VectorObservationSize: 9 NumStackedVectorObservations: 1 m_ActionSpec: m_NumContinuousActions: 0 @@ -195,6 +195,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: navMeshAgent: {fileID: 8656710265340117963} + flag: {fileID: 6818223691859422291, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3} --- !u!114 &1208561866453126566 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity b/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity index 41d83a6..3bcfbee 100755 --- a/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity +++ b/Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity @@ -259,6 +259,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &140697607 @@ -353,6 +355,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &293522541 @@ -1315,6 +1319,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &1116745545 @@ -1477,7 +1483,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh17416 + m_Name: pb_Mesh16900 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -1763,6 +1769,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &1345085343 @@ -1857,6 +1865,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &1488699524 @@ -2077,6 +2087,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &1663305224 @@ -2141,6 +2153,7 @@ GameObject: - component: {fileID: 1858987090} - component: {fileID: 1858987088} - component: {fileID: 1858987085} + - component: {fileID: 1858987091} m_Layer: 0 m_Name: Game m_TagString: Untagged @@ -2253,6 +2266,18 @@ MonoBehaviour: type: 3} PlayerPrefab: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d, type: 3} +--- !u!114 &1858987091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858987083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf3fe86787bfb0c4b8751fe495148ede, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1871257865 GameObject: m_ObjectHideFlags: 0 @@ -2506,6 +2531,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3} m_Name: m_EditorClassIdentifier: + navType: 1 + PointId: 0 DeathAttr: 0 EnemiesSeen: [] --- !u!23 &2004854095 diff --git a/Assets/Settings/Game Settings.asset b/Assets/Settings/Game Settings.asset index f1a62c0..fc07488 100755 --- a/Assets/Settings/Game Settings.asset +++ b/Assets/Settings/Game Settings.asset @@ -12,27 +12,29 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e2c47233b9062c84482336b145c6891b, type: 3} m_Name: Game Settings m_EditorClassIdentifier: - isTesting: 1 - timeToWin: 5 - timeOut: 1600 - movementDistance: 50 - movementSpeed: 3 - defTeamAI: 0 - atcTeamAI: 0 - numOfDefenders: 1 - numOfAttackers: 1 - hasHumanDefender: 1 - hasHumanAttacker: 0 - healthPickupAmount: 50 - armourPickupAmount: 50 - ammunitionPickupAmount: 120 - pickupsAmount: 2 - maxHealth: 0 - maxArmour: 0 - maxAmmo: 0 - GetHitChanceInDirectPoint: 0 - GetHitChanceInRunning: 0 - GetHitChanceInCover: 0 - DoDamageChanceInDirectPoint: 0 - DoDamageChanceInRunning: 0 - DoDamageChanceInCover: 0 + IsTesting: 0 + TimeToWin: 15 + TimeOut: 3600 + MovementDistance: 50 + MovementSpeed: 5 + DefTeamAI: 3 + AtcTeamAI: 3 + NumOfDefenders: 1 + NumOfAttackers: 1 + HasHumanDefender: 0 + HasHumanAttacker: 0 + HealthPickupAmount: 50 + ArmourPickupAmount: 50 + AmmunitionPickupAmount: 60 + PickupsAmount: 0 + MaxHealth: 100 + MaxArmour: 100 + MaxAmmo: 360 + ViewDistance: 100 + GetHitChanceInDirectPoint: 50 + GetHitChanceInRunning: 25 + GetHitChanceInCover: 20 + DoDamageChanceInDirectPoint: 70 + DoDamageChanceInRunning: 30 + DoDamageChanceInCover: 25 + CrouchingCoefficient: 1.4