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

sounds

Browse source
This commit is contained in:
SergoDobro 2023-08-18 20:25:42 +03:00
parent 9d2ff11d50
commit 9a044746d8
8 changed files with 52 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
DangerousD/Content/Content.mgcb
View file

@ -21,18 +21,6 @@
/processorParam:TextureFormat=Compressed
/build:ButtonFont.spritefont
#begin checkboxs_off-on.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:checkboxs_off-on.png
#begin checkboxs_off.png
/importer:TextureImporter
/processor:TextureProcessor
@ -45,6 +33,18 @@
/processorParam:TextureFormat=Color
/build:checkboxs_off.png
#begin checkboxs_off-on.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:checkboxs_off-on.png
#begin checkboxs_on.png
/importer:TextureImporter
/processor:TextureProcessor
@ -157,7 +157,7 @@
/processorParam:TextureFormat=Color
/build:menuFon.jpg
#begin menuFon2.jpg
#begin MenuFon2.jpg
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
@ -167,7 +167,7 @@
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:menuFon2.jpg
/build:MenuFon2.jpg
#begin menuFon3.jpg
/importer:TextureImporter
@ -260,8 +260,7 @@
/processorParam:TextureFormat=Color
/build:sliderBackground.png
#begin smokeAnimation2.png
#begin SmokeAnimation2.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
@ -271,31 +270,7 @@
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:smokeAnimation2.png
#begin sounds/DoomTestSong.mp3
/importer:Mp3Importer
/processor:SoundEffectProcessor
/processorParam:Quality=Best
/build:sounds/DoomTestSong.mp3
#begin sounds/shotgun_shot.mp3
/importer:Mp3Importer
/processor:SoundEffectProcessor
/processorParam:Quality=Best
/build:sounds/shotgun_shot.mp3
#begin textboxbackground1-1.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:textboxbackground1-1.png
/build:SmokeAnimation2.png
#begin sounds/collected_coins.mp3
/importer:Mp3Importer
@ -309,12 +284,24 @@
/processorParam:Quality=Best
/build:sounds/DoomTestSong.mp3
#begin sounds/reloading.mp3
/importer:Mp3Importer
/processor:SoundEffectProcessor
/processorParam:Quality=Best
/build:sounds/reloading.mp3
#begin sounds/shotgun_shot.mp3
/importer:Mp3Importer
/processor:SoundEffectProcessor
/processorParam:Quality=Best
/build:sounds/shotgun_shot.mp3
#begin sounds/StartGame.mp3
/importer:Mp3Importer
/processor:SoundEffectProcessor
/processorParam:Quality=Best
/build:sounds/StartGame.mp3
#begin sounds/z1.mp3
/importer:Mp3Importer
/processor:SoundEffectProcessor
@ -327,7 +314,7 @@
/processorParam:Quality=Best
/build:sounds/z3.mp3
#begin textboxbackground2-1.png
#begin textboxbackground1-1.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
@ -337,7 +324,7 @@
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:textboxbackground2-1.png
/build:textboxbackground1-1.png
#begin textboxbackground2,5-1.png
/importer:TextureImporter
@ -351,6 +338,18 @@
/processorParam:TextureFormat=Color
/build:textboxbackground2,5-1.png
#begin textboxbackground2-1.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:textboxbackground2-1.png
#begin textboxbackground6-1.png
/importer:TextureImporter
/processor:TextureProcessor

BIN
DangerousD/Content/sounds/StartGame.mp3 Normal file
View file

Binary file not shown.

BIN
DangerousD/Content/sounds/reloading.mp3 Normal file
View file

Binary file not shown.

3
DangerousD/GameCore/GUI/DeathGUI.cs
View file

@ -9,6 +9,7 @@ namespace DangerousD.GameCore.GUI;
internal class DeathGUI : AbstractGui
{
protected override void CreateUI()
{
int wigth = AppManager.Instance.inGameResolution.X;
@ -23,6 +24,7 @@ internal class DeathGUI : AbstractGui
Elements.Add(butMenu);
butMenu.LeftButtonPressed += () =>
{
AppManager.Instance.SoundManager.StartSound("reloading", Vector2.Zero, Vector2.Zero);
AppManager.Instance.Restart("lvl");
};
foreach (var item in Elements)
@ -40,6 +42,7 @@ internal class DeathGUI : AbstractGui
public override void Update(GameTime gameTime)
{
(Elements[2] as DrawableTextedUiElement).text = $"Score: {AppManager.Instance.GameManager.GetPlayer1.score}";
base.Update(gameTime);
}
}

4
DangerousD/GameCore/GUI/MenuGUI.cs
View file

@ -49,6 +49,7 @@ internal class MenuGUI : AbstractGui
Elements.Add(butSingle);
butSingle.LeftButtonPressed += () =>
{
AppManager.Instance.SoundManager.StartSound("StartGame", Vector2.Zero, Vector2.Zero);
AppManager.Instance.ChangeGameState(GameState.Game);
AppManager.Instance.SetMultiplayerState(MultiPlayerStatus.SinglePlayer);
@ -59,6 +60,7 @@ internal class MenuGUI : AbstractGui
Elements.Add(butMulti);
butMulti.LeftButtonPressed += () =>
{
AppManager.Instance.SoundManager.StartSound("reloading", Vector2.Zero, Vector2.Zero);
AppManager.Instance.ChangeGameState(GameState.Login);
};
var butOption = new ButtonText(Manager) { rectangle = new Rectangle((wigth - (int)(160 * 2.4)) / 2, 590, (int)(160 * 2.4), (int)(50 * 2.4)), text = "Option", scale = 1.2f, fontName = "ButtonFont" };
@ -66,12 +68,14 @@ internal class MenuGUI : AbstractGui
butOption.LeftButtonPressed += () =>
{
// открытие настроек
AppManager.Instance.SoundManager.StartSound("reloading", Vector2.Zero, Vector2.Zero);
AppManager.Instance.ChangeGameState(GameState.Options);
};
var butExit = new ButtonText(Manager) { rectangle = new Rectangle((wigth - (int)(110 * 2.4)) / 2, 710, (int)(110 * 2.4), (int)(50 * 2.4)), text = "Exit", scale = 1.2f, fontName = "ButtonFont" };
Elements.Add(butExit);
butExit.LeftButtonPressed += () =>
{
AppManager.Instance.SoundManager.StartSound("reloading", Vector2.Zero, Vector2.Zero);
AppManager.Instance.Exit();
};

2
DangerousD/GameCore/GameObjects/Entities/Items/Diamond.cs
View file

@ -24,7 +24,7 @@ public class Diamond : Entity
if (gameObject is Player)
{
AppManager.Instance.GameManager.Remove(this);
new ScoreText(Pos, ScoreText.scores[random.Next(0, ScoreText.scores.Length-1)]);
new ScoreText(Pos, ScoreText.scores[random.Next(0, ScoreText.scores.Length)]);
AppManager.Instance.SoundManager.StartSound("collected_coins", Pos, Pos);
}
base.OnCollision(gameObject);

1
DangerousD/GameCore/GameObjects/Entities/Items/ScoreText.cs
View file

@ -17,6 +17,7 @@ namespace DangerousD.GameCore.GameObjects.Entities.Items
Width = 32;
Height = 32;
GraphicsComponent.StartAnimation("score"+ score);
AppManager.Instance.GameManager.GetPlayer1.score += score;
GraphicsComponent.actionOfAnimationEnd += (a) => { AppManager.Instance.GameManager.Remove(this); };
}
public override void Initialize()

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

@ -300,6 +300,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
if (GraphicsComponent.GetCurrentAnimation != "playerReload")
{
GraphicsComponent.StartAnimation("playerReload");
AppManager.Instance.SoundManager.StartSound("reloading", Pos,Pos);
}
}
else