diff --git a/DangerousD/GameCore/GameObjects/Entities/Door.cs b/DangerousD/GameCore/GameObjects/Entities/Door.cs index 0e21692..bd823d5 100644 --- a/DangerousD/GameCore/GameObjects/Entities/Door.cs +++ b/DangerousD/GameCore/GameObjects/Entities/Door.cs @@ -29,7 +29,8 @@ namespace DangerousD.GameCore.GameObjects.Entities Player player = (Player)gameObject; if (player.isUping) { - + AppManager.Instance.GameManager.Remove(this); + //тут спавн лута } } } diff --git a/DangerousD/GameCore/Graphics/GraphicsComponent.cs b/DangerousD/GameCore/Graphics/GraphicsComponent.cs index 00d6298..5a659c8 100644 --- a/DangerousD/GameCore/Graphics/GraphicsComponent.cs +++ b/DangerousD/GameCore/Graphics/GraphicsComponent.cs @@ -237,23 +237,25 @@ namespace DangerousD.GameCore.Graphics public static void SetCameraPosition(Vector2 playerPosition) { CameraPosition = (playerPosition).ToPoint(); - CameraPosition.X -= 300; - CameraPosition.Y -= 200; - if (CameraPosition.X < AppManager.Instance.GameManager.CameraBorder.X) - { - CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.X; - } + CameraPosition.X -= 200; + CameraPosition.Y -= 120; + if (CameraPosition.X > AppManager.Instance.GameManager.CameraBorder.Y - 460) { CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.Y - 460; } + if (CameraPosition.Y < AppManager.Instance.GameManager.CameraBorder.Z) { CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.Z; } - if (CameraPosition.Y > AppManager.Instance.GameManager.CameraBorder.W - 470) + if (CameraPosition.X < AppManager.Instance.GameManager.CameraBorder.X) { - CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.W - 470; + CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.X; + } + if (CameraPosition.Y > AppManager.Instance.GameManager.CameraBorder.W - 240) + { + CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.W - 240; } AppManager.Instance.DebugHUD.Set("CameraPosition", $"{CameraPosition.X}, {CameraPosition.Y}"); } diff --git a/DangerousD/GameCore/Managers/GameManager.cs b/DangerousD/GameCore/Managers/GameManager.cs index 53ffa61..d7ed9ab 100644 --- a/DangerousD/GameCore/Managers/GameManager.cs +++ b/DangerousD/GameCore/Managers/GameManager.cs @@ -177,11 +177,11 @@ namespace DangerousD.GameCore } if (item.Pos.Y < CameraBorder.Z) { - CameraBorder.Z = item.Pos.X; + CameraBorder.Z = item.Pos.Y; } if (item.Pos.Y > CameraBorder.W) { - CameraBorder.W = item.Pos.X; + CameraBorder.W = item.Pos.Y; } } }