Commit 9272e379 authored by nanahira's avatar nanahira

Merge branch 'Android' of github.com:Unicorn369/ygopro2_droid into Android

parents 45b18f28 cb329106
This diff is collapsed.
......@@ -345,7 +345,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 129162}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -64, y: 98, z: 0}
m_LocalPosition: {x: 48, y: 98, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 459346}
......@@ -433,7 +433,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 169090}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 47, y: 98, z: 0}
m_LocalPosition: {x: -64, y: 98, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 411446}
......@@ -525,7 +525,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 94, y: 36, z: 0}
m_Size: {x: 95, y: 37, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11108840
Animation:
......@@ -717,7 +717,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3005
startingRenderQueue: 3004
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 4
......@@ -781,11 +781,11 @@ MonoBehaviour:
leftAnchor:
target: {fileID: 418574}
relative: 1
absolute: -113
absolute: -224
rightAnchor:
target: {fileID: 418574}
relative: 1
absolute: -19
absolute: -129
bottomAnchor:
target: {fileID: 418574}
relative: 0
......@@ -793,17 +793,17 @@ MonoBehaviour:
topAnchor:
target: {fileID: 418574}
relative: 1
absolute: -31
absolute: -30
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 94
mHeight: 36
mWidth: 95
mHeight: 37
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 2.6111112
aspectRatio: 2.5675676
--- !u!114 &11438792
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1151,11 +1151,11 @@ MonoBehaviour:
leftAnchor:
target: {fileID: 418574}
relative: 1
absolute: -224
absolute: -113
rightAnchor:
target: {fileID: 418574}
relative: 1
absolute: -129
absolute: -18
bottomAnchor:
target: {fileID: 418574}
relative: 0
......@@ -1347,8 +1347,8 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.98823535, g: 0.98823535, b: 0.98823535, a: 0.78431374}
mPivot: 4
mWidth: 45
mHeight: 45
mWidth: 40
mHeight: 40
mDepth: 0
autoResizeBoxCollider: 0
hideIfOffScreen: 0
......@@ -1412,7 +1412,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3005
startingRenderQueue: 3004
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3
......
......@@ -95,7 +95,11 @@ public class Menu : WindowServantSP
Program.I().quit();
Program.Running = false;
TcpHelper.SaveRecord();
#if !UNITY_EDITOR || UNITY_ANDROID // IL2CPP 使用此方法才能退出
Application.Quit();
#elif
Process.GetCurrentProcess().Kill();
#endif
}
void onClickOnline()
......@@ -144,16 +148,17 @@ 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.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");
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");
} else {//否则下载并解压,锁定目录:ANDROID_GAME_PATH
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.2.zip");
jo.Call("doDownloadZipFile", "https://github.com/Unicorn369/pro2_android_closeup/releases/download/1.0/closeup_version1.3.zip");
}
} else {
jo.Call("showToast", "已下载,无需再次下载!");
jo.Call("showToast", "已是最新,无需再次下载!");
Program.PrintToChat(InterString.Get("已是最新,无需再次下载!"));
}
#endif
}
......
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