progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into livingEntitiesVlad

Browse source
This commit is contained in:
N4K 2023-08-17 11:12:57 +03:00
commit 0ad20e3638
4 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
View file

@ -16,6 +16,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
{
Width = 32;
Height = 64;
/*GraphicsComponent.actionOfAnimationEnd += () =>
{
AppManager.Instance.ChangeGameState(GameState.GameOver);
};*/
}
public bool IsAlive { get { return isAlive; } }
@ -31,6 +35,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
if(monsterName == "Zombie")
{
DeathRectangle deathRectangle = new DeathRectangle(Pos, "DeathFrom" + monsterName);
//GraphicsComponent.actionOfAnimationEnd();
}
isAlive = false;
}

11
DangerousD/GameCore/Graphics/GraphicsComponent.cs
View file

@ -8,9 +8,10 @@ using System.Text;
namespace DangerousD.GameCore.Graphics
{
public class GraphicsComponent
{
//public Action actionOfAnimationEnd;
public Action<string> actionOfAnimationEnd;
private List<AnimationContainer> animations;
private List<Texture2D> textures;
private List<string> texturesNames;
@ -115,8 +116,12 @@ namespace DangerousD.GameCore.Graphics
{
if (!currentAnimation.IsCycle)
{
if(actionOfAnimationEnd != null)
{
actionOfAnimationEnd(currentAnimation.Id);
}
currentAnimation = neitralAnimation;
//actionOfAnimationEnd();
}
currentFrame = 0;
@ -199,4 +204,4 @@ namespace DangerousD.GameCore.Graphics
}
}
}
}
}

2
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -13,7 +13,7 @@ using DangerousD.GameCore.Managers;
namespace DangerousD.GameCore
{
public enum GameState { Menu, Options, Lobby, Game, Login }
public enum GameState { Menu, Options, Lobby, Game, Login, GameOver }
public class AppManager : Game
{
public static AppManager Instance { get; private set; }

25
DangerousD/GameCore/Managers/SettingsManager.cs
View file

@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using Newtonsoft.Json.Serialization;
namespace DangerousD.GameCore.Managers
{
@ -21,10 +22,12 @@ namespace DangerousD.GameCore.Managers
public void SetResolution(Point resolution)
{
settingsContainer.Resolution = resolution;
AppManager.Instance.resolution = resolution;
}
public void SetMainVolume(float volume)
{
settingsContainer.MainVolume = MainVolume;
///AppManager.Instance.SoundManager.
}
public void SetMusicVolume(float volume)
@ -45,22 +48,30 @@ namespace DangerousD.GameCore.Managers
{
if (!File.Exists("GameSettings.txt"))
{
File.Create("GameSettings.txt");
SaveSettings();
return;
}
var serializedObject = JsonConvert.DeserializeObject<SettingsContainer>(File.ReadAllText("GameSettings.txt"));
settingsContainer = JsonConvert.DeserializeObject<SettingsContainer>(File.ReadAllText("GameSettings.txt"));
SetIsFullScreen(settingsContainer.IsFullScreen);
SetMainVolume(settingsContainer.MainVolume);
SetMusicVolume(settingsContainer.MusicVolume);
SetResolution(settingsContainer.Resolution);
SetSoundEffectsVolume(settingsContainer.SoundEffectsVolume);
}
public void SaveSettings()
{
if (!File.Exists("GameSettings.txt"))
File.Create("GameSettings.txt");
File.WriteAllText("GameSettings.txt", JsonConvert.SerializeObject(settingsContainer));
using (StreamWriter streamWriter = new StreamWriter("GameSettings.txt"))
{
string _str = JsonConvert.SerializeObject(settingsContainer);
streamWriter.Write(_str);
}
}
}
[Serializable]
public class SettingsContainer
{
[JsonProperty("IsFullScreen")]