Merge branch 'dev/1201-HJ_Monsters'

NPBruce · Aug 29, 2019 · 398ba5e · 398ba5e
2 parents c1acfed + c4be9d9
commit 398ba5e
Show file tree

Hide file tree

Showing 6 changed files with 922 additions and 3 deletions.
diff --git a/unity/Assets/Plugins/Android/fabric/res/values/strings.xml b/unity/Assets/Plugins/Android/fabric/res/values/strings.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id">81939fe6-b82f-40dd-a388-96d41f91f32d</string></resources>
+<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id">d3870e42-5443-4d07-b74d-394c960cd24a</string></resources>
diff --git a/unity/Assets/Resources/version.txt b/unity/Assets/Resources/version.txt
@@ -1 +1 @@
-2.4.04
+2.4.06
diff --git a/unity/Assets/Scripts/Content/QuestData.cs b/unity/Assets/Scripts/Content/QuestData.cs
@@ -1899,7 +1899,7 @@ public class Quest
     {
         public static int minumumFormat = 4;
         // Increment during changes, and again at release
-        public static int currentFormat = 11;
+        public static int currentFormat = 12;
         public int format = 0;
         public bool hidden = false;
         public bool valid = false;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id">81939fe6-b82f-40dd-a388-96d41f91f32d</string></resources>
		<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id">d3870e42-5443-4d07-b74d-394c960cd24a</string></resources>