Merge pull request #486 from Nashet/ver.0.20

Ver 0 20

.gitignore

@@ -31,6 +31,7 @@ sysinfo.txt
 *.apk
 *.unitypackage
 /[Rr]eleases/
+/[Ss]creens/
 /[Rr]eserv/
 
 # my edits

Assets/ArmiesSelectionWindow.cs

@@ -0,0 +1,40 @@
+using Nashet.UnityUIUtils;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Nashet.EconomicSimulation
+{
+
+    public class ArmiesSelectionWindow : DragPanel
+    {
+        [SerializeField]
+        private Text caption;
+
+        private static ArmiesSelectionWindow thisObject;
+        public static ArmiesSelectionWindow Get
+        {
+            get { return thisObject; }
+        }
+
+        private void Start()
+        {
+            //base.Start();
+            thisObject = this;
+            Hide();
+            GUIChanger.Apply(gameObject);
+        }
+
+        public override void Refresh()
+        {
+            if (Game.selectedUnits.Count == 0)
+                Hide();
+            else if (Game.selectedUnits.Count == 1)
+                caption.text = "Selected 1 army";
+            else
+                caption.text = "Selected " + Game.selectedUnits.Count + " armies";
+        }
+
+    }
+}

Assets/EconomicSimulation/Resources/Shaders/3DText.shader

@@ -0,0 +1,66 @@
+// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt)
+
+Shader "GUI/Text Shader2" {
+	Properties{
+		_MainTex("Font Texture", 2D) = "white" {}
+	_Color("Text Color", Color) = (1,1,1,1)
+	}
+
+		SubShader{
+
+		Tags{
+		"Queue" = "Transparent"
+		"IgnoreProjector" = "True"
+		"RenderType" = "Transparent"
+		"PreviewType" = "Plane"
+	}
+		Lighting Off Cull Off ZWrite Off Fog{ Mode Off }
+		//Lighting Off Cull Off ZTest Always ZWrite Off
+		Blend SrcAlpha OneMinusSrcAlpha
+
+		Pass{
+		CGPROGRAM
+#pragma vertex vert
+#pragma fragment frag
+#pragma multi_compile _ UNITY_SINGLE_PASS_STEREO STEREO_INSTANCING_ON STEREO_MULTIVIEW_ON
+#include "UnityCG.cginc"
+
+		struct appdata_t {
+		float4 vertex : POSITION;
+		fixed4 color : COLOR;
+		float2 texcoord : TEXCOORD0;
+		UNITY_VERTEX_INPUT_INSTANCE_ID
+	};
+
+	struct v2f {
+		float4 vertex : SV_POSITION;
+		fixed4 color : COLOR;
+		float2 texcoord : TEXCOORD0;
+		UNITY_VERTEX_OUTPUT_STEREO
+	};
+
+	sampler2D _MainTex;
+	uniform float4 _MainTex_ST;
+	uniform fixed4 _Color;
+
+	v2f vert(appdata_t v)
+	{
+		v2f o;
+		UNITY_SETUP_INSTANCE_ID(v);
+		UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
+		o.vertex = UnityObjectToClipPos(v.vertex);
+		o.color = v.color * _Color;
+		o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex);
+		return o;
+	}
+
+	fixed4 frag(v2f i) : SV_Target
+	{
+		fixed4 col = i.color;
+	col.a *= tex2D(_MainTex, i.texcoord).a;
+	return col;
+	}
+		ENDCG
+	}
+	}
+}