upoad ver 0.20.2

Nashet · May 14, 2018 · 49575b7 · 49575b7
1 parent 530ea0d
commit 49575b7
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 16 deletions.
diff --git a/Assets/EconomicSimulation/ES-base.unity b/Assets/EconomicSimulation/ES-base.unity
diff --git a/Assets/EconomicSimulation/Resources/Prefabs/3DCountryNameText.prefab b/Assets/EconomicSimulation/Resources/Prefabs/3DCountryNameText.prefab
diff --git a/Assets/EconomicSimulation/Scripts/Logic/Game.cs b/Assets/EconomicSimulation/Scripts/Logic/Game.cs
@@ -13,7 +13,7 @@ namespace Nashet.EconomicSimulation
     /// </summary>
     public class Game : ThreadedJob
     {
-        public static bool devMode = true;
+        public static bool devMode = false;
         public static bool logInvestments = false;
         public static bool logMarket = false;
 

diff --git a/Assets/EconomicSimulation/Scripts/Logic/Province.cs b/Assets/EconomicSimulation/Scripts/Logic/Province.cs
@@ -777,7 +777,7 @@ internal void setLabel()
             lods[0] = new LOD(0.25F, renderers);
 
             var position = getPosition(); 
-            position.z -= 0.001f;
+            position.z -= 0.003f;
             txtMeshTransform.position = position;            
 
             TextMesh txtMesh = txtMeshTransform.GetComponent<TextMesh>();

diff --git a/Assets/EconomicSimulation/Scripts/Panels/BottomPanel.cs b/Assets/EconomicSimulation/Scripts/Panels/BottomPanel.cs
@@ -17,7 +17,7 @@ public class BottomPanel : Window
         private void Awake() // used to position other windows
         {
             MainCamera.bottomPanel = this;
-            generalText.text = "Prosperity Wars v0.20.1";
+            generalText.text = "Prosperity Wars v0.20.2";
             Hide();
         }
 

diff --git a/Assets/EconomicSimulation/Test.unity b/Assets/EconomicSimulation/Test.unity
diff --git a/Assets/EconomicSimulation/Test.unity.meta b/Assets/EconomicSimulation/Test.unity.meta
diff --git a/Assets/Standard Assets/Characters/ThirdPersonCharacter/Prefabs.meta b/Assets/Standard Assets/Characters/ThirdPersonCharacter/Prefabs.meta
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,10 +1,4 @@
 {
-  "dependencies": {
-    "com.unity.incrementalcompiler": "0.0.40",
-    "com.unity.package-manager-ui": "1.9.3",
-    "com.unity.analytics": "exclude",
-    "com.unity.standardevents": "exclude",
-    "com.unity.purchasing": "exclude"
-  },
-  "registry": "https://staging-packages.unity.com"
+	"dependencies": {
+	}
 }
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/WEBGL/Build/UnityLoader.js b/WEBGL/Build/UnityLoader.js
diff --git a/WEBGL/Build/WEBGL.asm.code.unityweb b/WEBGL/Build/WEBGL.asm.code.unityweb
diff --git a/WEBGL/Build/WEBGL.asm.framework.unityweb b/WEBGL/Build/WEBGL.asm.framework.unityweb
diff --git a/WEBGL/Build/WEBGL.asm.memory.unityweb b/WEBGL/Build/WEBGL.asm.memory.unityweb
diff --git a/WEBGL/Build/WEBGL.data.unityweb b/WEBGL/Build/WEBGL.data.unityweb
diff --git a/WEBGL/Build/WEBGL.json b/WEBGL/Build/WEBGL.json
@@ -10,5 +10,5 @@
 "webglContextAttributes": {"preserveDrawingBuffer": false},
 "splashScreenStyle": "Dark",
 "backgroundColor": "#231F20",
-"cacheControl": {"default": "must-revalidate"}
+"cacheControl": {"dataUrl": "must-revalidate"}
 }