Merge branch 'Test' of https://github.com/Unicorn369/YGOPro2_Droid into Android

Assets/SibylSystem/Menu/Menu.cs

@@ -148,13 +148,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.3.txt")) {//用于检查更新
-            if (File.Exists("closeup_version1.3.zip")) {//如果有则直接解压
-                jo.Call("doExtractZipFile", "closeup_version1.3.zip", Program.ANDROID_GAME_PATH);
-            } else if (File.Exists("updates/closeup_version1.2.txt")){//如果有则下载更新包
-                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/up_closeup_version1.3.zip");
+        if (!File.Exists("updates/closeup_version1.4.txt")) {//用于检查更新
+            if (File.Exists("closeup_version1.4.zip")) {//如果有则直接解压
+                jo.Call("doExtractZipFile", "closeup_version1.4.zip", Program.ANDROID_GAME_PATH);
+            } else if (File.Exists("updates/closeup_version1.3.txt")){//如果有则下载更新包
+                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/up_closeup_version1.4.zip");
             } else {//否则下载并解压，锁定目录：ANDROID_GAME_PATH
-                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.3.zip");
+                jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.4.zip");
             }
         } else {
             jo.Call("showToast", "已是最新，无需再次下载！");

Assets/SibylSystem/Program.cs

@@ -321,7 +321,7 @@ public class Program : MonoBehaviour
             ExtractZipFile(bytes, ANDROID_GAME_PATH);
         }
 /*      //选择性更新(用于额外打补丁)
-        if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.3.1.txt"))
+        if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.3.2.txt"))
         {
             string filePath = Application.streamingAssetsPath + "/update.zip";
             var www = new WWW(filePath);
@@ -405,11 +405,11 @@ public class Program : MonoBehaviour
             loadResources();
 
 #if !UNITY_EDITOR && UNITY_ANDROID //Android Java Test
-            if (!File.Exists("updates/image_version1.2.txt"))//用于检查更新
+            if (!File.Exists("updates/image_version1.3.txt"))//用于检查更新
             {
                 if (File.Exists("pics.zip")) {
                     jo.Call("doExtractZipFile", "pics.zip", ANDROID_GAME_PATH);
-                    File.Copy("updates/version2.3.txt", "updates/image_version1.2.txt", true);
+                    File.Copy("updates/version2.3.txt", "updates/image_version1.3.txt", true);
                 } else {
                     jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/pics.zip");
                 }
@@ -1019,7 +1019,7 @@ public class Program : MonoBehaviour
             _padScroll = 0;
         }
 
-        GUI.Label(new Rect(10, 5, 200, 200), "[Ver 2.3.1] " + "FPS: " + m_FPS);
+        GUI.Label(new Rect(10, 5, 200, 200), "[Ver 2.3.2] " + "FPS: " + m_FPS);
     }
 
     void Update()

ProjectSettings/ProjectSettings.asset

@@ -123,7 +123,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.3.1 (1.034.9)
+  bundleVersion: 2.3.2 (1.034.9)
   preloadedAssets: []
   metroInputSource: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -148,7 +148,7 @@ PlayerSettings:
     tvOS: cn.ygopro2.ygopro2android
   buildNumber:
     iOS: 
-  AndroidBundleVersionCode: 16
+  AndroidBundleVersionCode: 17
   AndroidMinSdkVersion: 16
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 0