diff --git a/ZoFo/GameCore/GameObjects/Bullet.cs b/ZoFo/GameCore/GameObjects/Bullet.cs index 46520c4..4e2197d 100644 --- a/ZoFo/GameCore/GameObjects/Bullet.cs +++ b/ZoFo/GameCore/GameObjects/Bullet.cs @@ -1,7 +1,6 @@ using System; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class Bullet : Projectile { diff --git a/ZoFo/GameCore/GameObjects/Collectable.cs b/ZoFo/GameCore/GameObjects/Collectable.cs index 77af5a4..7a32b43 100644 --- a/ZoFo/GameCore/GameObjects/Collectable.cs +++ b/ZoFo/GameCore/GameObjects/Collectable.cs @@ -1,7 +1,6 @@ using System; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class Collectable : Entity { diff --git a/ZoFo/GameCore/GameObjects/Enemy.cs b/ZoFo/GameCore/GameObjects/Enemy.cs index cfae853..934da77 100644 --- a/ZoFo/GameCore/GameObjects/Enemy.cs +++ b/ZoFo/GameCore/GameObjects/Enemy.cs @@ -1,8 +1,11 @@ using System; +using System.Collections.Generic; +using System.Net.Mime; +using System.Reflection; +using Microsoft.Xna.Framework.Content; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class Enemy : LivingEntity { -} +} \ No newline at end of file diff --git a/ZoFo/GameCore/GameObjects/Entity.cs b/ZoFo/GameCore/GameObjects/Entity.cs index 03124ac..936b18d 100644 --- a/ZoFo/GameCore/GameObjects/Entity.cs +++ b/ZoFo/GameCore/GameObjects/Entity.cs @@ -1,8 +1,28 @@ using System; +using ZoFo.GameCore.GameObjects; -namespace ZoFo; - -public class Entity +namespace ZoFo.GameCore.GameObjects; +public class Entity : GameObject { + public int Id{ get; set; } + //public CollisionComponent collisionComponents{ get; set; } + //public AnimationComponent animationComponent{ get; set; } + // в апдейте может заявляет изменения позиции + public void UpdateLogic() + { + + } + + + + // Методы для клиента + public void UpdateAnimation() + { + + } + public void Draw(ContentManager manager) + { + + } } diff --git a/ZoFo/GameCore/GameObjects/LivingEntity.cs b/ZoFo/GameCore/GameObjects/LivingEntity.cs index 92f1b1c..44270fa 100644 --- a/ZoFo/GameCore/GameObjects/LivingEntity.cs +++ b/ZoFo/GameCore/GameObjects/LivingEntity.cs @@ -1,7 +1,6 @@ using System; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class LivingEntity : Entity { diff --git a/ZoFo/GameCore/GameObjects/Player.cs b/ZoFo/GameCore/GameObjects/Player.cs index 1842b56..5a033e3 100644 --- a/ZoFo/GameCore/GameObjects/Player.cs +++ b/ZoFo/GameCore/GameObjects/Player.cs @@ -1,7 +1,6 @@ using System; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class Player : LivingEntity { diff --git a/ZoFo/GameCore/GameObjects/Projectile.cs b/ZoFo/GameCore/GameObjects/Projectile.cs index 4760e92..80cbf5a 100644 --- a/ZoFo/GameCore/GameObjects/Projectile.cs +++ b/ZoFo/GameCore/GameObjects/Projectile.cs @@ -1,7 +1,6 @@ using System; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class Projectile : LivingEntity { diff --git a/ZoFo/GameCore/GameObjects/Rock.cs b/ZoFo/GameCore/GameObjects/Rock.cs index aa60b17..1ff7a29 100644 --- a/ZoFo/GameCore/GameObjects/Rock.cs +++ b/ZoFo/GameCore/GameObjects/Rock.cs @@ -1,7 +1,6 @@ using System; -namespace ZoFo; - +namespace ZoFo.GameCore.GameObjects; public class Rock : Projectile {