Commit 1e33917e authored by 無名の凝泪's avatar 無名の凝泪

Update library-release.aar(add libgdiplus) | Only Support Android 5.0+

parent 68b5410a
#APP_BUILD_SCRIPT := Android.mk #APP_BUILD_SCRIPT := Android.mk
APP_PLATFORM :=android-14 APP_PLATFORM :=android-14
APP_ABI := armeabi-v7a x86 APP_ABI := armeabi-v7a
APP_STL := gnustl_static APP_STL := gnustl_static
APP_CPPFLAGS := -Wno-error=format-security -std=gnu++11 -fpermissive -fexceptions APP_CPPFLAGS := -Wno-error=format-security -std=gnu++11 -fpermissive -fexceptions
APP_OPTIM := release APP_OPTIM := release
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4288e383ed17c8c4a93d8d3a1395dafd guid: 4288e383ed17c8c4a93d8d3a1395dafd
folderAsset: yes folderAsset: yes
timeCreated: 1526538476 timeCreated: 1552532408
licenseType: Free licenseType: Free
DefaultImporter: DefaultImporter:
userData: userData:
......
fileFormatVersion: 2
guid: 450e0a9c89bf4a040b26f1fef13f5655
folderAsset: yes
timeCreated: 1445131378
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
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:
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:
...@@ -258,7 +258,7 @@ public class GameTextureManager ...@@ -258,7 +258,7 @@ public class GameTextureManager
if (File.Exists("picture/closeup/" + pic.code.ToString() + ".png")) if (File.Exists("picture/closeup/" + pic.code.ToString() + ".png"))
{ {
string path = "picture/closeup/" + pic.code.ToString() + ".png"; string path = "picture/closeup/" + pic.code.ToString() + ".png";
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows #if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_ANDROID //编译器、Windows、Android
BitmapHelper bitmap = new BitmapHelper(path); BitmapHelper bitmap = new BitmapHelper(path);
int left; int left;
int right; int right;
...@@ -290,10 +290,11 @@ public class GameTextureManager ...@@ -290,10 +290,11 @@ public class GameTextureManager
caculateK(pic); caculateK(pic);
/* /*
* 以上处理其他平台无法正常使用 * 以上处理iOS平台无法正常使用
* Android已成功编译 libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android.git)
* 暂时只能直接贴图,以后再处理 * 暂时只能直接贴图,以后再处理
*/ **/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone #elif UNITY_IPHONE //iPhone
byte[] data; byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read)) using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{ {
...@@ -593,7 +594,7 @@ public class GameTextureManager ...@@ -593,7 +594,7 @@ public class GameTextureManager
string path = "picture/closeup/" + pic.code.ToString() + ".png"; string path = "picture/closeup/" + pic.code.ToString() + ".png";
if (!File.Exists(path)) if (!File.Exists(path))
{ {
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows #if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_ANDROID //编译器、Windows、Android
path = "picture/card/" + pic.code.ToString() + ".png"; path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path)) if (!File.Exists(path))
{ {
...@@ -629,10 +630,11 @@ public class GameTextureManager ...@@ -629,10 +630,11 @@ public class GameTextureManager
//pic.autoMade = true; //pic.autoMade = true;
/* /*
* 以上处理其他平台无法正常使用 * 以上处理iOS平台无法正常使用
* Android已成功编译libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android.git)
* 暂时只能直接贴图,以后再处理 * 暂时只能直接贴图,以后再处理
*/ **/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone #elif UNITY_IPHONE //iPhone
path = "picture/null.png"; path = "picture/null.png";
byte[] data; byte[] data;
...@@ -647,7 +649,7 @@ public class GameTextureManager ...@@ -647,7 +649,7 @@ public class GameTextureManager
} }
else else
{ {
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows #if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_ANDROID //编译器、Windows、Android
BitmapHelper bitmap = new BitmapHelper(path); BitmapHelper bitmap = new BitmapHelper(path);
int left; int left;
int right; int right;
...@@ -701,10 +703,11 @@ public class GameTextureManager ...@@ -701,10 +703,11 @@ public class GameTextureManager
caculateK(pic); caculateK(pic);
/* /*
* 以上处理其他平台无法正常使用 * 以上处理iOS平台无法正常使用
* Android已成功编译libgdiplus.so (https://github.com/Unicorn369/libgdiplus-Android.git)
* 暂时只能直接贴图,以后再处理 * 暂时只能直接贴图,以后再处理
*/ **/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone #elif UNITY_IPHONE //iPhone
byte[] data; byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read)) using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{ {
......
...@@ -10,8 +10,8 @@ PlayerSettings: ...@@ -10,8 +10,8 @@ PlayerSettings:
targetDevice: 2 targetDevice: 2
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: "YGOPro2\uFF08Beta\uFF09" companyName: YGOPro2 (Test)
productName: "YGOPro2\uFF08Beta\uFF09" productName: YGOPro2 (Test)
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1} m_SplashScreenBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21176471, a: 1}
...@@ -123,7 +123,7 @@ PlayerSettings: ...@@ -123,7 +123,7 @@ PlayerSettings:
16:10: 1 16:10: 1
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 1.034.8 bundleVersion: 1.034.8 (Test 2.0)
preloadedAssets: [] preloadedAssets: []
metroInputSource: 0 metroInputSource: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1
...@@ -149,7 +149,7 @@ PlayerSettings: ...@@ -149,7 +149,7 @@ PlayerSettings:
buildNumber: buildNumber:
iOS: iOS:
AndroidBundleVersionCode: 2 AndroidBundleVersionCode: 2
AndroidMinSdkVersion: 16 AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 0 AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0 AndroidPreferredInstallLocation: 0
aotOptions: aotOptions:
...@@ -225,7 +225,7 @@ PlayerSettings: ...@@ -225,7 +225,7 @@ PlayerSettings:
iOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID:
appleEnableAutomaticSigning: 0 appleEnableAutomaticSigning: 0
AndroidTargetDevice: 0 AndroidTargetDevice: 3
AndroidSplashScreenScale: 0 AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0} androidSplashScreen: {fileID: 0}
AndroidKeystoreName: ygopro.jks 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