Set Version to 2.2.2

.gitignore

@@ -60,3 +60,4 @@ strings.conf
 AI_core_vs2017solution/core.VC.db
 AI_core_vs2017solution/core.VC.VC.opendb
 AI_core_vs2017solution/System.Servicemodel.Faltexception.dll
+Assets/StreamingAssets/update.zip*

Assets/SibylSystem/Menu/Menu.cs

@@ -144,13 +144,13 @@ public class Menu : WindowServantSP
         Application.OpenURL("https://github.com/Unicorn369/pro2_android_closeup/releases/tag/1.0");
 #elif UNITY_ANDROID //Android
         AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
-        if (!File.Exists("updates/closeup_version1.1.txt")) {//用于检查更新
-            if (File.Exists("closeup_version1.1.zip")) {//如果有则直接解压
-                jo.Call("doExtractZipFile", "closeup_version1.1.zip", Program.ANDROID_GAME_PATH);
-            } else if (File.Exists("updates/closeup_version1.0.txt")){//如果有则下载更新包
-                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/up_closeup_version1.1.zip");
+        if (!File.Exists("updates/closeup_version1.2.txt")) {//用于检查更新
+            if (File.Exists("closeup_version1.2.zip")) {//如果有则直接解压
+                jo.Call("doExtractZipFile", "closeup_version1.2.zip", Program.ANDROID_GAME_PATH);
+            } else if (File.Exists("updates/closeup_version1.1.txt")){//如果有则下载更新包
+                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/up_closeup_version1.2.zip");
             } else {//否则下载并解压，锁定目录：ANDROID_GAME_PATH
-                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.1.zip");
+                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.2.zip");
             }
         } else {
             jo.Call("showToast", "已下载，无需再次下载！");

Assets/SibylSystem/Program.cs

@@ -304,7 +304,7 @@ public class Program : MonoBehaviour
         Screen.sleepTimeout = SleepTimeout.NeverSleep;
         if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.0.txt"))
         {
-            string filePath = Application.streamingAssetsPath + "/ygopro2.zip";
+            string filePath = Application.streamingAssetsPath + "/ygopro2-data.zip";
             var www = new WWW(filePath);
             while (!www.isDone) { }
             byte[] bytes = www.bytes;
@@ -322,6 +322,16 @@ public class Program : MonoBehaviour
             ExtractZipFile(bytes, ANDROID_GAME_PATH);
         }
 
+        if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.2.2.txt"))
+        {
+            string filePath = Application.streamingAssetsPath + "/update.zip";
+            var www = new WWW(filePath);
+            while (!www.isDone) { }
+            byte[] bytes = www.bytes;
+            ExtractZipFile(bytes, ANDROID_GAME_PATH);
+            //File.Create(ANDROID_GAME_PATH + ".nomedia");
+        }
+
         Environment.CurrentDirectory = ANDROID_GAME_PATH;
         System.IO.Directory.SetCurrentDirectory(ANDROID_GAME_PATH);
 
@@ -329,7 +339,7 @@ public class Program : MonoBehaviour
         string GamePaths = Application.persistentDataPath + "/ygopro2/";
         if (!File.Exists(GamePaths + "updates/version2.0.txt"))
         {
-            string filePath = Application.streamingAssetsPath + "/ygopro2.zip";
+            string filePath = Application.streamingAssetsPath + "/ygopro2-data.zip";
             var www = new WWW(filePath);
             while (!www.isDone) { }
             byte[] bytes = www.bytes;
@@ -413,17 +423,13 @@ public class Program : MonoBehaviour
             loadResources();
 
 #if !UNITY_EDITOR && UNITY_ANDROID //Android Java Test
-            if (!File.Exists("updates/image_version1.1.txt"))//用于检查更新
+            if (!File.Exists("updates/image_version1.2.txt"))//用于检查更新
             {
                 if (File.Exists("pics.zip")) {
                     jo.Call("doExtractZipFile", "pics.zip", ANDROID_GAME_PATH);
-                    File.Copy("updates/version2.0.txt", "updates/image_version1.1.txt", true);
-                } else if (File.Exists("/storage/emulated/0/ygocore/pics.zip")) {//YGOMobile内置的卡图包
-                    jo.Call("doExtractZipFile", "/storage/emulated/0/ygocore/pics.zip", ANDROID_GAME_PATH);
-                    File.Copy("updates/version2.0.txt", "updates/image_version1.1.txt", true);
+                    File.Copy("updates/version2.0.txt", "updates/image_version1.2.txt", true);
                 } else {
-                    //Application.OpenURL("https://www.taptap.com/app/37972");
-                    jo.Call("showToast", "没有发现卡图包，是否未安装YGOMobile");
+                    jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/pics.zip");
                 }
             }
 
@@ -1091,7 +1097,7 @@ public class Program : MonoBehaviour
             _padScroll = 0;
         }
 
-        GUI.Label(new Rect(10, 5, 200, 200), "[Version 2.2] " + "FPS: " + m_FPS);
+        GUI.Label(new Rect(10, 5, 200, 200), "[Ver 2.2.2] " + "FPS: " + m_FPS);
     }
 
     void Update()

Assets/SibylSystem/Room/RoomList.cs

@@ -111,8 +111,8 @@ public class RoomList : WindowServantSP
         string versionString = UIHelper.getByName<UIInput>(Program.I().selectServer.gameObject, "version_").value;
         if (versionString == "")
         {
-            UIHelper.getByName<UIInput>(Program.I().selectServer.gameObject, "version_").value = "0x1348";
-            versionString = "0x1348";
+            UIHelper.getByName<UIInput>(Program.I().selectServer.gameObject, "version_").value = "0x1349";
+            versionString = "0x1349";
         }
         Program.I().roomList.hide();
         Program.I().selectServer.KF_onlineGame(Name, ipString, portString, versionString, pswString);

ProjectSettings/ProjectSettings.asset

@@ -123,7 +123,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.034.8 (Test 2.2.1)
+  bundleVersion: 1.034.9 (Test 2.2.2)
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1

README.md

+# Download game
+
+https://github.com/Unicorn369/YGOPro2_Droid/releases
+
 # You have just found ygopro v2 in Unity 3D!
 
 YGOPro v2 is a card simulation game created in Unity Engine, with same protocol to ygopro.