From 523a8c5b8de799aeaeaa7287f0b4f9e2edf339ee Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期五, 20 十一月 2020 15:32:37 +0800
Subject: [PATCH] 9527 新版sdk交互相关修改
---
Assets/Plugins/Android/libs/armeabi/liblzma.so | 0
Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so | 0
.gitignore | 3
Assets/Editor/VersionConfigs/Versions.txt | 2
Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so | 0
Assets/Plugins/Android/libs/armeabi/libjcore121.so.meta | 32 ++
Assets/Plugins/Android/libs/x86/libxlua.so | 0
Assets/Plugins/Android/libs/armeabi/libBugly.so | 0
Assets/Plugins/Android/libs/armeabi/libopus.so.meta | 32 ++
Assets/Plugins/Android/libs/x86/libjcore121.so | 0
Assets/Plugins/Android/libs/x86/libxlua.so.meta | 33 +++
Assets/Resources/VersionConfig.asset | 8
ProjectSettings/EditorBuildSettings.asset | 6
Assets/Plugins/Android/libs/x86/liblzma.so | 0
Assets/Plugins/Android/libs/x86/liblzma.so.meta | 33 +++
Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so | 0
Assets/Plugins/Android/libs/armeabi-v7a/libopus.so | 0
Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta | 33 +++
Assets/Plugins/Android/libs/arm64-v8a/libxlua.so.meta | 33 +++
Assets/Plugins/Android/libs/x86.meta | 8
Assets/Editor/Tool/AssetBundleBuildTool.cs | 29 +
Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so.meta | 33 +++
Assets/Plugins/Android/libs/armeabi-v7a.meta | 8
Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so.meta | 33 +++
Assets/Plugins/Android/libs/armeabi/liblzma.so.meta | 32 ++
Assets/Plugins/Android/libs/armeabi.meta | 8
Assets/Plugins/Android/libs/armeabi/libjcore121.so | 0
Assets/Plugins/Android/libs/arm64-v8a/libxlua.so | 0
Assets/Plugins/Android/libs/x86/libopus.so.meta | 33 +++
Assets/Plugins/Android/libs/armeabi/libopus.so | 0
Assets/Plugins/Android/libs/armeabi/libBugly.so.meta | 32 ++
Assets/Plugins/Android/libs/x86/libBugly.so.meta | 33 +++
Assets/Plugins/Android/libs/arm64-v8a.meta | 8
Assets/Plugins/Android/libs/x86/libBugly.so | 0
Assets/Editor/Tool/ClientPackage_Standalone.cs | 2
Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so | 0
ProjectSettings/ProjectSettings.asset | 8
Assets/Editor/Tool/ClientPackage.cs | 38 ++
Assets/Plugins/Android/libs/x86/libjcore121.so.meta | 33 +++
Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so.meta | 33 +++
Assets/Plugins/Android/libs/x86/libopus.so | 0
Assets/Plugins/Android/libs.meta | 8
Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so.meta | 24 ++
43 files changed, 590 insertions(+), 28 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8ad5a8c..96bd263 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,5 @@
/Snxxz_Android.userprefs
/Assets/VSCode.meta
/Assets/VSCode
-/Assets/Plugins/Android
+/Assets/Plugins/Android/The2thWorldSDK
+/Assets/Plugins/Android/bin.meta
diff --git a/Assets/Editor/Tool/AssetBundleBuildTool.cs b/Assets/Editor/Tool/AssetBundleBuildTool.cs
index 69a6925..187440f 100644
--- a/Assets/Editor/Tool/AssetBundleBuildTool.cs
+++ b/Assets/Editor/Tool/AssetBundleBuildTool.cs
@@ -12,27 +12,40 @@
static void DoIt()
{
BuildAssetBundleOptions opt = BuildAssetBundleOptions.ChunkBasedCompression | BuildAssetBundleOptions.DeterministicAssetBundle | BuildAssetBundleOptions.StrictMode;
- string outputPath = StringUtility.Contact(Application.streamingAssetsPath, Path.AltDirectorySeparatorChar, EditorUserBuildSettings.activeBuildTarget.ToString());
+
+ string outputPath = StringUtility.Contact(System.Environment.CurrentDirectory, "/AssetBundles/", EditorUserBuildSettings.activeBuildTarget.ToString());
+ string streamingPath = StringUtility.Contact(Application.streamingAssetsPath, Path.AltDirectorySeparatorChar, EditorUserBuildSettings.activeBuildTarget.ToString());
+
if (!Directory.Exists(outputPath))
Directory.CreateDirectory(outputPath);
- AssetBundleBuildExtersion.Build(outputPath, "builtin", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "builtin", opt, EditorUserBuildSettings.activeBuildTarget, false);
- AssetBundleBuildExtersion.Build(outputPath, "audio", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "audio", opt, EditorUserBuildSettings.activeBuildTarget, false);
- AssetBundleBuildExtersion.Build(outputPath, "mobeffectshader", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "mobeffectshader", opt, EditorUserBuildSettings.activeBuildTarget, false);
- AssetBundleBuildExtersion.Build(outputPath, "config", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "config", opt, EditorUserBuildSettings.activeBuildTarget, false);
TableTool.CopyConfigsToOutPutPath(StringUtility.Contact(outputPath, "/config"));
LuaBuildHelper.OnPreBuild();
UpdateLuaSetting.SetAllLuaAssetBundleName();
- AssetBundleBuildExtersion.Build(outputPath, "lua", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "lua", opt, EditorUserBuildSettings.activeBuildTarget, false);
LuaBuildHelper.OnPostBuild();
- AssetBundleBuildExtersion.Build(outputPath, "maps", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "maps", opt, EditorUserBuildSettings.activeBuildTarget, false);
- AssetBundleBuildExtersion.Build(outputPath, "ui", opt, EditorUserBuildSettings.activeBuildTarget,false);
+ AssetBundleBuildExtersion.Build(outputPath, "ui", opt, EditorUserBuildSettings.activeBuildTarget, false);
+
+ var fileInfos = new List<FileInfo>();
+ FileExtersion.GetAllDirectoryFileInfos(outputPath, fileInfos);
+ AssetsVersionMaker.WriteAssetsVersionFile(outputPath, fileInfos);
+
+ if (Directory.Exists(streamingPath))
+ Directory.Delete(streamingPath, true);
+
+ FileExtersion.DirectoryCopy(outputPath, streamingPath);
+
}
}
diff --git a/Assets/Editor/Tool/ClientPackage.cs b/Assets/Editor/Tool/ClientPackage.cs
index ff36db7..5a48812 100644
--- a/Assets/Editor/Tool/ClientPackage.cs
+++ b/Assets/Editor/Tool/ClientPackage.cs
@@ -34,7 +34,8 @@
set { LocalSave.SetInt("HalfAssetPrior", value); }
}
- static string ANDROID_PLUGIN_PATH = Application.dataPath + "/Plugins/Android";
+ static string THE_2TH_WORLD_SDK_PATH = Application.dataPath + "/Plugins/Android/bin";
+ static string MANIFEST_PATH = Application.dataPath + "/Plugins/Android/AndroidManifest.xml";
static string iOS_PLUGIN_PATH = Application.dataPath + "/Plugins/iOS";
/// <summary>
@@ -408,14 +409,39 @@
PlayerSettings.enableInternalProfiler = _development;
- if (Directory.Exists(ANDROID_PLUGIN_PATH))
+ //鍒犻櫎鍘焥dk鏂囦欢
+ if (Directory.Exists(THE_2TH_WORLD_SDK_PATH))
+ Directory.Delete(THE_2TH_WORLD_SDK_PATH, true);
+ //鍒犻櫎鍘熸竻鍗曟枃浠�
+ if (File.Exists(MANIFEST_PATH))
+ File.Delete(MANIFEST_PATH);
+
+ var variant = _development ? "debug" : "release";
+
+ var manifestpath = StringUtility.Contact(_sdkPath, "/Channel/Android/", versionConfig.appId, "/AndroidManifest.xml");
+ var channelSdkPath = StringUtility.Contact(_sdkPath, "/Channel/Android/", versionConfig.appId, "/", variant);
+
+ if (File.Exists(manifestpath))
{
- Directory.Delete(ANDROID_PLUGIN_PATH, true);
+ File.Copy(manifestpath, MANIFEST_PATH);
+ DebugEx.LogFormat("鎵цAndroid 娓呭崟鏂囦欢鎷疯礉锛宖rom:{0};to:{1}", manifestpath, MANIFEST_PATH);
+ }
+ else
+ {
+ DebugEx.LogFormat("Android 娓呭崟鏂囦欢涓嶅瓨鍦紝{0}", manifestpath);
+ // return;
}
- Debug.LogFormat("鎵цAndroid SDK 鏂囦欢鎷疯礉锛宖rom:{0};to:{1}", StringUtility.Contact(_sdkPath, "/Android/release"), ANDROID_PLUGIN_PATH);
- FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/Android/release"), ANDROID_PLUGIN_PATH);
- FileExtersion.DirectoryCopy(StringUtility.Contact(_sdkPath, "/ChannelDiff/Android/", versionConfig.appId), ANDROID_PLUGIN_PATH);
+ if (Directory.Exists(channelSdkPath))
+ {
+ FileExtersion.DirectoryCopy(channelSdkPath, THE_2TH_WORLD_SDK_PATH);
+ DebugEx.LogFormat("鎵цAndroid 娓犻亾SDK 鏂囦欢鎷疯礉锛宖rom:{0};to:{1}", channelSdkPath, THE_2TH_WORLD_SDK_PATH);
+ }
+ else
+ {
+ DebugEx.LogFormat("Android 娓犻亾SDK鏂囦欢涓嶅瓨鍦紝{0}", channelSdkPath);
+ return;
+ }
var option = AssetDatabase.LoadAssetAtPath<Options>("Assets/Editor/Beebyte/Obfuscator/ObfuscatorOptions.asset");
if (option != null)
diff --git a/Assets/Editor/Tool/ClientPackage_Standalone.cs b/Assets/Editor/Tool/ClientPackage_Standalone.cs
index 16d5df4..0aeb900 100644
--- a/Assets/Editor/Tool/ClientPackage_Standalone.cs
+++ b/Assets/Editor/Tool/ClientPackage_Standalone.cs
@@ -378,7 +378,7 @@
PlayerSettings.SetAspectRatio(AspectRatio.Aspect5by4, false);
PlayerSettings.SetAspectRatio(AspectRatio.AspectOthers, false);
- PlayerSettings.defaultIsFullScreen = true;
+ PlayerSettings.fullScreenMode = FullScreenMode.FullScreenWindow;
PlayerSettings.enableInternalProfiler = development;
}
catch (Exception ex)
diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt
index cb2e2ba..9c25973 100644
--- a/Assets/Editor/VersionConfigs/Versions.txt
+++ b/Assets/Editor/VersionConfigs/Versions.txt
@@ -7,4 +7,4 @@
16 mgxbqy mgxbqy 1 2.0.600 5001 2 xbqy 1 1 姊︾伒浼犺 com.mhtj.mg shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) mggame 0 1
900 mgxbqy mgxbqy 1 2.0.600 5001 2 xbqy 3 1 姊︾伒浼犺 com.mhtj.mg shandangceshi shandangceshi2018 shandangceshi shandangceshi2018 0 0 (0,80) mggame 0 1
9998 xmyjgame xmyjgame 1 1.100.2 aaa 4 xbqy 1 1 浠欓瓟鎴樺満 com.xfzc.yj.quick mengxiandao mengxiandao2020 mengxiandao mengxiandao2020 0 0 (-15,64) 鍑虹増鍗曚綅鍚嶇О:澶╂触鐢靛瓙鍑虹増绀炬湁闄愬叕鍙� 钁椾綔鏉冧汉鍚嶇О:骞垮窞绉掍箰缃戠粶绉戞妧鏈夐檺鍏徃</r>杩愯惀鍗曚綅:骞垮窞娓歌矾缃戠粶绉戞妧鏈夐檺鍏徃 娓告垙鍐呭绫诲埆:绉诲姩娓告垙 鎵规枃鍙�:鍥芥柊鍑哄[2019]1132鍙� 娓告垙鐗堝彿:ISBN 978-7-498-06329-8 xmyjgame 0
-9527 TheSecondWorld test 0 2.0.600 aaa 2 xbqy 2 1 浠欏疂濂囩紭 com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 0 0 (-32,144) 0
+9527 TheSecondWorld test 0 1.100.1 aaa 2 xbqy 3 1 浠欏疂濂囩紭 com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 0 0 (-32,144) 0
diff --git a/Assets/Plugins/Android/libs.meta b/Assets/Plugins/Android/libs.meta
new file mode 100644
index 0000000..1e9389f
--- /dev/null
+++ b/Assets/Plugins/Android/libs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 14972cdbccd6a2e45a4e5c520b9ce3d6
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/arm64-v8a.meta b/Assets/Plugins/Android/libs/arm64-v8a.meta
new file mode 100644
index 0000000..fadc11e
--- /dev/null
+++ b/Assets/Plugins/Android/libs/arm64-v8a.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae96f4cb49698b543bfb02fdd8866948
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/arm64-v8a/libxlua.so b/Assets/Plugins/Android/libs/arm64-v8a/libxlua.so
new file mode 100644
index 0000000..2a75f51
--- /dev/null
+++ b/Assets/Plugins/Android/libs/arm64-v8a/libxlua.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/arm64-v8a/libxlua.so.meta b/Assets/Plugins/Android/libs/arm64-v8a/libxlua.so.meta
new file mode 100644
index 0000000..1cbeb96
--- /dev/null
+++ b/Assets/Plugins/Android/libs/arm64-v8a/libxlua.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 6c76d1cfa11c6b741ba30b24d36cbcf2
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: ARM64
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a.meta b/Assets/Plugins/Android/libs/armeabi-v7a.meta
new file mode 100644
index 0000000..fdda7ae
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0a2359522b6015a4aa51c941d460854c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so b/Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so
new file mode 100644
index 0000000..209a553
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so.meta
new file mode 100644
index 0000000..698845a
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libBugly.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: c9cdbdcbc4b089a4790f80e22bad555a
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: ARMv7
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so b/Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so
new file mode 100644
index 0000000..a0484c2
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so.meta
new file mode 100644
index 0000000..efd59c5
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libjcore121.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: dc2b560e6b397a94ea141ee817308c8c
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: ARMv7
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so b/Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so
new file mode 100644
index 0000000..8234bec
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so.meta
new file mode 100644
index 0000000..b11855e
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/liblzma.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 2fe915c5611889d429d95c04cac4aa32
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: ARMv7
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so b/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so
new file mode 100644
index 0000000..c41f71f
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta
new file mode 100644
index 0000000..0957150
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 7f6f1fa45f740e4499d165a5229cfbc4
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: ARMv7
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so b/Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so
new file mode 100644
index 0000000..a756ac8
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so.meta
new file mode 100644
index 0000000..2e4b59d
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libxlua.so.meta
@@ -0,0 +1,24 @@
+fileFormatVersion: 2
+guid: 6e1b2e17cce240d4c8ff5457ac996e0d
+timeCreated: 1451443249
+licenseType: Pro
+PluginImporter:
+ serializedVersion: 1
+ iconMap: {}
+ executionOrder: {}
+ isPreloaded: 0
+ platformData:
+ Android:
+ enabled: 1
+ settings:
+ CPU: ARMv7
+ Any:
+ enabled: 0
+ settings: {}
+ Editor:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi.meta b/Assets/Plugins/Android/libs/armeabi.meta
new file mode 100644
index 0000000..857aa27
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 756d5bd706fd20f4ba5a6a159238ad6d
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi/libBugly.so b/Assets/Plugins/Android/libs/armeabi/libBugly.so
new file mode 100644
index 0000000..ee73de4
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/libBugly.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi/libBugly.so.meta b/Assets/Plugins/Android/libs/armeabi/libBugly.so.meta
new file mode 100644
index 0000000..f2101f7
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/libBugly.so.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: e9bd64f821527644883c202cd4c43abc
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi/libjcore121.so b/Assets/Plugins/Android/libs/armeabi/libjcore121.so
new file mode 100644
index 0000000..212eefd
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/libjcore121.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi/libjcore121.so.meta b/Assets/Plugins/Android/libs/armeabi/libjcore121.so.meta
new file mode 100644
index 0000000..7ac65cd
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/libjcore121.so.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: ca5d120102b47d240a18780072b181de
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi/liblzma.so b/Assets/Plugins/Android/libs/armeabi/liblzma.so
new file mode 100644
index 0000000..8234bec
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/liblzma.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi/liblzma.so.meta b/Assets/Plugins/Android/libs/armeabi/liblzma.so.meta
new file mode 100644
index 0000000..9c2cc4c
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/liblzma.so.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: e548dfa5f9de7f04bac56bfddfb1e1c8
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi/libopus.so b/Assets/Plugins/Android/libs/armeabi/libopus.so
new file mode 100644
index 0000000..ce12474
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/libopus.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/armeabi/libopus.so.meta b/Assets/Plugins/Android/libs/armeabi/libopus.so.meta
new file mode 100644
index 0000000..52721c4
--- /dev/null
+++ b/Assets/Plugins/Android/libs/armeabi/libopus.so.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 7046213c2842c324e8f44bcd55c89e83
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86.meta b/Assets/Plugins/Android/libs/x86.meta
new file mode 100644
index 0000000..7e866cb
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 81bd62a2c2fd1bc45bfa3176948f1ce8
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86/libBugly.so b/Assets/Plugins/Android/libs/x86/libBugly.so
new file mode 100644
index 0000000..571b120
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libBugly.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/x86/libBugly.so.meta b/Assets/Plugins/Android/libs/x86/libBugly.so.meta
new file mode 100644
index 0000000..1f8d5ca
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libBugly.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: b5f37d2635522b64a858008c47d3bcdc
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: x86
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86/libjcore121.so b/Assets/Plugins/Android/libs/x86/libjcore121.so
new file mode 100644
index 0000000..2e1b23e
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libjcore121.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/x86/libjcore121.so.meta b/Assets/Plugins/Android/libs/x86/libjcore121.so.meta
new file mode 100644
index 0000000..64f9281
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libjcore121.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: bc15f7298cc4dc74999a61724029d1e2
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: x86
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86/liblzma.so b/Assets/Plugins/Android/libs/x86/liblzma.so
new file mode 100644
index 0000000..b8db604
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/liblzma.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/x86/liblzma.so.meta b/Assets/Plugins/Android/libs/x86/liblzma.so.meta
new file mode 100644
index 0000000..e2e4c1a
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/liblzma.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: ed152573161e91a4e8f04836e68a43c1
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: x86
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86/libopus.so b/Assets/Plugins/Android/libs/x86/libopus.so
new file mode 100644
index 0000000..9024bdf
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libopus.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/x86/libopus.so.meta b/Assets/Plugins/Android/libs/x86/libopus.so.meta
new file mode 100644
index 0000000..f2b6725
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libopus.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 60087e115971d284e979bcf12138ae8d
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: x86
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86/libxlua.so b/Assets/Plugins/Android/libs/x86/libxlua.so
new file mode 100644
index 0000000..711ecc2
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libxlua.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/x86/libxlua.so.meta b/Assets/Plugins/Android/libs/x86/libxlua.so.meta
new file mode 100644
index 0000000..268d957
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86/libxlua.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 038a89637b659e346a7a712ce0c9271b
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings:
+ CPU: x86
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/VersionConfig.asset b/Assets/Resources/VersionConfig.asset
index 0d3c7c2..30607e8 100644
--- a/Assets/Resources/VersionConfig.asset
+++ b/Assets/Resources/VersionConfig.asset
@@ -15,10 +15,10 @@
m_AppId: test
m_SpID:
m_VersionAuthority: 0
- m_Version: 2.0.600
+ m_Version: 1.100.1
m_ClientPackageFlag: aaa
m_Branch: 2
- m_AssetAccess: 2
+ m_AssetAccess: 3
m_PartAssetPackage: 1
m_ProductName: "\u4ED9\u5B9D\u5947\u7F18"
m_BundleIdentifier: com.secondworld.snxxz
@@ -29,7 +29,7 @@
m_AppleDeveloperTeamID:
m_DebugVersion: 0
m_IsBanShu: 0
- m_BuildTime: 20/11/17--15:01
- m_BuildIndex: 37
+ m_BuildTime: 20/11/20--14:43
+ m_BuildIndex: 53
m_LogoPosition: {x: -32, y: 144}
m_BanHao:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index b420103..df09a85 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,12 +6,12 @@
serializedVersion: 2
m_Scenes:
- enabled: 1
- path: Assets/Resources/Scenes/Empty.unity
- guid: 8cc0fbb0e0e718b48b8d0a780e029695
- - enabled: 1
path: Assets/Resources/Scenes/Launch.unity
guid: ce42599ef5679904385a13e8af0bdf4e
- enabled: 1
+ path: Assets/Resources/Scenes/Empty.unity
+ guid: 8cc0fbb0e0e718b48b8d0a780e029695
+ - enabled: 1
path: Assets/Art/Maps/Scenes/Map140_Qy.unity
guid: e5973c5204199184c9b77a05572c0d1b
- enabled: 1
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 6af5284..148a587 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -133,7 +133,7 @@
16:10: 1
16:9: 1
Others: 1
- bundleVersion: 2000600
+ bundleVersion: 1100001
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@@ -181,7 +181,7 @@
Standalone: com.secondworld.snxxz
iPhone: com.secondworld.snxxz
buildNumber: {}
- AndroidBundleVersionCode: 2000600
+ AndroidBundleVersionCode: 1100001
AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0
@@ -259,7 +259,7 @@
clonedFromGUID: 00000000000000000000000000000000
templatePackageId:
templateDefaultScene:
- AndroidTargetArchitectures: 1
+ AndroidTargetArchitectures: 3
AndroidSplashScreenScale: 2
androidSplashScreen: {fileID: 2800000, guid: 179f9801f106906489c8b6bcc9896c8a, type: 3}
AndroidKeystoreName: '{inproject}: Assets/Editor/Keystore/thesecondworld.keystore'
@@ -559,7 +559,7 @@
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0
actionOnDotNetUnhandledException: 1
- enableInternalProfiler: 0
+ enableInternalProfiler: 1
logObjCUncaughtExceptions: 1
enableCrashReportAPI: 0
cameraUsageDescription:
--
Gitblit v1.8.0