fix Content.mgcb

DangerousD/Content/Content.mgcb

@@ -17,7 +17,6 @@
 #begin ButtonFont.spritefont
 /importer:FontDescriptionImporter
 /processor:FontDescriptionProcessor
-<<<<<<< HEAD
 /processorParam:PremultiplyAlpha=True
 /processorParam:TextureFormat=Compressed
 /build:ButtonFont.spritefont
@@ -57,11 +56,9 @@
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:checkboxs_on.png
-=======
 /processorParam:PremultiplyAlpha=True
 /processorParam:TextureFormat=Compressed
 /build:ButtonFont.spritefont
->>>>>>> Diamond
 
 #begin deathAnimation.png
 /importer:TextureImporter
@@ -75,7 +72,6 @@
 /processorParam:TextureFormat=Color
 /build:deathAnimation.png
 
-<<<<<<< HEAD
 #begin deathBackground.jpg
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -88,9 +84,6 @@
 /processorParam:TextureFormat=Color
 /build:deathBackground.jpg
 
-
-=======
->>>>>>> Diamond
 #begin DoomTestSong.mp3
 /importer:Mp3Importer
 /processor:SoundEffectProcessor
@@ -150,7 +143,6 @@
 /build:menuFon.jpg
 
 #begin MenuFon2.jpg
-<<<<<<< HEAD
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -175,8 +167,6 @@
 /build:menuFon3.jpg
 
 #begin MonstersAnimations.png
-=======
->>>>>>> Diamond
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -186,15 +176,12 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-<<<<<<< HEAD
 /build:MonstersAnimations.png
 
 #begin optionsBackground.jpg
-=======
 /build:MenuFon2.jpg
 
 #begin menuFon3.jpg
->>>>>>> Diamond
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -204,15 +191,12 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-<<<<<<< HEAD
 /build:optionsBackground.jpg
 
 #begin PC_Computer_Dangerous_Dave_In_The_Haunted_Mansion_Death_Sequences.png
-=======
 /build:menuFon3.jpg
 
 #begin MonstersAnimations.png
->>>>>>> Diamond
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -222,15 +206,12 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-<<<<<<< HEAD
 /build:PC_Computer_Dangerous_Dave_In_The_Haunted_Mansion_Death_Sequences.png
 
 #begin playerAnimation.png
-=======
 /build:MonstersAnimations.png
 
 #begin spriteDiamond.png
->>>>>>> Diamond
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -240,7 +221,6 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-<<<<<<< HEAD
 /build:playerAnimation.png
 
 #begin slider.png
@@ -338,9 +318,7 @@
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:textboxbackground6-1.png
-=======
 /build:spriteDiamond.png
->>>>>>> Diamond
 
 #begin tiles.png
 /importer:TextureImporter

DangerousD/GameCore/GameObjects/Entities/Door.cs

@@ -46,6 +46,7 @@ namespace DangerousD.GameCore.GameObjects.Entities
                     {
                         AppManager.Instance.GameManager.Remove(this);
                         //тут спавн лута
+                        Diamond diamonds = new Diamond(new Vector2((int)Pos.X, (int)Pos.Y));
                     }
                 }
             }

DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs

@@ -32,7 +32,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         public bool isUping = false;
         public bool isNetworkPlayer;
         private int shootLength = 160;
-
+        public int score = 0;