gx

.gitlab-ci.yml

@@ -18,6 +18,7 @@ unity:
       - KoishiPro2-src/
   only:
     - Android
+    - gx
   tags:
     - unity
 

Assets/SibylSystem/Program.cs

@@ -338,7 +338,7 @@ public class Program : MonoBehaviour
 
 #elif UNITY_IPHONE //iPhone
         string GamePaths = Application.persistentDataPath + "/ygopro2/";
-        if (!File.Exists(GamePaths + "updates/version-1.035.1-Lily.txt"))
+        if (!File.Exists(GamePaths + "updates/version-1.035.1-GX.txt"))
         {
             string filePath = Application.streamingAssetsPath + "/ygopro2-data.zip";
             ExtractZipFile(System.IO.File.ReadAllBytes(filePath), GamePaths);
@@ -518,20 +518,13 @@ public class Program : MonoBehaviour
     }
     private void UpdateClient()
     {
-        try
+        /*try
         {
             PrintToChat(InterString.Get("开始更新卡片数据。"));
             if(!Directory.Exists("cdb")) {
                 Directory.CreateDirectory("cdb");
             }
 
-            /*if(File.Exists("cdb/cards.cdb"))
-                File.Delete("cdb/cards.cdb");
-            if(File.Exists("cdb/lflist.conf"))
-                File.Delete("cdb/lflist.conf");
-            if(File.Exists("cdb/strings.conf"))
-                File.Delete("cdb/strings.conf");*/
-
             HttpDldFile httpDldFile = new HttpDldFile();
             httpDldFile.Download("http://koishipro2dl.my-card.in/cards.cdb", "cdb/_cards.cdb");
             if(YGOSharp.CardsManager.initialize("cdb/_cards.cdb", true)) {
@@ -563,7 +556,7 @@ public class Program : MonoBehaviour
         {
             PrintToChat("UPDATE ERROR: " + e.ToString());
             Debug.Log("UPDATE ERROR: " + e.ToString());
-        }
+        }*/
     }
 
     private void ReplaceFile(string oldfile, string newfile) {
@@ -1116,7 +1109,7 @@ public class Program : MonoBehaviour
 
         string FPS = m_FPS.ToString();
         try { FPS = FPS.Substring(0, 5); } catch{}
-        GUI.Label(new Rect(10, 5, 200, 200), "[Ver 1.035.1-Lily] " + "FPS: " + FPS);
+        GUI.Label(new Rect(10, 5, 200, 200), "[Ver 1.035.1-GX] " + "FPS: " + FPS);
     }
 
     void Update()

Assets/SibylSystem/selectServer/SelectServer.cs

@@ -47,9 +47,10 @@ public class SelectServer : WindowServantSP
         set_version("0x" + String.Format("{0:X}", Config.ClientVersion));
 
         //方便免修改 [selectServerWithRoomlist.prefab]
-        serversList.items.Add("[OCG]Koishi");
+        serversList.items.Add("[GX]游戏王GX");
+        //serversList.items.Add("[OCG]Koishi");
         //serversList.items.Add("[OCG]Koishi备用节点");
-        serversList.items.Add("[OCG]Mercury233");
+        /*ZserversList.items.Add("[OCG]Mercury233");
         serversList.items.Add("[OCG]23333 Pre");
         serversList.items.Add("[TCG]Koishi");
         serversList.items.Add("[轮抽服]2Pick");
@@ -60,6 +61,7 @@ public class SelectServer : WindowServantSP
         serversList.items.Add("[AI]Doom Bots of Doom");
         //serversList.items.Add("[OCG&TCG]한국서버");
         //serversList.items.Add("[OCG&TCG]YGOhollow (JP)");
+        */
         if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
         {
             serversList.items.Add("[自定义]");
@@ -75,6 +77,16 @@ public class SelectServer : WindowServantSP
         string server = serversList.value;
         switch (server)
         {
+             case "[GX]游戏王GX":
+                {
+                    UIHelper.getByName<UIInput>(gameObject, "ip_").value = "dragonn73.oicp.net";
+                    UIHelper.getByName<UIInput>(gameObject, "port_").value = "2015";
+                    Config.Set("serversPicker", "[OCG]Koishi");
+
+                    inputIP_.enabled = true;
+                    inputPort_.enabled = true;
+                    break;
+                }
             case "[OCG]Koishi":
                 {
                     UIHelper.getByName<UIInput>(gameObject, "ip_").value = "koishi.momobako.com";

Assets/YGOSharp/CardsManager.cs

@@ -23,11 +23,11 @@ namespace YGOSharp
                 nullString = "";
                 nullString += "欢迎使用 KoishiPro2 iOS，本软件免责声明：[url=https://koishi.pro/lab.html][u]https://koishi.pro/lab.html[/u][/url]";
                 nullString += "\r\n\r\n";
-                nullString += "KoishiPro2 iOS的用户QQ群627975038，游戏中遇到任何bug欢迎提交";
-                nullString += "\r\n\r\n";
-                nullString += "更多关于电脑/安卓版KoishiPro及7210服务器的信息可加QQ群338443272";
-                nullString += "\r\n\r\n";
-                nullString += "喜欢游戏王DIY的朋友欢迎来222服QQ群642043095";
+                nullString += "该版本为 GX 特供版，GX 群号  57658937";
+                //nullString += "\r\n\r\n";
+                //nullString += "更多关于电脑/安卓版KoishiPro及7210服务器的信息可加QQ群338443272";
+                //nullString += "\r\n\r\n";
+                //nullString += "喜欢游戏王DIY的朋友欢迎来222服QQ群642043095";
             }
             bool success = true;
             try {

ProjectSettings/ProjectSettings.asset

@@ -123,7 +123,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.035.1-Lily
+  bundleVersion: 1.035.1-GX
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -144,7 +144,7 @@ PlayerSettings:
     Android: cn.ygopro2.ygopro2android
     Standalone: cn.ygopro2.ygopro2android
     Tizen: cn.ygopro2.ygopro2android
-    iOS: cn.ygopro2.ygopro2ios
+    iOS: cn.ygopro2.ygopro2ios.gx
     tvOS: cn.ygopro2.ygopro2android
   buildNumber:
     iOS: