Skip to content

Y
ygopro2
Commit e44c70e9 authored by 無名の凝泪's avatar 無名の凝泪
Browse files
Options

Update library-release.aar(libgdiplus.so)、add x86 | (完整立绘功能只支持Android M以上)

parent 1e33917e
Show whitespace changes
Inline Side-by-side
Showing with 234 additions and 184 deletions
AI_core_vs2017solution/build/android/jni/Application.mk
View file @ e44c70e9
#APP_BUILD_SCRIPT := Android.mk
APP_PLATFORM :=android-14
APP_ABI := armeabi-v7a
APP_ABI := armeabi-v7a x86
APP_STL := gnustl_static
APP_CPPFLAGS := -Wno-error=format-security -std=gnu++11 -fpermissive -fexceptions
APP_OPTIM := release
Assets/Plugins/Android/libs/x86.meta 0 → 100644
View file @ e44c70e9
fileFormatVersion: 2
guid: 450e0a9c89bf4a040b26f1fef13f5655
folderAsset: yes
timeCreated: 1445131378
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android/libs/x86/libocgcore.so.meta 0 → 100644
View file @ e44c70e9
fileFormatVersion: 2
guid: 53795d48a20b9524180c4bf4481385f1
timeCreated: 1526547438
licenseType: Free
PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
data:
first:
Android: Android
second:
enabled: 1
settings:
CPU: x86
data:
first:
Any:
second:
enabled: 0
settings: {}
data:
first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Android/libs/x86/libsqlite3.so.meta 0 → 100644
View file @ e44c70e9
fileFormatVersion: 2
guid: fa9cbdc3a67e5fd4baeb5d0dd3f4cf71
timeCreated: 1445131383
licenseType: Free
PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
data:
first:
Android: Android
second:
enabled: 1
settings:
CPU: x86
data:
first:
Any:
second:
enabled: 0
settings: {}
data:
first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:
Assets/SibylSystem/Program.cs
View file @ e44c70e9
......@@ -277,6 +277,12 @@ public class Program : MonoBehaviour
//YGOPro2 Path (https://github.com/Unicorn369/YGOPro2_Droid/tree/Test) //Multi-language support
public static string ANDROID_GAME_PATH = "/storage/emulated/0/ygocore/";//YGOMobile Path
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
public static bool ANDROID_SDK_M = true;
#elif UNITY_ANDROID || UNITY_IPHONE //Mobile Platform
public static bool ANDROID_SDK_M = false;
#endif
void initialize()
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
......@@ -285,7 +291,7 @@ public class Program : MonoBehaviour
#elif UNITY_ANDROID //Android
Screen.sleepTimeout = SleepTimeout.NeverSleep;
if (!File.Exists(ANDROID_GAME_PATH + "updates/version1.1.txt"))
if (!File.Exists(ANDROID_GAME_PATH + "updates/version2.0.txt"))
{
string filePath = Application.streamingAssetsPath + "/ygocore.zip";
var www = new WWW(filePath);
......@@ -299,7 +305,7 @@ public class Program : MonoBehaviour
#elif UNITY_IPHONE //iPhone
string GamePaths = Application.persistentDataPath + "/ygopro2/";
if (!File.Exists(GamePaths + "updates/version1.1.txt"))
if (!File.Exists(GamePaths + "updates/version2.0.txt"))
{
string filePath = Application.streamingAssetsPath + "/ygocore.zip";
var www = new WWW(filePath);
......@@ -376,11 +382,22 @@ public class Program : MonoBehaviour
{
if (File.Exists("pics.zip")) {//YGOMobile内置的卡图包
jo.Call("doExtractZipFile", "pics.zip", ANDROID_GAME_PATH);
File.Create("updates/image_version1.1.txt");
File.Copy("updates/version2.0.txt", "updates/image_version1.1.txt", true);
} else {
jo.Call("showToast", "没有发现卡图包，是否未安装YGOMobile");
Application.OpenURL("https://www.taptap.com/app/37972");
jo.Call("showToast", "没有发现卡图包，是否未安装YGOMobile");
}
}
/*
* 使用Termux编译生成的：libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android)
* 经测试，只有Android M以上才能正常使用。为了让Android M以下的也能使用，只好多做一下判断
*/
bool SDK = jo.Call<bool>("SdkInt");
if (SDK == true) { //Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
ANDROID_SDK_M = true;
} else {
ANDROID_SDK_M = false;
}
#endif
});
......
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
View file @ e44c70e9
......@@ -25,7 +25,6 @@ public class GameTextureManager
static HttpDldFile df = new HttpDldFile();
private static readonly Semaphore _sem = new Semaphore(30, 30);
public class BitmapHelper
{
public System.Drawing.Color[,] colors = null;
......@@ -228,18 +227,15 @@ public class GameTextureManager
}
if (pic.type == GameTextureType.card_feature)
{
_sem.WaitOne();
new Thread(() => ProcessingCardFeature(pic)).Start();
ProcessingCardFeature(pic);
}
if (pic.type == GameTextureType.card_picture)
{
_sem.WaitOne();
new Thread(() => ProcessingCardPicture(pic)).Start();
ProcessingCardPicture(pic);
}
if (pic.type == GameTextureType.card_verticle_drawing)
{
_sem.WaitOne();
new Thread(() => ProcessingVerticleDrawing(pic)).Start();
ProcessingVerticleDrawing(pic);
}
}
}
......@@ -258,7 +254,7 @@ public class GameTextureManager
if (File.Exists("picture/closeup/" + pic.code.ToString() + ".png"))
{
string path = "picture/closeup/" + pic.code.ToString() + ".png";
#if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_ANDROID //编译器、Windows、Android
if (Program.ANDROID_SDK_M) {
BitmapHelper bitmap = new BitmapHelper(path);
int left;
int right;
......@@ -288,13 +284,7 @@ public class GameTextureManager
}
}
caculateK(pic);
/*
* 以上处理iOS平台无法正常使用
* Android已成功编译 libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android.git)
* 暂时只能直接贴图，以后再处理
**/
#elif UNITY_IPHONE //iPhone
} else {
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
......@@ -303,7 +293,7 @@ public class GameTextureManager
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
......@@ -392,10 +382,6 @@ public class GameTextureManager
{
Debug.Log("e 1" + e.ToString());
}
finally
{
_sem.Release();
}
}
private static void caculateK(PictureResource pic)
......@@ -594,7 +580,7 @@ public class GameTextureManager
string path = "picture/closeup/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_ANDROID //编译器、Windows、Android
if (Program.ANDROID_SDK_M) {
path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
......@@ -627,16 +613,8 @@ public class GameTextureManager
pic.hashed_data = getCuttedPic(path, pic.pCard, Iam8);
softVtype(pic, 0.5f);
pic.k = 1;
//pic.autoMade = true;
/*
* 以上处理iOS平台无法正常使用
* Android已成功编译libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android.git)
* 暂时只能直接贴图，以后再处理
**/
#elif UNITY_IPHONE //iPhone
} else {
path = "picture/null.png";
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
......@@ -645,11 +623,11 @@ public class GameTextureManager
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
}
}
else
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_ANDROID //编译器、Windows、Android
if (Program.ANDROID_SDK_M) {
BitmapHelper bitmap = new BitmapHelper(path);
int left;
int right;
......@@ -701,13 +679,7 @@ public class GameTextureManager
softVtype(pic, 0.7f);
}
caculateK(pic);
/*
* 以上处理iOS平台无法正常使用
* Android已成功编译libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android.git)
* 暂时只能直接贴图，以后再处理
**/
#elif UNITY_IPHONE //iPhone
} else {
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
......@@ -716,7 +688,7 @@ public class GameTextureManager
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
}
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
......@@ -728,10 +700,6 @@ public class GameTextureManager
{
Debug.Log("e 3" + e.ToString());
}
finally
{
_sem.Release();
}
}
private static void softVtype(PictureResource pic, float si)
......@@ -851,10 +819,6 @@ public class GameTextureManager
catch (Exception e)
{
Debug.Log("e 2" + e.ToString());
}
finally
{
_sem.Release();
}
}
......
Assets/SibylSystem/ResourceManagers/HttpDldFile.cs
View file @ e44c70e9
......@@ -10,7 +10,6 @@ using UnityEngine;
public class HttpDldFile
{
private readonly System.Threading.Semaphore semaphore = new System.Threading.Semaphore(6, 6);
public bool Download(string url, string filename)
{
bool flag = false;
......@@ -25,17 +24,14 @@ public class HttpDldFile
{
ServicePointManager.ServerCertificateValidationCallback = MyRemoteCertificateValidationCallback;
//authorization needed to acces github
if (Path.GetExtension(filename).Contains("png"))
{
//client.Headers.Add(HttpRequestHeader.Authorization, string.Concat("token ", RepoData.GetToken()));
client.Timeout = 6500;
}
if (Path.GetExtension(filename).Contains("jpg"))
{
client.Timeout = 3500;
}
semaphore.WaitOne();
client.DownloadFile(new Uri(url), filename + ".tmp");
}
flag = true;
......@@ -49,10 +45,6 @@ public class HttpDldFile
{
flag = false;
}
finally
{
semaphore.Release();
}
return flag;
}
public static bool MyRemoteCertificateValidationCallback(System.Object sender,
......
ProjectSettings/ProjectSettings.asset
View file @ e44c70e9
......@@ -149,7 +149,7 @@ PlayerSettings:
buildNumber:
iOS:
AndroidBundleVersionCode: 2
AndroidMinSdkVersion: 21
AndroidMinSdkVersion: 16
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0
aotOptions:
......@@ -225,7 +225,7 @@ PlayerSettings:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:
appleEnableAutomaticSigning: 0
AndroidTargetDevice: 3
AndroidTargetDevice: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName: ygopro.jks
......
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