Merge branch 'Development' into ServerBranch2

AnimationsFileCreator/Program.cs

@@ -22,7 +22,8 @@ namespace AnimationsFileCreator
             {
                 
                 DialogResult result = Dialog.FileOpen();
-                textureName = result.Path.Split('\\').Last();
+                var temp = result.Path.Split('\\');
+                textureName = temp[temp.Length-2] + "/"+temp[temp.Length - 1];
                 textureName = textureName.Split('.')[0];
             }
             Console.WriteLine("Введите количество кадров анимации: ");
@@ -60,11 +61,11 @@ namespace AnimationsFileCreator
             container.FrameTime = new System.Collections.Generic.List<Tuple<int, int>>();
             container.FrameTime.Add(new Tuple<int, int>(0, interval));
             container.StartSpriteRectangle = rectangle;
-            container.TextureName = textureName;
-            container.TextureFrameInterval = 1;
+            container.TextureName = "Textures/AnimationTextures/"+textureName;
+            container.TextureFrameInterval = 0;
             container.Id = id;
             string json = JsonConvert.SerializeObject(container);
-            StreamWriter writer = new StreamWriter("../../../../ZoFo/Content/animations/"+id);
+            StreamWriter writer = new StreamWriter("../../../../ZoFo/Content/Textures/Animations/"+id+ ".animation");
             writer.WriteLine(json);
             writer.Close();
         }

MonogameLibrary/UI/Elements/CheckBox.cs

@@ -53,9 +53,9 @@ namespace MonogameLibrary.UI.Elements
 
         public override void LoadTexture(ContentManager content)
         {
-            texture1 = content.Load<Texture2D>("Textures\\GUI\\checkboxs_off");
-            texture2 = content.Load<Texture2D>("Textures\\GUI\\checkboxs_off-on");
-            texture3 = content.Load<Texture2D>("Textures\\GUI\\checkboxs_on");
+            texture1 = content.Load<Texture2D>("Textures/GUI/checkboxs_off");
+            texture2 = content.Load<Texture2D>("Textures/GUI/checkboxs_off-on");
+            texture3 = content.Load<Texture2D>("Textures/GUI/checkboxs_on");
             base.LoadTexture(content);
         }
         public override void Draw(SpriteBatch _spriteBatch)

MonogameLibrary/UI/Elements/Slider.cs

@@ -21,6 +21,9 @@ namespace MonogameLibrary.UI.Elements
         public int indentation = 5;
 
         Texture2D texture2; 
+        /// <summary>
+        /// ректенгл ползунка
+        /// </summary>
         public Rectangle sliderRect = new Rectangle(0, 0, 40, 40);
         private float sliderValue = 0;
         private float minValue = 0, maxValue = 1;
@@ -56,7 +59,7 @@ namespace MonogameLibrary.UI.Elements
 
         public override void LoadTexture(ContentManager content)
         {
-            texture2 = content.Load<Texture2D>("Textures\\GUI\\switch");
+            texture2 = content.Load<Texture2D>("Textures/GUI/switch");
             base.LoadTexture(content);
         }
 

ZoFo/Content/Content.mgcb

@@ -91,6 +91,90 @@
 /processorParam:Quality=Best
 /build:sounds/Zombi stoit.wav
 
+#begin Textures/AnimationTextures/Character/hr-level1_idle_gun.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:Textures/AnimationTextures/Character/hr-level1_idle_gun.png
+
+#begin Textures/AnimationTextures/Character/hr-level1_idle.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:Textures/AnimationTextures/Character/hr-level1_idle.png
+
+#begin Textures/AnimationTextures/Character/hr-level1_mining_tool-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:Textures/AnimationTextures/Character/hr-level1_mining_tool-1.png
+
+#begin Textures/AnimationTextures/Character/hr-level1_mining_tool-2.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:Textures/AnimationTextures/Character/hr-level1_mining_tool-2.png
+
+#begin Textures/AnimationTextures/Character/hr-level1_running_gun.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:Textures/AnimationTextures/Character/hr-level1_running_gun.png
+
+#begin Textures/AnimationTextures/Character/hr-level1_running.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:Textures/AnimationTextures/Character/hr-level1_running.png
+
+#begin Textures/AnimationTextures/unicorn.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:Textures/AnimationTextures/unicorn.png
+
 #begin Textures/GUI/background/base.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -103,6 +187,18 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/background/base.png
 
+#begin Textures/GUI/background/endGame.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:Textures/GUI/background/endGame.png
+
 #begin Textures/GUI/background/join.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -115,6 +211,30 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/background/join.png
 
+#begin Textures/GUI/background/mainMenu.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:Textures/GUI/background/mainMenu.png
+
+#begin Textures/GUI/background/options.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:Textures/GUI/background/options.png
+
 #begin Textures/GUI/background/selectMode.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -139,18 +259,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/background/waiting.png
 
-#begin Textures/GUI/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:Textures/GUI/checkboxs_off-on.png
-
 #begin Textures/GUI/checkboxs_off.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -163,6 +271,18 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/checkboxs_off.png
 
+#begin Textures/GUI/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:Textures/GUI/checkboxs_off-on.png
+
 #begin Textures/GUI/checkboxs_on.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -199,18 +319,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/mouse.png
 
-#begin Textures/GUI/Switch_backgrownd.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:Textures/GUI/Switch_backgrownd.png
-
 #begin Textures/GUI/switch.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -223,7 +331,7 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/switch.png
 
-#begin Textures/TileSets/TilesetFloor.png
+#begin Textures/GUI/Switch_backgrownd.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -233,5 +341,17 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-/build:Textures/TileSets/TilesetFloor.png;Textures/TileSets/TileSet 1.png
+/build:Textures/GUI/Switch_backgrownd.png
+
+#begin Textures/TileSetImages/TilesetFloor.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:Textures/TileSetImages/TilesetFloor.png
 

ZoFo/Content/MapData/MapSession.tiled-project

@@ -0,0 +1,14 @@
+{
+    "automappingRulesFile": "",
+    "commands": [
+    ],
+    "compatibilityVersion": 1100,
+    "extensionsPath": "extensions",
+    "folders": [
+        "."
+    ],
+    "properties": [
+    ],
+    "propertyTypes": [
+    ]
+}

ZoFo/Content/MapData/MapSession.tiled-session

@@ -0,0 +1,49 @@
+{
+    "Map/SizeTest": {
+        "height": 4300,
+        "width": 2
+    },
+    "activeFile": "TileSets/TileSet 1.tsj",
+    "expandedProjectPaths": [
+        "TileMaps",
+        ".",
+        "TileSets"
+    ],
+    "fileStates": {
+        "TileMaps/TileSets/TileSet 1.tsj": {
+            "scaleInDock": 1
+        },
+        "TileMaps/main.tmj": {
+            "scale": 1,
+            "selectedLayer": 0,
+            "viewCenter": {
+                "x": 534.5,
+                "y": 441
+            }
+        },
+        "TileSets/TileSet 1.tsj": {
+            "scaleInDock": 1,
+            "scaleInEditor": 3
+        }
+    },
+    "last.externalTilesetPath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/TileSets",
+    "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/TileSet",
+    "map.fixedSize": false,
+    "map.lastUsedFormat": "json",
+    "map.tileHeight": 16,
+    "map.tileWidth": 16,
+    "openFiles": [
+        "TileMaps/main.tmj",
+        "TileSets/TileSet 1.tsj"
+    ],
+    "project": "MapSession.tiled-project",
+    "recentFiles": [
+        "TileMaps/main.tmj",
+        "TileSets/TileSet 1.tsj"
+    ],
+    "tileset.lastUsedFormat": "json",
+    "tileset.tileSize": {
+        "height": 16,
+        "width": 16
+    }
+}

ZoFo/Content/MapData/TileSets/TileSet 1.tsj

@@ -1,20 +1,22 @@
 { "class":"Tile",
  "columns":22,
+ "fillmode":"preserve-aspect-fit",
  "grid":
     {
      "height":24,
      "orientation":"orthogonal",
      "width":24
     },
- "image":"..\/..\/..\/..\/Content\/Textures\/Background\/TilesetFloor.png",
- "imageheight":417,
- "imagewidth":352,
+ "image":"..\/..\/Textures\/TileSet\/TilesetFloor.png",
+ "imageheight":832,
+ "imagewidth":704,
  "margin":0,
  "name":"TileSet 1",
+ "objectalignment":"topleft",
  "spacing":0,
  "tilecount":572,
  "tiledversion":"1.10.2",
- "tileheight":16,
+ "tileheight":32,
  "tiles":[
         {
          "id":27,
@@ -52,7 +54,7 @@
          "id":112,
          "probability":0.100000001490116
         }],
- "tilewidth":16,
+ "tilewidth":32,
  "type":"tileset",
  "version":"1.10",
  "wangsets":[

ZoFo/Content/MapData/TileSets/WallSet.tsj

@@ -0,0 +1,21 @@
+{ "class":"StopObject",
+ "columns":5,
+ "grid":
+    {
+     "height":16,
+     "orientation":"orthogonal",
+     "width":16
+    },
+ "image":"..\/..\/Textures\/StopObjects\/Tilelist2.png",
+ "imageheight":1302,
+ "imagewidth":652,
+ "margin":2,
+ "name":"WallSet",
+ "spacing":2,
+ "tilecount":3240,
+ "tiledversion":"1.10.2",
+ "tileheight":128,
+ "tilewidth":128,
+ "type":"tileset",
+ "version":"1.10"
+}

ZoFo/Content/MapData/TileSets/WallSet.tsx

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="WallSet" tilewidth="128" tileheight="128" spacing="2" margin="2" tilecount="3240" columns="5">
+ <grid orientation="orthogonal" width="16" height="16"/>
+ <image source="../../Textures/StopObjects/Tilelist2.png" width="652" height="1302"/>
+</tileset>

ZoFo/Content/Textures/Animations/player_idle_top-right_noweapon.animation

@@ -0,0 +1,20 @@
+{
+  "id": "player_idle_top-right_noweapon",
+  "textureName": "Textures/AnimationTextures/Character/hr-level1_idle",
+  "startSpriteRectangle": {
+    "X": 0,
+    "Y": 116,
+    "Width": 92,
+    "Height": 116
+  },
+  "frameSecond": [
+    {
+      "Item1": 0,
+      "Item2": 5
+    }
+  ],
+  "textureFrameInterval": 0,
+  "framesCount": 22,
+  "isCycle": true,
+  "offset": "0, 0"
+}

ZoFo/Content/Textures/Animations/player_idle_top_noweapon.animation

@@ -0,0 +1,20 @@
+{
+  "id": "player_idle_top_noweapon",
+  "textureName": "Textures/AnimationTextures/Character/hr-level1_idle",
+  "startSpriteRectangle": {
+    "X": 0,
+    "Y": 0,
+    "Width": 92,
+    "Height": 116
+  },
+  "frameSecond": [
+    {
+      "Item1": 0,
+      "Item2": 5
+    }
+  ],
+  "textureFrameInterval": 0,
+  "framesCount": 22,
+  "isCycle": true,
+  "offset": "0, 0"
+}

ZoFo/Content/Textures/Animations/running_top.animation

@@ -0,0 +1,20 @@
+{
+  "id": "running_top",
+  "textureName": "unicorn",
+  "startSpriteRectangle": {
+    "X": 0,
+    "Y": 30,
+    "Width": 30,
+    "Height": 60
+  },
+  "frameSecond": [
+    {
+      "Item1": 0,
+      "Item2": 2
+    }
+  ],
+  "textureFrameInterval": 1,
+  "framesCount": 22,
+  "isCycle": true,
+  "offset": "0, 0"
+}

ZoFo/Content/Textures/Animations/testAnimationExample.animation

@@ -0,0 +1 @@
+{"id":"testAnimationExample","textureName":"Textures/AnimationTextures/unicorn","startSpriteRectangle":{"X":0,"Y":0,"Width":400,"Height":400},"frameSecond":[{"Item1":0,"Item2":1}],"textureFrameInterval":1,"framesCount":1,"isCycle":true,"offset":"0, 0"}