Merge branch 'ServerBranch' of github.com:progtime-net/ZoFo into ServerBranch

MonogameLibrary/UI/Elements/TextBox.cs

@@ -89,9 +89,9 @@ namespace MonogameLibrary.UI.Elements
             if (hoverState == HoverState.None)
             {
                 if (isSelected == IsSelected.Selected)
-                    _spriteBatch.Draw(texture, rectangle, new Color(220, 220, 220));
+                    _spriteBatch.Draw(texture, rectangle, new Color(211, 211, 211));
                 else
-                    _spriteBatch.Draw(texture, rectangle, new Color(245, 245, 245));
+                    _spriteBatch.Draw(texture, rectangle, Color.White);
             }
             else if (hoverState == HoverState.Hovering)
                 _spriteBatch.Draw(texture, rectangle, new Color(211, 211, 211));

ZoFo/Content/Content.mgcb

@@ -34,6 +34,54 @@
 /processorParam:TextureFormat=Compressed
 /build:Fonts/Font3.spritefont
 
+#begin Textures/GUI/background/base.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/GUI/background/base.png
+
+#begin Textures/GUI/background/join.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/GUI/background/join.png
+
+#begin Textures/GUI/background/selectMode.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/GUI/background/selectMode.png
+
+#begin Textures/GUI/background/waiting.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/GUI/background/waiting.png
+
 #begin Textures/GUI/checkboxs_off-on.png
 /importer:TextureImporter
 /processor:TextureProcessor

ZoFo/GameCore/GUI/SelectModeMenu.cs

@@ -21,13 +21,13 @@ public class SelectModeMenu : AbstractGUI
         int width = AppManager.Instance.CurentScreenResolution.X;
         int height = AppManager.Instance.CurentScreenResolution.Y;
         
-        menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, width, height), mainColor = Color.White, textureName = "Textures\\GUI\\MenuBackground" };
+        menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, width, height), mainColor = Color.White, textureName = "Textures\\GUI\\background\\selectMode" };
         Elements.Add(menuBackground);
         menuBackground.LoadTexture(AppManager.Instance.Content);
         
         Elements.Add(new Label(Manager) { rectangle = new Rectangle(width / 2 - (int)(width / 8), height / 6, (int)(width / 4), (int)(height / 20)), text = "Select mode", fontColor = Color.White, mainColor = Color.Transparent, scale = 0.9f, fontName = "Fonts\\Font"});
         
-        Button playButton = new Button(Manager) 
+        Button singleButton = new Button(Manager) 
         {
             rectangle = new Rectangle(width / 4 - (width / 7) / 2, height / 2, (int)(width / 7), (int)(height / 20)),
             text = "singleplayer",
@@ -36,7 +36,7 @@ public class SelectModeMenu : AbstractGUI
             mainColor = Color.Gray,
             fontName = "Fonts\\Font"
         };
-        playButton.LeftButtonPressed += () => 
+        singleButton.LeftButtonPressed += () => 
         {
             // single
             Server server = new Server();   //Server Logic SinglePlayer
@@ -51,7 +51,7 @@ public class SelectModeMenu : AbstractGUI
             AppManager.Instance.debugHud.Set(key,"SinglePlayer");
             // ваш код здесь 
         };
-        Elements.Add(playButton);
+        Elements.Add(singleButton);
         Button optionButton = new Button(Manager) 
         {
             rectangle = new Rectangle(width / 2 + width / 4 - (width / 7) / 2, height / 2, (int)(width / 7), (int)(height / 20)),
@@ -63,6 +63,7 @@ public class SelectModeMenu : AbstractGUI
         };
         optionButton.LeftButtonPressed += () => 
         {
+            AppManager.Instance.SetGUI(new SelectingServerGUI());
             // multi 
             Server server = new Server();   //Server Logic MultiPlayer
             Client client = new Client();
@@ -75,6 +76,14 @@ public class SelectModeMenu : AbstractGUI
             // ваш код здесь 
         };
         Elements.Add(optionButton);
+        
+        Button bTExit = new Button(Manager)
+            { fontName = "Fonts\\Font3", scale = 0.4f, text = "<-", fontColor = Color.Black, mainColor = Color.Transparent, rectangle = new Rectangle(width / 30, height / 30, width / 40, width / 40), textureName = "Textures\\GUI\\checkboxs_off"};
+        Elements.Add(bTExit);
+        bTExit.LeftButtonPressed += () =>
+        {
+            AppManager.Instance.SetGUI(new MainMenuGUI());
+        };
     }
 
     public override void Update(GameTime gameTime)

ZoFo/GameCore/GUI/SelectingServerGUI.cs

@@ -9,19 +9,94 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using MonogameLibrary.UI.Base;
 using MonogameLibrary.UI.Elements;
+using ZoFo.GameCore.GameManagers;
 
 namespace ZoFo.GameCore.GUI;
 
 public class SelectingServerGUI : AbstractGUI
 {
+    private DrawableUIElement menuBackground;
     protected override void CreateUI()
     {
-        // int width = AppManager.Instance.inGameHUDHelperResolution.X;
+        int width = AppManager.Instance.CurentScreenResolution.X;
-        // int height = AppManager.Instance.inGameHUDHelperResolution.Y;
+        int height = AppManager.Instance.CurentScreenResolution.Y;
+        
+        menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, width, height), mainColor = Color.White, textureName = "Textures\\GUI\\background\\join" };
+        Elements.Add(menuBackground);
+        menuBackground.LoadTexture(AppManager.Instance.Content);
+        
+        Elements.Add(new Label(Manager) { rectangle = new Rectangle(width / 2 - (int)(width / 8), height / 7, (int)(width / 4), (int)(height / 20)), text = "Select server", fontColor = Color.White, mainColor = Color.Transparent, scale = 0.9f, fontName = "Fonts\\Font"});
+
+        TextBox ipBox = new TextBox(Manager) 
+        {
+            rectangle = new Rectangle(width / 4 - (width / 4) / 2, height / 4, (int)(width / 4), (int)(height / 20)),
+            text = "ip",
+            scale = 0.2f,
+            fontColor = Color.White,
+            mainColor = Color.Gray,
+            textAligment = MonogameLibrary.UI.Enums.TextAligment.Left,
+            fontName = "Fonts\\Font"
+        };
+        ipBox.TextChanged += input => {
+            if (input == "ip")
+            {
+                ipBox.text = ""; ipBox.fontColor = Color.White;
+            }
+        };
+        ipBox.StopChanging += input => {
+            if (input.Length == 0)
+            {
+                ipBox.fontColor = Color.White;
+                ipBox.text = "ip";
+            }
+        };
+        Elements.Add(ipBox);
+        Button joinButton = new Button(Manager) 
+        {
+            rectangle = new Rectangle(width / 4 + (width / 4) / 2, height / 4, (int)(width / 15), (int)(height / 20)),
+            text = "Join",
+            scale = 0.3f,
+            fontColor = Color.White,
+            mainColor = Color.Gray,
+            fontName = "Fonts\\Font"
+        };
+        joinButton.LeftButtonPressed += () => 
+        {
+            AppManager.Instance.SetGUI(new WaitingForPlayersGUI(false));
+            // join
+            
+            // ваш код здесь 
+        };
+        Elements.Add(joinButton);
+        Button hostButton = new Button(Manager) 
+        {
+            rectangle = new Rectangle(width / 4 + (width / 4) / 2 + (width / 15), height / 4, (int)(width / 15), (int)(height / 20)),
+            text = "Host",
+            scale = 0.3f,
+            fontColor = Color.White,
+            mainColor = Color.Gray,
+            fontName = "Fonts\\Font"
+        };
+        hostButton.LeftButtonPressed += () => 
+        {
+            AppManager.Instance.SetGUI(new WaitingForPlayersGUI(true));
+            // host
+            
+            // ваш код здесь 
+        };
+        Elements.Add(hostButton);
+        
+        Button bTExit = new Button(Manager)
+            { fontName = "Fonts\\Font3", scale = 0.4f, text = "<-", fontColor = Color.Black, mainColor = Color.Transparent, rectangle = new Rectangle(width / 30, height / 30, width / 40, width / 40), textureName = "Textures\\GUI\\checkboxs_off"};
+        Elements.Add(bTExit);
+        bTExit.LeftButtonPressed += () =>
+        {
+            AppManager.Instance.SetGUI(new SelectModeMenu());
+        };
     }
 
     public override void Update(GameTime gameTime)
     {
-        
+        base.Update(gameTime);
     }
 }

ZoFo/GameCore/GUI/WaitingForPlayersGUI.cs

@@ -9,19 +9,61 @@ using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using MonogameLibrary.UI.Base;
 using MonogameLibrary.UI.Elements;
+using ZoFo.GameCore.GameManagers;
 
 namespace ZoFo.GameCore.GUI;
 
 public class WaitingForPlayersGUI : AbstractGUI
 {
+    private DrawableUIElement menuBackground;
+    private bool isHost;
+
+    public WaitingForPlayersGUI(bool isHost)
+    {
+        this.isHost = isHost;
+    }
     protected override void CreateUI()
     {
-        // int width = AppManager.Instance.inGameHUDHelperResolution.X;
+        int width = AppManager.Instance.CurentScreenResolution.X;
-        // int height = AppManager.Instance.inGameHUDHelperResolution.Y;
+        int height = AppManager.Instance.CurentScreenResolution.Y;
+        
+        menuBackground = new DrawableUIElement(Manager) { rectangle = new Rectangle(0, 0, width, height), mainColor = Color.White, textureName = "Textures\\GUI\\background\\Waiting" };
+        Elements.Add(menuBackground);
+        menuBackground.LoadTexture(AppManager.Instance.Content);
+        
+        Elements.Add(new Label(Manager) { rectangle = new Rectangle(width / 2 - (int)(width / 8), height / 7, (int)(width / 4), (int)(height / 20)), text = "Waiting", fontColor = Color.White, mainColor = Color.Transparent, scale = 0.9f, fontName = "Fonts\\Font"});
+        
+        if (isHost)
+        {
+            Button startButton = new Button(Manager) 
+            {
+                rectangle = new Rectangle(width / 2 - (width / 15) / 2, height / 2 + height / 4, (int)(width / 15), (int)(height / 20)),
+                text = "Start",
+                scale = 0.3f,
+                fontColor = Color.White,
+                mainColor = Color.Gray,
+                fontName = "Fonts\\Font"
+            };
+            startButton.LeftButtonPressed += () => 
+            {
+                // start
+                
+                // ваш код здесь 
+            };
+            Elements.Add(startButton);
+        }
+        
+        Button bTExit = new Button(Manager)
+            { fontName = "Fonts\\Font3", scale = 0.4f, text = "<-", fontColor = Color.Black, mainColor = Color.Transparent, rectangle = new Rectangle(width / 30, height / 30, width / 40, width / 40), textureName = "Textures\\GUI\\checkboxs_off"};
+        Elements.Add(bTExit);
+        bTExit.LeftButtonPressed += () =>
+        {
+            AppManager.Instance.SetGUI(new SelectingServerGUI());
+        };
     }
 
     public override void Update(GameTime gameTime)
     {
-        
+        base.Update(gameTime);
     }
 }

ZoFo/GameCore/GameManagers/AppManager.cs

@@ -113,8 +113,6 @@ namespace ZoFo.GameCore.GameManagers
         {
             GraphicsDevice.Clear(Color.CornflowerBlue);
 
-
-
             currentGUI.Draw(_spriteBatch);
             debugHud.Draw(_spriteBatch);
             switch (gamestate)

ZoFo/GameCore/GameManagers/InputManager.cs

@@ -3,63 +3,59 @@ using Microsoft.Xna.Framework.Input;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Formats.Tar;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace ZoFo.GameCore.GameManagers
 { 
-    public enum ScopeState { Up, Middle, Down }
+    public enum ScopeState { Left, Right, Straight, Back, StraightLeft, StraightRight, BackLeft, BackRight }
-    public enum ControlsState { Gamepad, Keyboard }
     public class InputManager
     {
         public delegate void Delegat();
-        public event Delegat MovEventJump;
+        public event Delegat ShootEvent; // событие удара(когда нажат X, событие срабатывает)
-        public event Delegat MovEventDown;
+        
-        public event Delegat ShootEvent;
+        public event Delegat OnInteract; // событие взаимодействия с collectable(например, лутом)
+        //с помощью кнопки E.
+
+        public event Delegat TalkEvent;
 
         Vector2 vectorMovementDirection;
-        ScopeState scopeState;        // Положение оружия. Up, Middle, Down.
+        ScopeState currentScopeState;        // Положение оружия. Left, Right, Straight, Back, StraightLeft, StraightRight, BackLeft, BackRight.
-        ControlsState controlsState;
-        private bool _overrideControls = false;
         private bool _cheatsEnabled = false;
         public bool InvincibilityCheat { get; private set; } = false;
         public bool CollisionsCheat { get; private set; } = false;
         public bool InfiniteAmmoCheat { get; private set; } = false;
 
-        private bool isJumpDown;      // Блокирует физическое нажатие прыжка и спуска
         private bool isShoot;
+        private bool isInteract;
 
         private KeyboardState lastKeyboardState;
         private GamePadState lastGamePadState;
 
 
         public Vector2 VectorMovementDirection { get => vectorMovementDirection; }
-        public ScopeState ScopeState { get => scopeState; }
+        public ScopeState ScopeState { get => currentScopeState; }
         public string currentControlsState;
+        public ScopeState CurrentScopeState { get => currentScopeState; } // получить текущее состояние
 
         public InputManager()
         {
-            this.isJumpDown = false;
             this.isShoot = false;
-            scopeState = ScopeState.Middle;
+            currentScopeState = ScopeState.Straight;
-            controlsState = ControlsState.Keyboard;
             vectorMovementDirection = new Vector2(0, 0);
         }
         public void Update()
         {
             if (_cheatsEnabled)
             {
-                //AppManager.Instance.DebugHUD.Set("cheats", _cheatsEnabled.ToString());
+                AppManager.Instance.debugHud.Set("cheats", _cheatsEnabled.ToString());
-                //AppManager.Instance.DebugHUD.Set("invincible", InvincibilityCheat.ToString());
+                AppManager.Instance.debugHud.Set("invincible", InvincibilityCheat.ToString());
-                //AppManager.Instance.DebugHUD.Set("infinite ammo", InfiniteAmmoCheat.ToString()); //TODO
+                AppManager.Instance.debugHud.Set("infinite ammo", InfiniteAmmoCheat.ToString()); //TODO
             }
 
             #region Работа с GamePad
-            if (_overrideControls ? controlsState == ControlsState.Gamepad : GamePad.GetState(0).IsConnected)
-            {
-                controlsState = ControlsState.Gamepad;
-
                 #region Обработка гейм-пада. Задает Vector2 vectorMovementDirection являющийся вектором отклонения левого стика.
                 GamePadState gamePadState = GamePad.GetState(0);
                 vectorMovementDirection = gamePadState.ThumbSticks.Left;
@@ -78,56 +74,57 @@ namespace ZoFo.GameCore.GameManagers
                 }
                 #endregion // Cheats
 
-                #region Обработка нажатия прыжка и спуска. Вызывает события MovEvent.
-                if (vectorMovementDirection.Y < -0.2 && gamePadState.Buttons.A == ButtonState.Pressed && !isJumpDown)
-                {
-                    isJumpDown = true;
-                    MovEventDown?.Invoke();
-                    Debug.WriteLine("Спуск");
-                }
-                else if (gamePadState.Buttons.A == ButtonState.Pressed && lastGamePadState.Buttons.A == ButtonState.Released)
-                {
-                    MovEventJump?.Invoke();
-                    Debug.WriteLine("Прыжок");
-                }
-                #endregion
-
                 #region Обработка положения оружия. Задает значение полю scopeState.
-                if (vectorMovementDirection.Y >= 0.7)
+                if (vectorMovementDirection.Y >= 0.6)
                 {
-                    scopeState = ScopeState.Up;
+                    currentScopeState = ScopeState.Straight;
                 }
-                else if (vectorMovementDirection.Y <= -0.7 && !isJumpDown)
+                else if(vectorMovementDirection.Y <= 0.6)
                 {
-                    scopeState = ScopeState.Down;
+                    currentScopeState = ScopeState.Back;
                 }
-                else
+                else if(vectorMovementDirection.X >= 0.6)
                 {
-                    scopeState = ScopeState.Middle;
+                    currentScopeState = ScopeState.Right;
+                }
+                else if(vectorMovementDirection.X <= 0.6)
+                {
+                    currentScopeState = ScopeState.Left;
+                }
+                else if(vectorMovementDirection.Y >= 0.6 && vectorMovementDirection.X >= 0.6)
+                {
+                    currentScopeState = ScopeState.StraightRight;
+                }
+                else if(vectorMovementDirection.Y >= 0.6 && vectorMovementDirection.X <= 0.6)
+                {
+                    currentScopeState = ScopeState.StraightLeft;
+                }
+                else if(vectorMovementDirection.Y <= 0.6 && vectorMovementDirection.X >= 0.6)
+                {
+                    currentScopeState = ScopeState.BackRight;
+                }
+                else if(vectorMovementDirection.Y <= 0.6 && vectorMovementDirection.X <= 0.6)
+                {
+                    currentScopeState = ScopeState.BackLeft;
                 }
                 #endregion
 
                 #region Обработка нажатия выстрела. Вызывает событие ShootEvent
-                if (gamePadState.Buttons.X == ButtonState.Pressed && !isJumpDown && !isShoot)
+                if (gamePadState.Buttons.X == ButtonState.Pressed && !isShoot)
                 {
                     isShoot = true;
                     ShootEvent?.Invoke();
                     Debug.WriteLine("Выстрел");
                 }
-                else if (gamePadState.Buttons.X == ButtonState.Released && !isJumpDown)
+                else if (gamePadState.Buttons.X == ButtonState.Released)
                 {
                     isShoot = false;
                 }
                 #endregion
 
                 lastGamePadState = gamePadState;
-            }
             #endregion
             #region Работа с KeyBoard
-            else
-            {
-                controlsState = ControlsState.Keyboard;
-
                 #region Состояние клавиатуры
                 KeyboardState keyBoardState = Keyboard.GetState();  // Состояние клавиатуры
                 #endregion
@@ -154,76 +151,73 @@ namespace ZoFo.GameCore.GameManagers
                 }
                 #endregion // Cheats
 
-                #region Обработка движения вправо-влево. Меняет у вектора vectorMovementDirection значение X на -1/0/1.
+                #region Обработка состояния объекта. Задает значение полю scopeState.
-                if (keyBoardState.IsKeyDown(Keys.Left))
+                if (keyBoardState.IsKeyDown(Keys.Up) || keyBoardState.IsKeyDown(Keys.W))
                 {
-                    vectorMovementDirection.X = -1;
+                    currentScopeState = ScopeState.Straight;
                 }
-                else if (keyBoardState.IsKeyDown(Keys.Right))
+                else if (keyBoardState.IsKeyDown(Keys.Down) || keyBoardState.IsKeyDown(Keys.S))
                 {
-                    vectorMovementDirection.X = 1;
+                    currentScopeState = ScopeState.Back;
                 }
-                else
+                else if(keyBoardState.IsKeyDown(Keys.Left) || keyBoardState.IsKeyDown(Keys.A))
                 {
-                    vectorMovementDirection.X = 0;
+                    currentScopeState = ScopeState.Left;
                 }
-                #endregion
+                else if(keyBoardState.IsKeyDown(Keys.Right) || keyBoardState.IsKeyDown(Keys.D))
-
-                #region Обработка прыжка и спуска. Вызываются события MovEvent.
-                if (keyBoardState.IsKeyDown(Keys.LeftShift) && !isJumpDown && keyBoardState.IsKeyDown(Keys.Down))
                 {
-                    isJumpDown = true;
+                    currentScopeState = ScopeState.Right;
-                    MovEventDown?.Invoke();
-                    Debug.WriteLine("Спуск");
                 }
-                else if (keyBoardState.IsKeyDown(Keys.LeftShift) && !isJumpDown)
+                else if(keyBoardState.IsKeyDown(Keys.Right) && keyBoardState.IsKeyDown(Keys.Up) || 
+                keyBoardState.IsKeyDown(Keys.D) && keyBoardState.IsKeyDown(Keys.W))
                 {
-                    isJumpDown = true;
+                    currentScopeState = ScopeState.StraightRight;
-                    MovEventJump?.Invoke();
-                    Debug.WriteLine("Прыжок");
                 }
-                else if (keyBoardState.IsKeyUp(Keys.LeftShift))
+                else if(keyBoardState.IsKeyDown(Keys.Left) && keyBoardState.IsKeyDown(Keys.Up) || 
+                keyBoardState.IsKeyDown(Keys.A) && keyBoardState.IsKeyDown(Keys.W))
                 {
-                    isJumpDown = false;
+                    currentScopeState = ScopeState.StraightLeft;
                 }
-                #endregion
+                else if(keyBoardState.IsKeyDown(Keys.Right) && keyBoardState.IsKeyDown(Keys.Down) || 
-
+                keyBoardState.IsKeyDown(Keys.D) && keyBoardState.IsKeyDown(Keys.S))
-                #region Обработка положения оружия. Задает значение полю scopeState.
-                if (keyBoardState.IsKeyDown(Keys.Up))
                 {
-                    scopeState = ScopeState.Up;
+                    currentScopeState = ScopeState.BackRight;
                 }
-                else if (keyBoardState.IsKeyDown(Keys.Down) && !isJumpDown)
+                else if(keyBoardState.IsKeyDown(Keys.Left) && keyBoardState.IsKeyDown(Keys.Down) || 
+                keyBoardState.IsKeyDown(Keys.A) && keyBoardState.IsKeyDown(Keys.S))
                 {
-                    scopeState = ScopeState.Down;
+                    currentScopeState = ScopeState.BackLeft;
-                }
-                else
-                {
-                    scopeState = ScopeState.Middle;
                 }
                 #endregion
 
                 #region Обработка нажатия выстрела. Вызывает событие ShootEvent
-                if (keyBoardState.IsKeyDown(Keys.X) && !isJumpDown && !isShoot)
+                if (keyBoardState.IsKeyDown(Keys.P) && !isShoot)
                 {
                     isShoot = true;
                     ShootEvent?.Invoke();
                     Debug.WriteLine("Выстрел");
                 }
-                else if (keyBoardState.IsKeyUp(Keys.X) && !isJumpDown)
+                else if (keyBoardState.IsKeyUp(Keys.P))
                 {
                     isShoot = false;
                 }
                 #endregion
 
-                SetState(ControlsState.Keyboard);
+                #region Обработка взаимодействия с collectable(например лутом). Вызывает событие OnInteract
+                if (keyBoardState.IsKeyDown(Keys.E) && !isInteract)
+                {
+                  
+                    OnInteract?.Invoke();
+                    Debug.WriteLine("взаимодействие с Collectable");
+                }
+                else if (keyBoardState.IsKeyUp(Keys.E))
+                {
+                    isInteract = false;
+                }
+                #endregion
                 lastKeyboardState = keyBoardState;
-            }
+            
             #endregion 
         }
-        public void SetState(ControlsState controlsState)
-        {
-            currentControlsState = controlsState.ToString();
-        }
     }
 }

ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs

@@ -65,8 +65,8 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
             listen.Start();
         }
 
-        /// <summary>
+        /// <summary> 
-        /// создается одиночная комната
+        /// создается одиночная комната к которой ты подключаешься 
         /// </summary>
         public void JoinYourself()  // single player
         {

ZoFo/GameCore/GameObjects/GameObject.cs

@@ -1,5 +1,8 @@
 
 using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using ZoFo.GameCore.GameManagers;
 using ZoFo.GameCore.ZoFo_graphics;
 
 namespace ZoFo.GameCore.GameObjects;
@@ -7,9 +10,65 @@ namespace ZoFo.GameCore.GameObjects;
 public abstract class GameObject
 {
     public Vector2 position;
-    public Vector2 rotation;
+    public Vector2 rotation; //вектор направления объекта
-
     protected abstract GraphicsComponent graphicsComponent { get; }
-    public void Draw() { }
 
+    #region ServerSide
+    public GameObject(Vector2 position)
+    {
+        this.position = position;
+    }
+     
+
+    /// <summary>
+    /// Это вызывается в логике игры, которая на сервере, здесь будет вызываться уведомление об анимации
+    /// </summary>
+    public void PlayAnimation_OnServer()
+    {
+        //TODO
+    }
+
+    #endregion
+
+
+    #region Client Side
+
+    /// <summary>
+    /// Это вызывается в клиентской части игры
+    /// </summary>
+    public void PlayAnimation_OnClient()
+    {
+        graphicsComponent.Update();
+    }
+    public void LoadContent()
+    {
+        graphicsComponent.LoadContent();
+    }
+
+    public virtual void Update(GameTime gameTime)
+    {
+        //PlayAnimation();
+    }
+
+    public virtual void Draw(SpriteBatch spriteBatch)
+    {
+        graphicsComponent.DrawAnimation(graphicsComponent.ObjectDrawRectangle, spriteBatch);
+        //debug
+        if (AppManager.Instance.InputManager.CollisionsCheat)
+            DrawDebugRectangle(spriteBatch, graphicsComponent.ObjectDrawRectangle);
+
+    }
+    public void DrawDebugRectangle(SpriteBatch spriteBatch, Rectangle _rectangle, Nullable<Color> color = null)
+    {
+        if (color is null) color = new Color(1, 0, 0, 0.25f);
+        if (color.Value.A == 255) color = new Color(color.Value, 0.25f);
+        //spriteBatch.Draw(debugTexture,
+        //                     new Rectangle((_rectangle.X - GraphicsComponent.CameraPosition.X) * GraphicsComponent.scaling,
+        //                     (_rectangle.Y - GraphicsComponent.CameraPosition.Y) * GraphicsComponent.scaling,
+        //                     _rectangle.Width * GraphicsComponent.scaling,
+        //                     _rectangle.Height * GraphicsComponent.scaling), color.Value);
+     
+        //TODO: debugTexture
+    }
+    #endregion 
 }

ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs

@@ -0,0 +1,26 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZoFo.GameCore.GameManagers;
+using ZoFo.GameCore.ZoFo_graphics;
+
+namespace ZoFo.GameCore.GameObjects.MapObjects
+{
+    internal class MapObject : GameObject
+    {
+        public virtual bool IsColliderOn { get; protected set; } = true;
+        private Rectangle _sourceRectangle;
+        protected override GraphicsComponent graphicsComponent => new("tiles");
+
+        public MapObject(Vector2 position, Vector2 size, Rectangle sourceRectangle) : base(position)
+        {
+            _sourceRectangle = sourceRectangle;
+            graphicsComponent.ObjectDrawRectangle = new Rectangle(0,0, (int)size.X, (int)size.Y);
+        }
+         
+    }
+}

ZoFo/GameCore/GameObjects/MapObjects/StopObjects/StopObject.cs

@@ -0,0 +1,13 @@
+using Microsoft.Xna.Framework;
+using System;
+using ZoFo.GameCore.ZoFo_graphics;
+
+namespace ZoFo.GameCore.GameObjects.MapObjects.StopObjects;
+
+public abstract class StopObject : GameObject
+{
+    protected StopObject(Vector2 position) : base(position)
+    {
+        //TODO
+    }
+}

ZoFo/GameCore/GameObjects/MapObjects/Tiles/Tile.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace ZoFo.GameCore.GameObjects.MapObjects.Tiles;
+
+public class Tile
+{
+
+}

ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs

@@ -15,6 +15,10 @@ namespace ZoFo.GameCore.ZoFo_graphics
 
     public class GraphicsComponent
     {
+        public Rectangle ObjectDrawRectangle { get; set; }
+
+
+
         public event Action<string> actionOfAnimationEnd;
         private List<AnimationContainer> animations;
         private List<Texture2D> textures;