Merge pull request #185 from jiangtiandao/master

1.2.1 support

resource/GameData/DTS_zh/zhItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Items>
-  <Item scene="SPACECENTER"  type="SpriteText" path="panel_RnD/RDScreen(Clone)/panelManager/panel_technology/RightPanel/RDpanel/Panel_node/node_description">
+  <Item scene="SPACECENTER"  type="TMP_Text" path="panel_RnD/RDScreen(Clone)/panelManager/panel_technology/RightPanel/RDpanel/Panel_node/node_description">
     <string name="The technology we started out with."><![CDATA[这是最基础的科技.]]></string>
     <string name="More engines, more fuel, more ambitious ideas."><![CDATA[更强的引擎,更多的燃料,更高远的志向.]]></string>
     <string name="The art and science of landing and walking away from it."><![CDATA[成功着陆并安全走出舱外的科技支持.]]></string>
@@ -58,7 +58,7 @@
     <string name="Nanolathing"><![CDATA[构建技术领域的超新星科技.]]></string>
   </Item>
 
-  <Item scene="TRACKSTATION"  type="SpriteText" path="KnowledgeBase/KnowledgeContainer/Planets/MainPanel/Panel manager/Panel1/description">
+  <Item scene="TRACKSTATION"  type="TMP_Text" path="KnowledgeBase/KnowledgeContainer/Planets/MainPanel/Panel manager/Panel1/description">
     <string name="A unique world, Kerbin has flat plains, soaring mountains and wide, blue oceans. Home to the Kerbals, it has just the right conditions to support a vast, seemingly undepletable population of the eager green creatures.&#x000A;&#x000A;Reaching a stable orbit around Kerbin is one of the first things budding space programs strive for. It is said that he who can get his ship into orbit is halfway to anywhere."><![CDATA[一个独一无二的世界,Kerbin拥有平坦的平原,高耸的山脉,以及宽广蔚蓝的海洋.作为Kerbal人的家园,它正好处在一个极佳的条件之下,能够容纳这些大量的,而且看上去数量还不会减少的积极努力着的绿色生物们.刚刚开始发展的太空计划的奋斗目标之一是要到达一个稳定的绕Kerbin轨道.有人说,如果可以让飞船进入轨道,无论你要去哪,你的梦想就已经成功了一半了.]]></string>
     <string name="The Mun, is a large satellite orbiting Kerbin. It is mostly gray in appearance, with craters of various sizes dotting its otherwise smooth surface.&#x000A;&#x000A;The Muns discovery is widely regarded as one of the more important breakthroughs of Kerbal evolution. Granted, it didnt happen all that long ago, but its still fair to say Kerbals are wiser and more evolved now than they were back then."><![CDATA[Mun是一颗围绕着Kerbin旋转的大型卫星.它的外表看起来主要是灰色的,各种大小的陨石坑点缀着它那本来平坦的表面.对Mun的探索被广泛认为是Kerbal进化史上最重要的突破之一.当然,这只不过是不久前的事情,但还是可以公平地说,现在的Kerbal人比起以前来要更聪明,也更加高等了.]]></string>
     <string name="Minmus is the smallest moon orbiting Kerbin. From the surface of Kerbin, it can be seen on clear days as a tiny blue speck in the sky. &#x000A;&#x000A;It is often mistaken as dirt on telescope lenses or dead pixels, but the top minds at the Kerbal Astronomical Society assure us it is a real moon nevertheless."><![CDATA[Minmus是Kerbin最小的一颗卫星.天气好的时候,从Kerbin上可以看见它就像是天空中的一颗蓝色小斑点.它经常被误认为是望远镜镜片上的污点或者是一个坏点,但Kerbal天文学会的专家向我们保证,尽管如此它还是一颗真真正正的卫星.]]></string>
@@ -78,19 +78,19 @@
     <string name="Theres been a considerable amount of controversy around the status of Eeloo as being a proper planet or a just lump of ice going around the Sun. The debate is still ongoing, since most academic summits held to address the issue have devolved into, on good days, petty name calling, and on worse ones, all-out brawls."><![CDATA[对于Eeloo到底是名副其实的行星,还是只是一颗"围绕着太阳的冰疙瘩",目前存在着相当多的争论.这场辩论还将继续,因为大部分的学术峰会都加入进来阐述他们的论点,从友好的问候,到指名骂姓,再到更加糟糕的全面论战.]]></string>
   </Item>
 
-  <Item scene="SPACECENTER"  type="SpriteText" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_available/text_offer">
+  <Item scene="SPACECENTER"  type="TMP_Text" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_available/text_offer">
     <string name="Expires"><![CDATA[过期时限.]]></string>
   </Item>
 
-  <Item scene="SPACECENTER"  type="SpriteText" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_available/text_expirytime">
+  <Item scene="SPACECENTER"  type="TMP_Text" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_available/text_expirytime">
     <string name="Never"><![CDATA[永不过期.]]></string>
   </Item>
 
-  <Item scene="SPACECENTER"  type="SpriteText" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_active/text_deadline">
+  <Item scene="SPACECENTER"  type="TMP_Text" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_active/text_deadline">
     <string name="Deadline"><![CDATA[完成时限.]]></string>
   </Item>
 
-  <Item scene="SPACECENTER"  type="SpriteText" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_active/text_deadlinetime">
+  <Item scene="SPACECENTER"  type="TMP_Text" path="panel_MC/MissionControl(Clone)/panelManager/panel_main/placement/anchor/subCategories/panel_view/anchor_buttons/panel_active/text_deadlinetime">
     <string name="Never"><![CDATA[永久.]]></string>
   </Item>
 </Items>

src/DTS_Addon/DTS_Addon.csproj

@@ -54,14 +54,13 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
+    <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>E:\SteamLibrary\SteamApps\common\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-    </Reference>
-    <Reference Include="KSPUtil">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\KSPUtil.dll</HintPath>
+    <Reference Include="Assembly-CSharp-firstpass, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>E:\SteamLibrary\SteamApps\common\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Steam\SteamApps\common\Kerbal Space Program\KSP_Data\Managed\System.dll</HintPath>
@@ -71,8 +70,12 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>True</Private>
     </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>C:\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_Data\Managed\UnityEngine.dll</HintPath>
+    <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>E:\SteamLibrary\SteamApps\common\Kerbal Space Program\KSP_Data\Managed\UnityEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>E:\SteamLibrary\SteamApps\common\Kerbal Space Program\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

src/DTS_Addon/Scene/xCredits.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-
+using System.Diagnostics;
 using System.Text;
 
 using UnityEngine;
@@ -10,9 +10,10 @@ namespace DTS_Addon.Scene
     [KSPAddon(KSPAddon.Startup.Credits, false)]
     public class xCredits : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
-           // GUI.Label(new Rect(10, 10, 200, 20), "Credits");
+           GUI.Label(new Rect(10, 10, 200, 20), "Credits");
         }
     }
 }

src/DTS_Addon/Scene/xEditorAny.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-
+using System.Diagnostics;
 using System.Text;
 
 using UnityEngine;
@@ -10,9 +10,10 @@ namespace DTS_Addon.Scene
     [KSPAddon(KSPAddon.Startup.EditorAny, false)]
     public class xEditorAny : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
-            //GUI.Label(new Rect(10, 10, 200, 20), "EditorAny");
+            GUI.Label(new Rect(10, 10, 200, 20), "EditorAny");
         }
     }
 }

src/DTS_Addon/Scene/xEditorSPH.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-
+using System.Diagnostics;
 using System.Text;
 
 using UnityEngine;
@@ -10,6 +10,7 @@ namespace DTS_Addon.Scene
     [KSPAddon(KSPAddon.Startup.EditorSPH, false)]
     public class xEditorSPH : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
            // GUI.Label(new Rect(10, 10, 200, 20), "EditorSPH");

src/DTS_Addon/Scene/xEditorVAB.cs

@@ -2,15 +2,17 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
+using System.Diagnostics;
 
 namespace DTS_Addon.Scene
 {
     [KSPAddon(KSPAddon.Startup.EditorVAB, false)]
     public class xEditorVAB : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
-           // GUI.Label(new Rect(10, 10, 200, 20), "EditorVAB");
+            GUI.Label(new Rect(10, 10, 200, 20), "EditorVAB");
         }
     }
 }

src/DTS_Addon/Scene/xEveryScene.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 
 using System.Text;
-
+using TMPro;
 using UnityEngine;
 
 namespace DTS_Addon.Scene
@@ -13,6 +13,7 @@ public class xEveryScene : MonoBehaviour
 
         void Start()
         {
+            if (xFont.fontDef == null) xFont.LoadxFont();
 
         }
 
@@ -21,7 +22,7 @@ void Start()
 
         void Update()
         {
-
+                
         }
 
 
@@ -85,7 +86,13 @@ void Update()
         //    }
         //}
 
-
+        void OnGUI()
+        {
+            foreach (TMP_Text text in Resources.FindObjectsOfTypeAll<TMP_Text>())
+            {
+                text.font = xFont.fontDef;
+            }
+        }
     }
 
 

src/DTS_Addon/Scene/xFlight.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
-
+using System.Diagnostics;
 namespace DTS_Addon.Scene
 {
     [KSPAddon(KSPAddon.Startup.Flight, false)]
@@ -17,10 +17,10 @@ void Update()
         {
 
         }
-
+        [Conditional("DEBUG")]
         void OnGUI()
         {
-            //GUI.Label(new Rect(10, 10, 200, 20), "Flight");
+            GUI.Label(new Rect(10, 10, 200, 20), "Flight");
         }
     }
 }

src/DTS_Addon/Scene/xInstantly.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Text;
 using UnityEngine;
 
@@ -8,9 +9,10 @@ namespace DTS_Addon.Scene
     [KSPAddon(KSPAddon.Startup.Instantly, false)]
     public class xInstantly : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
-            //GUI.Label(new Rect(10, 10, 200, 20), "Instantly");
+            GUI.Label(new Rect(10, 10, 200, 20), "Instantly");
         }
     }
 }

src/DTS_Addon/Scene/xMainMenu.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-
+using System.Diagnostics;
 using System.Text;
 
 using UnityEngine;
@@ -10,6 +10,7 @@ namespace DTS_Addon.Scene
     [KSPAddon(KSPAddon.Startup.MainMenu, false)]
     public class xMainMenu : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
           GUI.Label(new Rect(10, 10, 200, 20), "MainMenu");

src/DTS_Addon/Scene/xPSystemSpawn.cs

@@ -12,7 +12,7 @@ public class xPSystemSpawn : MonoBehaviour
     {
         void OnGUI()
         {
-            GUI.Label(new Rect(10, 10, 200, 20), "PSystemSpawn");
+            //GUI.Label(new Rect(10, 10, 200, 20), "PSystemSpawn");
         }
     }
 }

src/DTS_Addon/Scene/xSettings.cs

@@ -2,17 +2,18 @@
 using System.Collections.Generic;
 
 using System.Text;
-
+using System.Diagnostics;
 using UnityEngine;
 
 namespace DTS_Addon.Scene
 {
     [KSPAddon(KSPAddon.Startup.Settings, false)]
     public class xSettings : MonoBehaviour
     {
+        [Conditional("DEBUG")]
         void OnGUI()
         {
-           // GUI.Label(new Rect(10, 10, 200, 20), "Settings");
+          GUI.Label(new Rect(10, 10, 200, 20), "Settings");
         }
     }
 }

src/DTS_Addon/Scene/xTrackingStation.cs

@@ -27,7 +27,7 @@ void Update()
           //  var go=GameObject.Find("description");
           //if (go!=null )
           //{
-          //    var st = go.GetComponent<SpriteText>();
+          //    var st = go.GetComponent<TMP_Text>();
           //    if (st != null) st.Text = DateTime.Now.ToString();
           //}
         }

src/DTS_Addon/SuperTool/Tools.cs

@@ -2,6 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using TMPro;
+
 
 namespace DTS_Addon
 {
@@ -103,9 +105,9 @@ void CNodeWindow(int id)
             {
                 foreach (var item in Nodes) fTextMeshNode(item);
             }
-            else if (GUI.Button(new Rect(290, 20, 60, 20), "SpriteText"))
+            else if (GUI.Button(new Rect(290, 20, 60, 20), "TMP_Text"))
             {
-                foreach (var item in Nodes) fSpriteText(item);
+                foreach (var item in Nodes) fTMP_Text(item);
             }
             else if (GUI.Button(new Rect(350, 20, 60, 20), "AllNode"))
             {
@@ -174,14 +176,14 @@ public void fTextMeshNode(Node node)
                 fTextMeshNode(item);
             }
         }
-        public void fSpriteText(Node node)
+        public void fTMP_Text(Node node)
         {
             if (node.gameObject != null)
             {
-                var spriteText = node.gameObject.GetComponent<SpriteText>();
-                if (spriteText != null)
+                var TMP_Texts = node.gameObject.GetComponent<TMP_Text>();
+                if (TMP_Texts != null)
                 {
-                    node.visable = spriteText.text.ToLower().Contains(findText.ToLower());
+                    node.visable = TMP_Texts.text.ToLower().Contains(findText.ToLower());
                     if (node.visable == true) SetP(node);
                 }
                 else
@@ -341,7 +343,7 @@ void CComponentsWindow(int id)
 
 
 
-                //SpriteTextRich str = SObject.GetComponent<SpriteTextRich>();
+                //TMP_TextRich str = SObject.GetComponent<TMP_TextRich>();
 
                 //if (str != null)
                 //{