Merge pull request #500 from kreghek/master

Подготовка релиза на GameDev Irkutsk

Zilon.Client/Assets/Editor/AutoSaveOnRunMenuItem.cs

@@ -0,0 +1,52 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+
+[InitializeOnLoad]
+public class AutoSaveOnRunMenuItem
+{
+    public const string MenuName = "Tools/Autosave On Run";
+    private static bool isToggled;
+
+    static AutoSaveOnRunMenuItem()
+    {
+        EditorApplication.delayCall += () =>
+        {
+            isToggled = EditorPrefs.GetBool(MenuName, false);
+            UnityEditor.Menu.SetChecked(MenuName, isToggled);
+            SetMode();
+        };
+    }
+
+    [MenuItem(MenuName)]
+    private static void ToggleMode()
+    {
+        isToggled = !isToggled;
+        UnityEditor.Menu.SetChecked(MenuName, isToggled);
+        EditorPrefs.SetBool(MenuName, isToggled);
+        SetMode();
+    }
+
+    private static void SetMode()
+    {
+        if (isToggled)
+        {
+            EditorApplication.playModeStateChanged += AutoSaveOnRun;
+        }
+        else
+        {
+            EditorApplication.playModeStateChanged -= AutoSaveOnRun;
+        }
+    }
+
+    private static void AutoSaveOnRun(PlayModeStateChange state)
+    {
+        if (EditorApplication.isPlayingOrWillChangePlaymode && !EditorApplication.isPlaying)
+        {
+            Debug.Log("Auto-Saving before entering Play mode");
+
+            EditorSceneManager.SaveOpenScenes();
+            AssetDatabase.SaveAssets();
+        }
+    }
+}

Zilon.Client/Assets/Resources/Schemes/DropTables/default.json

@@ -104,6 +104,11 @@
 			]
 		}
 	  ]
+    },
+	{
+      "SchemeSid": "knitted-hat",
+
+      "Weight": 10
     },
 	{
       "SchemeSid": "leather-helmet",

Zilon.Client/Assets/Resources/Schemes/DropTables/person-creation/start-heads.json

@@ -3,11 +3,19 @@
   "Records": [
     {
       "SchemeSid": "steel-helmet",
-      "Weight": 10
+      "Weight": 5
     },
 	{
       "SchemeSid": "leather-helmet",
       "Weight": 10
+    },
+	{
+      "SchemeSid": "closed-leather-helmet",
+      "Weight": 5
+    },
+	{
+      "SchemeSid": "knitted-hat",
+      "Weight": 10
     },
 	{
       "SchemeSid": "wizard-hat",

Zilon.Client/Assets/Resources/Schemes/DropTables/survival.json

@@ -39,7 +39,7 @@
     },
     {
       "SchemeSid": null,
-      "Weight": 300
+      "Weight": 600
     }
   ]
 }

Zilon.Client/Assets/Resources/Schemes/Locations/rat-kingdom.json

@@ -27,24 +27,24 @@
 		{
 			"Sid": "lvl2",
 			"Name":{
-				"En": "Rat Kingdom Suare"
+				"En": "Rat Kingdom Square"
 			},
 
 			"RegularMonsterSids": ["rat", "bat"],
 			"RareMonsterSids": ["rat-mutant", "moon-rat"],
-			"ChampionMonsterSids": null,
+			"ChampionMonsterSids": ["rat-human-slayer", "night-stalker"],
 			"RegionCount": 10,
 			"RegionSize": 5,
 			"RegionMonsterCount": 5,
 
-			"TransSectorSids": ["lvl3", "lvl-barracks"],
+			"TransSectorSids": ["lvl-throne", "lvl-barracks"],
 
 			"TotalChestCount": 20,
 			"RegionChestCountRatio": 9,
 			"ChestDropTableSids": ["survival", "default"]
 		},
 		{
-			"Sid": "lvl3",
+			"Sid": "lvl-throne",
 			"Name":{
 				"En": "Rat Kingdom Throne"
 			},
@@ -77,7 +77,7 @@
 			"RegionChestCountRatio": 9,
 			"ChestDropTableSids": ["survival", "default"],
 
-			"TransSectorSids": ["lvl3", "lvl-barracks"]
+			"TransSectorSids": ["lvl-throne", "lvl-barracks"]
 		}
 	]
 }