Merge branch 'main' into krazerleo/core/1

Assets/Prefabs/Bot.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &6171680323407988095
+--- !u!1 &2988578997639256874
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,86 +8,52 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6171680323407988094}
+  - component: {fileID: 2988578997639256870}
-  m_Layer: 8
+  - component: {fileID: 2988578997639256869}
-  m_Name: FeetTransform
+  - component: {fileID: 2988578997639256868}
+  - component: {fileID: 2988578997639256875}
+  - component: {fileID: 5447337162552783061}
+  - component: {fileID: 7805954453358028498}
+  - component: {fileID: 2676446634235362783}
+  - component: {fileID: 8656710265340117963}
+  - component: {fileID: 778652956973742106}
+  - component: {fileID: 1208561866453126566}
+  m_Layer: 0
+  m_Name: Bot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6171680323407988094
+--- !u!4 &2988578997639256870
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323407988095}
+  m_GameObject: {fileID: 2988578997639256874}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: 0}
+  m_LocalPosition: {x: 28.310326, y: 13.98, z: 46.45}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 6171680323948707550}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6171680323948707524
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6171680323948707550}
-  - component: {fileID: 6171680323948707551}
-  - component: {fileID: 5770895893828047079}
-  - component: {fileID: 6171680323948707521}
-  - component: {fileID: 6171680323948707549}
-  - component: {fileID: 6171680323948707520}
-  - component: {fileID: 8774702625908438859}
-  - component: {fileID: 6521536090983603910}
-  - component: {fileID: 6133354754598649724}
-  - component: {fileID: 2756943273076691504}
-  - component: {fileID: 6638271233700792696}
-  - component: {fileID: 5988018701276467001}
-  - component: {fileID: 1547882613481475944}
-  m_Layer: 8
-  m_Name: Bot
-  m_TagString: Defender
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6171680323948707550
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 50.67923, y: 1.16, z: -22.57}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 6171680323407988094}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &6171680323948707551
+--- !u!33 &2988578997639256869
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
+  m_GameObject: {fileID: 2988578997639256874}
   m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5770895893828047079
+--- !u!23 &2988578997639256868
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
+  m_GameObject: {fileID: 2988578997639256874}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -120,58 +86,94 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!136 &6171680323948707521
+--- !u!136 &2988578997639256875
 CapsuleCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
+  m_GameObject: {fileID: 2988578997639256874}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 0
-  m_Radius: 0.3
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!136 &6171680323948707549
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 0
-  m_Radius: 0.3
-  m_Height: 1.3
-  m_Direction: 1
-  m_Center: {x: 0, y: -0.35, z: 0}
---- !u!136 &6171680323948707520
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.3
+  m_Radius: 0.5
-  m_Height: 0.8
+  m_Height: 2
   m_Direction: 1
-  m_Center: {x: 0, y: -0.6, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
---- !u!195 &8774702625908438859
+--- !u!114 &5447337162552783061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2988578997639256874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  agentParameters:
+    maxStep: 0
+  hasUpgradedFromAgentParameters: 1
+  MaxStep: 100
+--- !u!114 &7805954453358028498
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2988578997639256874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DecisionPeriod: 1
+  TakeActionsBetweenDecisions: 1
+--- !u!114 &2676446634235362783
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2988578997639256874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_BrainParameters:
+<<<<<<< HEAD
+    VectorObservationSize: 9
+=======
+    VectorObservationSize: 4
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
+    NumStackedVectorObservations: 1
+    m_ActionSpec:
+      m_NumContinuousActions: 0
+      BranchSizes: 0200000002000000
+    VectorActionSize: 0200000002000000
+    VectorActionDescriptions: []
+    VectorActionSpaceType: 0
+    hasUpgradedBrainParametersWithActionSpec: 1
+  m_Model: {fileID: 0}
+  m_InferenceDevice: 0
+  m_BehaviorType: 0
+  m_BehaviorName: npc
+  TeamId: 0
+  m_UseChildSensors: 1
+  m_UseChildActuators: 1
+  m_ObservableAttributeHandling: 0
+--- !u!195 &8656710265340117963
 NavMeshAgent:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
+  m_GameObject: {fileID: 2988578997639256874}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.5000001
+  m_Radius: 0.5
   m_Speed: 3.5
   m_Acceleration: 8
   avoidancePriority: 50
@@ -184,27 +186,27 @@ NavMeshAgent:
   m_BaseOffset: 1
   m_WalkableMask: 4294967295
   m_ObstacleAvoidanceType: 4
---- !u!114 &6521536090983603910
+--- !u!114 &778652956973742106
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
+  m_GameObject: {fileID: 2988578997639256874}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  navMeshAgent: {fileID: 8774702625908438859}
+  navMeshAgent: {fileID: 8656710265340117963}
   flag: {fileID: 6818223691859422291, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3}
---- !u!114 &6133354754598649724
+--- !u!114 &1208561866453126566
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
+  m_GameObject: {fileID: 2988578997639256874}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dd8012d5925524537b27131fef517017, type: 3}
@@ -212,78 +214,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_SensorName: BufferSensor
   m_ObservableSize: 5
-  m_MaxNumObservables: 10
+  m_MaxNumObservables: 5
---- !u!114 &2756943273076691504
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_BrainParameters:
-    VectorObservationSize: 14
-    NumStackedVectorObservations: 1
-    m_ActionSpec:
-      m_NumContinuousActions: 0
-      BranchSizes: 010000000100000001000000
-    VectorActionSize: 010000000100000001000000
-    VectorActionDescriptions: []
-    VectorActionSpaceType: 0
-    hasUpgradedBrainParametersWithActionSpec: 1
-  m_Model: {fileID: 0}
-  m_InferenceDevice: 0
-  m_BehaviorType: 0
-  m_BehaviorName: npc
-  TeamId: 0
-  m_UseChildSensors: 1
-  m_UseChildActuators: 1
-  m_ObservableAttributeHandling: 0
---- !u!114 &6638271233700792696
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  agentParameters:
-    maxStep: 0
-  hasUpgradedFromAgentParameters: 1
-  MaxStep: 100
---- !u!114 &5988018701276467001
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  navMeshAgent: {fileID: 8774702625908438859}
-  flag: {fileID: 6818223691859422291, guid: 1685c1d9ce4ab174f95c646b1826010b, type: 3}
---- !u!114 &1547882613481475944
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6171680323948707524}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DecisionPeriod: 5
-  TakeActionsBetweenDecisions: 0

Assets/Prefabs/Player.prefab

@@ -14,12 +14,9 @@ GameObject:
   - component: {fileID: 5245491127989480120}
   - component: {fileID: 5245491127989480100}
   - component: {fileID: 5245491127989480121}
-  - component: {fileID: 7254047075221496626}
+  - component: {fileID: 5245491127989480123}
-  - component: {fileID: 5182704636738128575}
+  - component: {fileID: 5245491127989480122}
-  - component: {fileID: 5220658550450318085}
+  - component: {fileID: 4890899368932544690}
-  - component: {fileID: 4264677542023120457}
-  - component: {fileID: 4715950961444674817}
-  - component: {fileID: 5653209015090846528}
   m_Layer: 8
   m_Name: Player
   m_TagString: Defender
@@ -132,29 +129,25 @@ CapsuleCollider:
   m_Height: 0.8
   m_Direction: 1
   m_Center: {x: 0, y: -0.6, z: 0}
---- !u!195 &7254047075221496626
+--- !u!143 &5245491127989480123
-NavMeshAgent:
+CharacterController:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5245491127989480125}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
   m_Enabled: 1
-  m_AgentTypeID: 0
+  serializedVersion: 2
-  m_Radius: 0.5000001
-  m_Speed: 3.5
-  m_Acceleration: 8
-  avoidancePriority: 50
-  m_AngularSpeed: 120
-  m_StoppingDistance: 0
-  m_AutoTraverseOffMeshLink: 1
-  m_AutoBraking: 1
-  m_AutoRepath: 1
   m_Height: 2
-  m_BaseOffset: 1
+  m_Radius: 0.5
-  m_WalkableMask: 4294967295
+  m_SlopeLimit: 45
-  m_ObstacleAvoidanceType: 4
+  m_StepOffset: 0.3
---- !u!114 &5182704636738128575
+  m_SkinWidth: 0.08
+  m_MinMoveDistance: 0.001
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5245491127989480122
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -163,12 +156,52 @@ MonoBehaviour:
   m_GameObject: {fileID: 5245491127989480125}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
+  m_Script: {fileID: 11500000, guid: 9826297ef4d853741b2af768441ec7f7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  navMeshAgent: {fileID: 0}
+  input_View: {x: 0, y: 0}
-  flag: {fileID: 0}
+  cameraHolder: {fileID: 5245491129196666053}
---- !u!114 &5220658550450318085
+  feetTransform: {fileID: 5245491129603592455}
+  playerSettings:
+    ViewXSensetivity: 20
+    ViewYSensetivity: 20
+    ViewXInverted: 0
+    ViewYInverted: 0
+    SprintingHold: 0
+    MovementSmoothing: 0
+    RunningForwardSpeed: 10
+    RunningStrafeSpeed: 6
+    WalkingForwardSpeed: 4
+    WalkingBackwardSpeed: 2
+    WalkingStrafeSpeed: 3
+    JumpingHeight: 6
+    JumpingFalloff: 1
+    FallingSmoothing: 0
+    SpeedEffector: 1
+    CrouchSpeedEffector: 0
+    ProneSpeedEffector: 0
+    FallingSpeedEffector: 0
+  ViewClampYMin: -70
+  ViewClampYMax: 80
+  playerMask:
+    serializedVersion: 2
+    m_Bits: 55
+  gravityAmount: 0.05
+  gravityMin: -3
+  jumpingForce: {x: 0, y: 0, z: 0}
+  playerStance: 0
+  playerStanceSmoothing: 0.2
+  playerStandStance:
+    CameraHeight: 0.7
+    StanceCollider: {fileID: 5245491127989480120}
+  playerCrouchStance:
+    CameraHeight: 0.3
+    StanceCollider: {fileID: 5245491127989480100}
+  playerProneStance:
+    CameraHeight: -0.58
+    StanceCollider: {fileID: 5245491127989480121}
+  currentWeapon: {fileID: 8510909888689775086}
+--- !u!114 &4890899368932544690
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -177,72 +210,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 5245491127989480125}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dd8012d5925524537b27131fef517017, type: 3}
+  m_Script: {fileID: 11500000, guid: a8c9a8e604d395c4ab9d03d28adc4982, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_SensorName: BufferSensor
-  m_ObservableSize: 0
-  m_MaxNumObservables: 0
---- !u!114 &4264677542023120457
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5245491127989480125}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_BrainParameters:
-    VectorObservationSize: 1
-    NumStackedVectorObservations: 1
-    m_ActionSpec:
-      m_NumContinuousActions: 0
-      BranchSizes: 01000000
-    VectorActionSize: 01000000
-    VectorActionDescriptions: []
-    VectorActionSpaceType: 0
-    hasUpgradedBrainParametersWithActionSpec: 1
-  m_Model: {fileID: 0}
-  m_InferenceDevice: 0
-  m_BehaviorType: 0
-  m_BehaviorName: My Behavior
-  TeamId: 0
-  m_UseChildSensors: 1
-  m_UseChildActuators: 1
-  m_ObservableAttributeHandling: 0
---- !u!114 &4715950961444674817
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5245491127989480125}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a6f2a081cfc8c4b4bb6864331109d147, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  agentParameters:
-    maxStep: 0
-  hasUpgradedFromAgentParameters: 1
-  MaxStep: 0
---- !u!114 &5653209015090846528
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5245491127989480125}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d3ebcf807a37f344998fd648dfc9376d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  navMeshAgent: {fileID: 7254047075221496626}
-  flag: {fileID: 0}
 --- !u!1 &5245491128202443531
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Player.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a7480b77908b042d8adcdd84e8c2c15e
+guid: 80f6c1c85e5daed4c96c70205ed5503d
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -259,7 +259,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -355,7 +358,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -1124,7 +1130,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 705507993}
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 77.5, y: 55.2, z: -5.9}
+  m_LocalPosition: {x: 81.2, y: 64.1, z: -12.4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -1255,6 +1261,12 @@ Transform:
   m_Father: {fileID: 671439045}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!4 &868386701 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+    type: 3}
+  m_PrefabInstance: {fileID: 1809549197}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &884498019
 GameObject:
   m_ObjectHideFlags: 0
@@ -1288,6 +1300,80 @@ Transform:
   m_Father: {fileID: 782729761}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1061293905
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 868386701}
+    m_Modifications:
+    - target: {fileID: 2836004473841745626, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: 95a44e56d04c7d248ba723eda9611c51, type: 2}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2836004475591695743, guid: f432554f564e69242897607d34218939,
+        type: 3}
+      propertyPath: m_Name
+      value: DragonFucker
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f432554f564e69242897607d34218939, type: 3}
 --- !u!1 &1116745543
 GameObject:
   m_ObjectHideFlags: 0
@@ -1319,7 +1405,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -1751,7 +1840,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1345085340}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 47.446796, y: -5.782543, z: -25.400002}
+  m_LocalPosition: {x: 21.51, y: -5.782543, z: -10.46}
   m_LocalScale: {x: 1.4367, y: 1.4367, z: 1.4367}
   m_Children: []
   m_Father: {fileID: 2060099472}
@@ -1769,7 +1858,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -1865,7 +1957,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -2087,7 +2182,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -2138,6 +2236,105 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1663305221}
   m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1809549197
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -4942972567661207728, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 42.23
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -15.91
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763699, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_Name
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: playerStance
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: playerCrouchStance.CameraHeight
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203470625763703, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.417
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 99bb17a23a489624baeaf337f91a4f84, type: 3}
 --- !u!1 &1858987083
 GameObject:
   m_ObjectHideFlags: 0
@@ -2262,9 +2459,9 @@ MonoBehaviour:
   - {fileID: 140697606}
   spawnPointsForAttackersTeam:
   - {fileID: 2004854094}
-  AIPrefab: {fileID: 6171680323948707524, guid: b016874eb34cc084aa4359f0bbec50e1,
+  AIPrefab: {fileID: 2988578997639256874, guid: b016874eb34cc084aa4359f0bbec50e1,
     type: 3}
-  PlayerPrefab: {fileID: 5245491127989480125, guid: 80f6c1c85e5daed4c96c70205ed5503d,
+  PlayerPrefab: {fileID: 5245491127989480125, guid: 99bb17a23a489624baeaf337f91a4f84,
     type: 3}
 --- !u!114 &1858987091
 MonoBehaviour:
@@ -2531,7 +2728,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a2d29bfc31a8cf4e831e3bb80720414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   navType: 1
+=======
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
   PointId: 0
   DeathAttr: 0
   EnemiesSeen: []
@@ -2620,7 +2820,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2060099471}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 19.553204, y: 7.782543, z: -15}
+  m_LocalPosition: {x: 27.79, y: 7.782543, z: -15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1345085341}

Assets/Scripts/Character/MovementController.cs

@@ -9,28 +9,27 @@ public class MovementController : MonoBehaviour
     public int PointStartID { get; set; }
     public int PointEndID { get; private set; }
     public float FlagDistance { get; private set; }
-    private const float UpdateFlagPositionDelay = 5;
+    private const float updateFlagPositionDelay = 5;
-    private const float UpdateReachedDestinationDelay = 5;
+    private const float updateReachedDestinationDelay = 5;
 
     [SerializeField] private NavMeshAgent navMeshAgent;
     [SerializeField] private GameObject flag;
     public float DistanceToGo { get; private set; }
     public float RemainingDistance => navMeshAgent.remainingDistance;
-    private Dictionary<int, NavPoint> _idNavPointDict;
+    private Dictionary<int, NavPoint> idNavPointDict;
 
 
     private void Awake()
     {
         navMeshAgent.speed = SettingsReader.Instance.GetSettings.MovementSpeed;
-        _idNavPointDict = MapManager.Instance.IDToNavPoint;
+        idNavPointDict = MapManager.IDToNavPoint;
-        InvokeRepeating(nameof(UpdateFlagPosition), 0, UpdateFlagPositionDelay);
+        InvokeRepeating(nameof(UpdateFlagPosition), 0, updateFlagPositionDelay);
-        InvokeRepeating(nameof(ReachedDestination), 0, UpdateReachedDestinationDelay);
+        InvokeRepeating(nameof(ReachedDestination), 0, updateReachedDestinationDelay);
     }
    
     private void OnDestroy()
     {
         CancelInvoke(nameof(UpdateFlagPosition));
-        CancelInvoke(nameof(ReachedDestination));
     }
 
     private void UpdateFlagPosition()
@@ -40,14 +39,14 @@ public class MovementController : MonoBehaviour
     
     public void MoveToRandomPoint()
     {
-        GoToNextNavPoint(MapManager.Instance.NavPoints[Random.Range(0, MapManager.Instance.NavPoints.Count)]);
+        GoToNextNavPoint(MapManager.NavPoints[Random.Range(0, MapManager.NavPoints.Count)]);
     }
 
     public List<NavPoint> GetPointsCandidate()
     {
-        return MapManager.Instance.NavPoints
+        return MapManager.NavPoints
             .Where(point => 
-            (_idNavPointDict[PointStartID].Position - point.Position).magnitude < SettingsReader.Instance.GetSettings.MovementDistance)
+            (idNavPointDict[PointStartID].Position - point.Position).magnitude < SettingsReader.Instance.GetSettings.MovementDistance)
             .ToList();
     }
 
@@ -63,7 +62,7 @@ public class MovementController : MonoBehaviour
     public void ReturnToStartPoint()
     {
         if (navMeshAgent.isStopped == true) navMeshAgent.isStopped = false;
-        navMeshAgent.SetDestination(_idNavPointDict[PointStartID].Position);
+        navMeshAgent.SetDestination(idNavPointDict[PointStartID].Position);
         PointEndID = PointStartID;
         PointStartID = -1;
     }

Assets/Scripts/Character/NPC.cs

@@ -5,7 +5,7 @@ using Unity.MLAgents.Actuators;
 using Unity.MLAgents.Sensors;
 using UnityEngine;
 
-[RequireComponent(typeof(MovementController),typeof(BufferSensorComponent))]
+[RequireComponent(typeof(MovementController),typeof(BufferSensor))]
 public class NPC : Agent, ICharacter
 {
     [HideInInspector]
@@ -49,10 +49,10 @@ public class NPC : Agent, ICharacter
         bufferSensor = gameObject.GetComponent<BufferSensorComponent>();
 
         flagZone = GameObject.FindObjectOfType<FlagZone>();
-        if (flagZone is null)
+        if (flagZone == null)
-            Debug.LogError("Flag Is Not Set");
+            Debug.LogError("Flag Is Not Setted");
 
-        navPointIdDict = MapManager.Instance.IDToNavPoint;
+        navPointIdDict = MapManager.IDToNavPoint;
         if (navPointIdDict is null)
             Debug.LogError("Cant Find Nav Point Dictionary");
     }
@@ -64,19 +64,12 @@ public class NPC : Agent, ICharacter
 
     public override void OnEpisodeBegin()
     {
-        if (navPointIdDict is null)
-            Debug.LogError("Cant Find Nav Point Dictionary");
-        
         NpcState = DirectState;
         flagZone = GameObject.FindObjectOfType<FlagZone>();
     }
 
     public override void CollectObservations(VectorSensor sensor)
     {
-        // Debug.Log("Collect observations called!");
-        navPointIdDict = MapManager.Instance.IDToNavPoint;
-        if (navPointIdDict is null)
-            Debug.LogError("Cant Find Nav Point Dictionary");
         var candidates = moveController.GetPointsCandidate();
 
         //common sensors
@@ -89,7 +82,6 @@ public class NPC : Agent, ICharacter
         sensor.AddObservation(candidates.Count);
         sensor.AddObservation(moveController.PointStartID);
         sensor.AddObservation(moveController.PointEndID);
-        // Debug.Log("Done common!");
         //state sensors
         sensor.AddObservation((int)NpcState.State);
         sensor.AddObservation((int)NpcBodyState.State);
@@ -97,32 +89,27 @@ public class NPC : Agent, ICharacter
         sensor.AddObservation(navPointIdDict[moveController.PointStartID].DeathAttr);
         sensor.AddObservation(navPointIdDict[moveController.PointEndID].DeathAttr);
         sensor.AddObservation(moveController.FlagDistance);
-        // Debug.Log("Done state sensors!");
 
         //point sensors
         foreach (var point in candidates)
         {
-            var position = transform.position;
             bufferSensor.AppendObservation(new float[] {
                 point.DeathAttr,
                 (int)point.navType,
                 //4 flagEnemyDistance
-                GameManager.IsCloserToFlagFromNextNavPoint(point, position).ToInt(),
+                GameManager.IsCloserToFlagFromNextNavPoint(point, transform.position).ToInt(),
                 //5 EnemyVsNavPointDistance
-                GameManager.IsCloserToEnemyThanToNextNavPoint(point, position, AgentCharacter.Team.GetOppositeTeam()).ToInt(),
+                GameManager.IsCloserToEnemyThanToNextNavPoint(point,transform.position, AgentCharacter.Team.GetOppositeTeam()).ToInt(),
                 //6 Have been seen by enemy in this point               
                 GameManager.IsHaveSeenByEnemy(AgentCharacter.Team.GetOppositeTeam(),
                               point.Position).ToInt()
         });
         }
-        // Debug.Log("Done collect observations!");
     }
 
     public override void OnActionReceived(ActionBuffers actions)
     {
-        // Debug.Log("Actions recieved!");
         var result = actions.DiscreteActions;
-        // Debug.Log(result[0] + " " + result[1]);
         if (result[0] == 0)
         {
             if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Cover)
@@ -138,26 +125,18 @@ public class NPC : Agent, ICharacter
                 default: throw new ArgumentException("Undefined Action recieved");
             }
         }
-        // Debug.Log(result[0] == 1);
         if (result[0] == 1)
         {
-            // Debug.Log("BEFORE SOme shitty if >:(");
             if (navPointIdDict[moveController.PointStartID].navType != NavPointType.Direction)
-            {
-                // Debug.Log("SOme shitty if >:(");
                 return;
-            }
-            // Debug.Log("FUCK");
-
             switch (result[1])
             {
                 case 0: moveController.GoToNextNavPoint(navPointIdDict[result[2]]);
-                    NpcState = RunningState; Debug.Log("Go to point " + result[2]);break;
+                    NpcState = RunningState; break;
                 case 1: NpcState = DirectState; break;
                 default: throw new ArgumentException("Undefined Action recieved");
             }
         }
-        
         if (result[0] == 2)
         {
             if (moveController.PointStartID == moveController.PointEndID && moveController.PointEndID != -1)
@@ -169,7 +148,6 @@ public class NPC : Agent, ICharacter
                 default: throw new ArgumentException("Undefined Action recieved");
             }
         }
-        // Debug.Log("Actions processed!");
     }
     #endregion
 
@@ -187,12 +165,11 @@ public class NPC : Agent, ICharacter
     }
 
     public event Action<int, Team> OnDamageRecieved;
-    public void GetDamage(int damage)
+    public void GetDamage(float damage)
     {
         AgentCharacter.LastTimeHit = TimeManager.Instance.CurrentTime;
         Condition.GiveHealth(-Mathf.RoundToInt(damage * (1 - Condition.ArmourPoints * 0.5f)));
         Condition.GiveArmour(-Mathf.RoundToInt(Mathf.Sqrt(damage) * 5));
-        OnDamageRecieved?.Invoke(damage, AgentCharacter.Team);
 
         if (Condition.HealthPoints < 0)
         {

Assets/Scripts/Managers/GameManager.cs

@@ -24,6 +24,7 @@ public class GameManager : MonoBehaviour
     private void Start()
     {
         Academy.Instance.OnEnvironmentReset += ResetScene;
+
         GlobalEventManager.OnCaptureFlag += FlagCaptured;
         GlobalEventManager.OnTimeLeft += TimeOut;
 

Assets/Scripts/Managers/MapManager.cs

@@ -3,36 +3,36 @@ using UnityEngine;
 
 public class MapManager : MonoBehaviour
 {
-    private static MapManager _instance;
+    private static MapManager instance;
-    public static MapManager Instance => _instance;
+    public static MapManager Instance => instance;
-    [SerializeField] private List<NavPoint> _navPoints;
+    [SerializeField] static List<NavPoint> _navPoints;
-    public List<NavPoint> NavPoints { get => _navPoints; private set => _navPoints = value; }
+    public static List<NavPoint> NavPoints { get => _navPoints; private set => _navPoints = value; }
-    public Dictionary<int, NavPoint> IDToNavPoint {get; private set; }
+    public static Dictionary<int, NavPoint> IDToNavPoint {get; private set; }
 
     private void Awake()
     {
-        if (_instance is null)
+        if (instance is null)
-            _instance = this;
+            instance = this;
         else
         {
             Destroy(gameObject);
             Debug.LogError("Only 1 Instance");
         }
+    }
 
-        NavPoints = new List<NavPoint>();
+    private void Start()
+    {
         var navPointSet = GameObject.Find("NavPoint Set");
         var count = navPointSet.transform.childCount;
-        for (var i=0; i < count; i++)        
+        for (int i=0; i < count; i++)        
             NavPoints.Add(navPointSet.transform.GetChild(i)
                 .gameObject.GetComponent<NavPoint>());
-        print(NavPoints.Count);
+
         NavPointSetToID();
     }
 
-
     private void NavPointSetToID()
     {
-        IDToNavPoint = new Dictionary<int, NavPoint>();
         int i = 0;
         foreach (var navPoint in NavPoints)
         {
@@ -45,8 +45,8 @@ public class MapManager : MonoBehaviour
     public static void AddDeathAttributeToPoints(int startPoint, int endPoint, 
         float allDistance, float remainingDistance)
     {
-        var startNavPoint = _instance.IDToNavPoint[startPoint];
+        var startNavPoint = IDToNavPoint[startPoint];
-        var endNavPoint = _instance.IDToNavPoint[endPoint];
+        var endNavPoint = IDToNavPoint[endPoint];
         float coef; 
         try
         {

Assets/Scripts/Statistics/StatisticManager.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 300
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Settings/Game Settings.asset

@@ -12,6 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e2c47233b9062c84482336b145c6891b, type: 3}
   m_Name: Game Settings
   m_EditorClassIdentifier: 
+<<<<<<< HEAD
   IsTesting: 0
   TimeToWin: 15
   TimeOut: 3600
@@ -38,3 +39,29 @@ MonoBehaviour:
   DoDamageChanceInRunning: 30
   DoDamageChanceInCover: 25
   CrouchingCoefficient: 1.4
+=======
+  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: 100
+  maxArmour: 100
+  maxAmmo: 31337
+  GetHitChanceInDirectPoint: 0
+  GetHitChanceInRunning: 0
+  GetHitChanceInCover: 0
+  DoDamageChanceInDirectPoint: 0
+  DoDamageChanceInRunning: 0
+  DoDamageChanceInCover: 0
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467

Packages/manifest.json

@@ -1,24 +1,17 @@
 {
   "dependencies": {
-    "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ads": "3.7.5",
-    "com.unity.analytics": "3.6.12",
     "com.unity.collab-proxy": "1.14.12",
     "com.unity.ide.rider": "1.2.1",
     "com.unity.ide.visualstudio": "2.0.14",
     "com.unity.ide.vscode": "1.2.4",
     "com.unity.inputsystem": "1.3.0",
     "com.unity.ml-agents": "2.0.1",
-    "com.unity.multiplayer-hlapi": "1.0.8",
     "com.unity.probuilder": "4.5.2",
-    "com.unity.purchasing": "4.1.2",
     "com.unity.test-framework": "1.1.30",
     "com.unity.textmeshpro": "2.1.6",
     "com.unity.timeline": "1.2.18",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.0",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.legacyinputhelpers": "2.1.8",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

@@ -1,35 +1,5 @@
 {
   "dependencies": {
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.2d.tilemap": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.ads": {
-      "version": "3.7.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.analytics": {
-      "version": "3.6.12",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.barracuda": {
       "version": "2.0.0",
       "depth": 1,
@@ -116,15 +86,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.multiplayer-hlapi": {
-      "version": "1.0.8",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "nuget.mono-cecil": "0.1.6-preview"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.probuilder": {
       "version": "4.5.2",
       "depth": 0,
@@ -134,29 +95,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.purchasing": {
-      "version": "4.1.2",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0",
-        "com.unity.modules.unityanalytics": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.androidjni": "1.0.0",
-        "com.unity.services.core": "1.0.1"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.services.core": {
-      "version": "1.0.1",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.settings-manager": {
       "version": "1.0.3",
       "depth": 1,
@@ -231,23 +169,6 @@
         "com.unity.modules.imgui": "1.0.0"
       }
     },
-    "com.unity.xr.legacyinputhelpers": {
-      "version": "2.1.8",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.vr": "1.0.0",
-        "com.unity.modules.xr": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "nuget.mono-cecil": {
-      "version": "0.1.6-preview",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,

ProjectSettings/ProjectSettings.asset

@@ -614,11 +614,7 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLWasmStreaming: 0
-  scriptingDefineSymbols:
+  scriptingDefineSymbols: {}
-    1: CROSS_PLATFORM_INPUT
-    4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
-    7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
-    14: MOBILE_INPUT
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}