diff --git a/Assets/ML-Agents/Timers/Train_timers.json b/Assets/ML-Agents/Timers/Train_timers.json index 93ca976..85eeee7 100644 --- a/Assets/ML-Agents/Timers/Train_timers.json +++ b/Assets/ML-Agents/Timers/Train_timers.json @@ -1 +1 @@ -{"count":1,"self":93.9066496,"total":100.4165704,"children":{"InitializeActuators":{"count":16,"self":0.0014999,"total":0.0014999,"children":null},"InitializeSensors":{"count":16,"self":0.0009984,"total":0.0009984,"children":null},"AgentSendState":{"count":4785,"self":0.068162199999999992,"total":0.6963434,"children":{"CollectObservations":{"count":38280,"self":0.5769577,"total":0.5769577,"children":null},"WriteActionMask":{"count":38280,"self":0.0135614,"total":0.0135614,"children":null},"RequestDecision":{"count":38280,"self":0.0376621,"total":0.0376621,"children":null}}},"DecideAction":{"count":4785,"self":0.076930699999999991,"total":0.076930699999999991,"children":null},"AgentAct":{"count":4785,"self":5.7336504,"total":5.7336504999999995,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":24,"max":2806.10864,"min":-4452.61768,"runningAverage":-2349.35767,"value":-3779.56152,"weightedAverage":-3245.75586}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1690570399","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 86b502dc-202f-4afa-ba52-5731b3c3e27e -accessToken bXZIpg17jDRkRVo5dVNqmYk0dCWyT28bRLu3CEAvUuU00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1690570500"}} \ No newline at end of file +{"count":1,"self":46.7315648,"total":50.4141415,"children":{"InitializeActuators":{"count":16,"self":0.0015007,"total":0.0015007,"children":null},"InitializeSensors":{"count":16,"self":0.0010012,"total":0.0010012,"children":null},"AgentSendState":{"count":2264,"self":0.027499899999999997,"total":0.3287168,"children":{"CollectObservations":{"count":18112,"self":0.27471819999999997,"total":0.27471819999999997,"children":null},"WriteActionMask":{"count":18112,"self":0.006502,"total":0.006502,"children":null},"RequestDecision":{"count":18112,"self":0.0199967,"total":0.0199967,"children":null}}},"DecideAction":{"count":2264,"self":0.031005099999999997,"total":0.031005099999999997,"children":null},"AgentAct":{"count":2264,"self":3.3168523999999997,"total":3.3168523,"children":null}},"gauges":{"AKMAgent.CumulativeReward":{"count":9,"max":4165.668,"min":-8465.8,"runningAverage":-6057.36963,"value":4165.668,"weightedAverage":-4592.56}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1691479498","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 7a25a02a-ac39-4928-b96b-8b55c0718304 -accessToken E3xJ9L_3Ig0NQueh48ufPYRNPf4J2JoRlbnS3gUcFR000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Train","end_time_seconds":"1691479548"}} \ No newline at end of file diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index 78288ed..ecf36a6 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -6827,7 +6827,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 2082200185} m_TargetAssemblyTypeName: HUDController, Assembly-CSharp - m_MethodName: onChartOnToggleChange + m_MethodName: OnChartOnToggleChange m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Script/InGame/TargetController.cs b/Assets/Script/InGame/TargetController.cs index 8d81177..8bacc59 100644 --- a/Assets/Script/InGame/TargetController.cs +++ b/Assets/Script/InGame/TargetController.cs @@ -187,18 +187,15 @@ private void UpdateTargetStates(Vector3? thisTargetPosition = null) if (thisTargetPosition != null) { targetPosition = (Vector3)thisTargetPosition; - Debug.Log("Target Position != null" + targetPosition); } if (targetTypeInt == (int)SceneBlockContainer.Targets.Free || targetTypeInt == (int)SceneBlockContainer.Targets.Stay) { - Debug.Log("UpdateTargetStates Target Position: set all zeros "); for (int i = 1; i < targetState.Length; i++) // set target position state to 0 targetState[i] = 0f; } else { - Debug.Log("Target Position == null" + targetPosition); targetState[1] = targetPosition.x; targetState[2] = targetPosition.y; targetState[3] = targetPosition.z; diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 74f427d..3ac0acb 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: -1073 - y: 64 + y: 88 width: 1080 - height: 687 + height: 663 m_ShowMode: 0 m_Title: Scene m_RootView: {fileID: 4} @@ -43,7 +43,7 @@ MonoBehaviour: width: 1858 height: 1037 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Project m_RootView: {fileID: 12} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -66,9 +66,9 @@ MonoBehaviour: x: 0 y: 0 width: 1080 - height: 687 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 663 + m_MinSize: {x: 200, y: 221} + m_MaxSize: {x: 4000, y: 4021} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -93,11 +93,11 @@ MonoBehaviour: x: 0 y: 0 width: 1080 - height: 687 + height: 663 m_MinSize: {x: 200, y: 221} m_MaxSize: {x: 4000, y: 4021} vertical: 0 - controlID: 20 + controlID: 140 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -115,7 +115,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 717 - width: 1082 + width: 1080 height: 270 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -144,12 +144,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1082 + width: 1080 height: 987 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 149 + controlID: 91 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,10 +167,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 470 - width: 316 + width: 317 height: 517 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 22} m_Panes: - {fileID: 22} @@ -193,14 +193,14 @@ MonoBehaviour: - {fileID: 7} m_Position: serializedVersion: 2 - x: 1082 + x: 1080 y: 0 - width: 316 + width: 317 height: 987 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 119 + controlID: 25 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -218,10 +218,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 316 + width: 317 height: 470 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -252,7 +252,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 113 + controlID: 17 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,12 +268,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1398 + x: 1397 y: 0 - width: 460 + width: 461 height: 987 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -367,10 +367,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1082 + width: 1080 height: 717 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -398,7 +398,7 @@ MonoBehaviour: serializedVersion: 2 x: 62 y: 73 - width: 1081 + width: 1079 height: 696 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -410,7 +410,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1081, y: 675} + m_TargetSize: {x: 1079, y: 675} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -425,8 +425,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -540.5 - m_HBaseRangeMax: 540.5 + m_HBaseRangeMin: -539.5 + m_HBaseRangeMax: 539.5 m_VBaseRangeMin: -337.5 m_VBaseRangeMax: 337.5 m_HAllowExceedBaseRangeMin: 1 @@ -446,23 +446,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1081 + width: 1079 height: 675 m_Scale: {x: 1, y: 1} - m_Translation: {x: 540.5, y: 337.5} + m_Translation: {x: 539.5, y: 337.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -540.5 + x: -539.5 y: -337.5 - width: 1081 + width: 1079 height: 675 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1081, y: 696} + m_LastWindowPixelSize: {x: 1079, y: 696} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -518,7 +518,7 @@ MonoBehaviour: serializedVersion: 2 x: 62 y: 790 - width: 1081 + width: 1079 height: 249 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -549,10 +549,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 155} - m_SelectedIDs: b6760000 - m_LastClickedID: 30390 - m_ExpandedIDs: 000000007476000076760000787600007a7600007c760000b076000000ca9a3b + scrollPos: {x: 0, y: 139} + m_SelectedIDs: a2760000 + m_LastClickedID: 30370 + m_ExpandedIDs: 000000007476000076760000787600007a7600007c7600009c76000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -607,7 +607,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300008a5c000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -632,7 +632,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 59} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 355 @@ -656,9 +656,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1460 + x: 1459 y: 73 - width: 459 + width: 460 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -697,9 +697,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1144 + x: 1142 y: 73 - width: 314 + width: 315 height: 449 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -708,9 +708,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: b80c0000 m_LastClickedID: 0 - m_ExpandedIDs: d8baffff30bbffff94bcffffe6bcffff04bdffff30fbffff + m_ExpandedIDs: 32fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -755,9 +755,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: -1073 - y: 64 + y: 88 width: 1080 - height: 666 + height: 642 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1043,7 +1043,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.5022141, y: -0.11378048, z: 0.06679058, w: 0.85455513} speed: 2 - m_Value: {x: 0.5022416, y: -0.11378672, z: 0.06679424, w: 0.8546019} + m_Value: {x: -0.5022141, y: 0.11378048, z: -0.06679058, w: -0.85455513} m_Size: m_Target: 79.56483 speed: 2 @@ -1092,9 +1092,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1144 + x: 1142 y: 543 - width: 314 + width: 315 height: 496 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: