Commit 90e2cdc3 authored by Unicorn369's avatar Unicorn369

New version

parent 44e0083e
......@@ -33,7 +33,6 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
Library_
Temp/
ygopro.jks
AI_core_vs2017solution/bin/
......@@ -49,6 +48,7 @@ deck/
expansions/
pack/
picture/
puzzle/
replay/
sound/
texture/
......@@ -62,4 +62,5 @@ commamd.shell
AI_core_vs2017solution/core.VC.db
AI_core_vs2017solution/core.VC.VC.opendb
AI_core_vs2017solution/System.Servicemodel.Faltexception.dll
[Ll]ibrary_/
Assets/StreamingAssets/update.zip*
......@@ -145,16 +145,16 @@ public class Menu : WindowServantSP
void onClickDownload()
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
Application.OpenURL("https://github.com/Unicorn369/pro2_android_closeup/releases/tag/1.0");
Application.OpenURL("https://github.com/Unicorn369/closeup_mobile/releases/tag/0.1");
#elif UNITY_ANDROID //Android
AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
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");
if (!File.Exists("updates/closeup_0.1.txt")) {//用于检查更新
if (File.Exists("closeup_0.1.zip")) {//如果有则直接解压
jo.Call("doExtractZipFile", "closeup_0.1.zip", Program.ANDROID_GAME_PATH);
} else if (File.Exists("updates/closeup_0.1.txt")){//如果有则下载更新包
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/closeup_mobile/releases/download/0.1/closeup_0.1.zip");
} else {//否则下载并解压,锁定目录:ANDROID_GAME_PATH
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.4.zip");
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/closeup_mobile/releases/download/0.1/closeup_0.1.zip");
}
} else {
jo.Call("showToast", "已是最新,无需再次下载!");
......
......@@ -301,7 +301,7 @@ public class Program : MonoBehaviour
*/
ANDROID_GAME_PATH = jo.Call<string>("GamePath", "/ygopro2/");
if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.3.txt"))
if (!File.Exists(ANDROID_GAME_PATH + "updates/ver_1.034.9.txt"))
{
string filePath = Application.streamingAssetsPath + "/ygopro2-data.zip";
var www = new WWW(filePath);
......@@ -321,7 +321,7 @@ public class Program : MonoBehaviour
ExtractZipFile(bytes, ANDROID_GAME_PATH);
}
/* //选择性更新(用于额外打补丁)
if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.3.2.txt"))
if (!File.Exists(ANDROID_GAME_PATH + "updates/ver_1.034.9-fix1.txt"))
{
string filePath = Application.streamingAssetsPath + "/update.zip";
var www = new WWW(filePath);
......@@ -336,7 +336,7 @@ public class Program : MonoBehaviour
#elif UNITY_IPHONE //iPhone
string GamePaths = Application.persistentDataPath + "/ygopro2/";
if (!File.Exists(GamePaths + "updates/version2.3.txt"))
if (!File.Exists(GamePaths + "updates/ver_1.034.9.txt"))
{
string filePath = Application.streamingAssetsPath + "/ygopro2-data.zip";
ExtractZipFile(System.IO.File.ReadAllBytes(filePath), GamePaths);
......@@ -422,16 +422,16 @@ public class Program : MonoBehaviour
loadResources();
#if !UNITY_EDITOR && UNITY_ANDROID //Android Java Test
if (!File.Exists("updates/image_version1.3.txt"))//用于检查更新
if (!File.Exists("updates/image_0.1.txt"))//用于检查更新
{
if (File.Exists("pics.zip")) {
jo.Call("doExtractZipFile", "pics.zip", ANDROID_GAME_PATH);
File.Copy("updates/version2.3.txt", "updates/image_version1.3.txt", true);
} else if (File.Exists(ANDROID_GAME_PATH + "../ygocore/pics.zip")) {
File.Copy("updates/ver_1.034.9.txt", "updates/image_0.1.txt", true);
} else if (File.Exists(ANDROID_GAME_PATH + "../ygocore/pics.zip")) {//YGOMobile
jo.Call("doExtractZipFile", ANDROID_GAME_PATH + "../ygocore/pics.zip", ANDROID_GAME_PATH);
File.Copy("updates/version2.3.txt", "updates/image_version1.3.txt", true);
File.Copy("updates/ver_1.034.9.txt", "updates/image_0.1.txt", true);
} else {
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/pics.zip");
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/closeup_mobile/releases/download/0.1/pics.zip");
}
}
......@@ -1039,7 +1039,9 @@ public class Program : MonoBehaviour
_padScroll = 0;
}
GUI.Label(new Rect(10, 5, 200, 200), "[Ver 2.3.2] " + "FPS: " + m_FPS);
string FPS = m_FPS.ToString();
try { FPS = FPS.Substring(0, 5); } catch{}
GUI.Label(new Rect(10, 5, 200, 200), "[Ver 1.034.9] " + "FPS: " + FPS);
}
void Update()
......
......@@ -123,7 +123,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2.3.2 (1.034.9)
bundleVersion: 1.034.9
preloadedAssets: []
metroInputSource: 0
m_HolographicPauseOnTrackingLoss: 1
......@@ -148,7 +148,7 @@ PlayerSettings:
tvOS: cn.ygopro2.ygopro2android
buildNumber:
iOS:
AndroidBundleVersionCode: 17
AndroidBundleVersionCode: 18
AndroidMinSdkVersion: 16
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment