Merge branch 'release/v0.0.4_economy'

mushugit · Jul 8, 2018 · 68c6aa1 · 68c6aa1
2 parents 32977df + e6fe884
commit 68c6aa1
Show file tree

Hide file tree

Showing 229 changed files with 109,325 additions and 3,234 deletions.
diff --git a/Assets/3D.meta b/Assets/3D.meta
diff --git a/Assets/3D/depot_1.blend b/Assets/3D/depot_1.blend
diff --git a/Assets/3D/depot_1.blend.meta b/Assets/3D/depot_1.blend.meta
diff --git a/Assets/3D/depot_2.blend b/Assets/3D/depot_2.blend
diff --git a/Assets/3D/depot_2.blend.meta b/Assets/3D/depot_2.blend.meta
diff --git a/Assets/BalanceRender.cs b/Assets/BalanceRender.cs
@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BalanceRender : MonoBehaviour {
+	public Text balanceLabel;
+
+	void Update () {
+		balanceLabel.text = $"{World.LocalEconomy?.Balance.ToString("C0")} ";
+	}
+}
diff --git a/Assets/Scripts/Node.cs.meta → Assets/BalanceRender.cs.meta b/Assets/Scripts/Node.cs.meta → Assets/BalanceRender.cs.meta
diff --git a/Assets/ExternalDLL.meta b/Assets/ExternalDLL.meta
diff --git a/Assets/ExternalDLL/Newtonsoft.Json.dll b/Assets/ExternalDLL/Newtonsoft.Json.dll
diff --git a/Assets/ExternalDLL/Newtonsoft.Json.dll.meta b/Assets/ExternalDLL/Newtonsoft.Json.dll.meta
diff --git a/Assets/GUI/Background/background2.png b/Assets/GUI/Background/background2.png
diff --git a/Assets/GUI/Background/background2.png.meta b/Assets/GUI/Background/background2.png.meta