great merge dev and CollisionManager

ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZoFo.GameCore.GameManagers.CollisionManager
+{
+    public class CollisionComponent
+    { 
+        //остановлен ли перс
+        bool doesStop;
+        Rectangle stopRectangle;
+
+        // triggers for rectangle
+        bool isTrigger;
+        Rectangle triggerRectangle;
+
+        //delegate
+        public delegate void EventHandler(object sender, EventArgs e);
+
+
+        //events 
+        public event EventHandler<CollisionComponent> OnTriggerEnter;
+        public event EventHandler<CollisionComponent> OnTriggerZone;
+        public event EventHandler<CollisionComponent> OnTriggerExit;
+
+        // methods-event
+        public void TriggerEnter(object component, ///<Player player>,
+            EventArgs e)
+        {
+
+        }
+        public void TriggerZone(object component,///<Player player>,
+             EventArgs e)
+        {
+
+        }
+        public void TriggerExit(object component,///<Player player>,
+             EventArgs e)
+        {
+
+        }
+
+
+    }   
+}

ZoFo/GameCore/GameManagers/CollisionManager/CollisionManager.cs

@@ -0,0 +1,33 @@
+using Microsoft.VisualBasic;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZoFo.GameCore.GameManagers.CollisionManager
+{
+    public class CollisionManager
+    {
+        public List<CollisionComponent> CollisionComponent;
+        public List<CollisionComponent> TriggerComponent;
+
+        public void UpdatePositions()
+        {
+
+        }
+
+        public void GetObjectInArea(Rectangle area)
+        {
+
+        }
+
+        public void Register(Rectangle rectangle)
+        {
+
+        }
+
+
+    }
+}

ZoFo/ZoFo.csproj

@@ -21,10 +21,13 @@
     <ItemGroup>
         <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
         <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
+<<<<<<< HEAD
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\MonogameLibrary\MonogameLibrary.csproj" />
+=======
+>>>>>>> CollisionManager
     </ItemGroup>
     <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
         <Message Text="Restoring dotnet tools" Importance="High" />