From 2fdb88b4d24d586f1e200ab17bf55ac55514e6b7 Mon Sep 17 00:00:00 2001
From: allez <305670599@qq.com>
Date: 星期四, 27 五月 2021 11:50:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/snxxz_client
---
Assets/Editor/Tool/UpdateAssetBundleName.cs | 6
Assets/Editor/Logo/gtios/Icon.png | 0
Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers/Bugly.h | 2
Assets/Editor/VersionConfigs/Versions.txt | 16 +-
Assets/Plugins/Android/libs/arm64-v8a/libopus.so | 0
Assets/Plugins/Android/mainTemplate.gradle | 13 +-
Assets/Plugins/Android/unityopus.aar.meta | 32 +++++
Assets/Firebase/Editor/generate_xml_from_google_services_json.py | 2
Assets/Plugins/Android/libs/armeabi-v7a/libopus.so | 0
Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta | 2
Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly | 0
Assets/Plugins/Android/libs/x86.meta | 3
Assets/Editor/Logo/gtgame/TB_DL_Logo.png | 0
Assets/Plugins/Android/unityopus.aar | 0
Assets/Plugins/Android/libs/armeabi-v7a.meta | 3
Assets/Plugins/x86_64/UnityOpus.dll.meta | 108 ++++++++++++++++++
Assets/ILRuntime/Src/ILBehaviourProxy.cs | 4
Assets/Plugins/Android/libs/x86/libopus.so.meta | 2
Assets/Plugins/Android/libs/x86_64.meta | 8 +
Assets/Editor/Logo/gtgame/Icon.png | 0
Assets/Plugins/Android/libs/x86_64/libopus.so.meta | 32 +++++
Assets/Editor/Logo/gtgame/SplashImage.png | 0
Assets/ILRuntime/Editor/ILRuntimeCLRBinding.cs | 1
Assets/Plugins/Android/libs/arm64-v8a.meta | 8 +
Assets/Editor/Logo/gtios/SplashImage.png | 0
Assets/Editor/XCodeProjectMod.cs | 37 +++++
Assets/Plugins/Android/libs/arm64-v8a/libopus.so.meta | 33 +++++
Assets/Plugins/Android/libs/x86/libopus.so | 0
Assets/Plugins/Android/libs.meta | 3
Assets/Plugins/Android/libs/x86_64/libopus.so | 0
Assets/Plugins/x86_64/UnityOpus.dll | 0
Assets/Editor/Logo/gtios/TB_DL_Logo.png | 0
Assets/ILRuntime/Src/ILLauncherProxy.cs | 23 +++
33 files changed, 311 insertions(+), 27 deletions(-)
diff --git a/Assets/Editor/Logo/gtgame/Icon.png b/Assets/Editor/Logo/gtgame/Icon.png
index 944d170..c49446c 100644
--- a/Assets/Editor/Logo/gtgame/Icon.png
+++ b/Assets/Editor/Logo/gtgame/Icon.png
Binary files differ
diff --git a/Assets/Editor/Logo/gtgame/SplashImage.png b/Assets/Editor/Logo/gtgame/SplashImage.png
index 7519127..fbf76e3 100644
--- a/Assets/Editor/Logo/gtgame/SplashImage.png
+++ b/Assets/Editor/Logo/gtgame/SplashImage.png
Binary files differ
diff --git a/Assets/Editor/Logo/gtgame/TB_DL_Logo.png b/Assets/Editor/Logo/gtgame/TB_DL_Logo.png
index 6ee3748..f7afb14 100644
--- a/Assets/Editor/Logo/gtgame/TB_DL_Logo.png
+++ b/Assets/Editor/Logo/gtgame/TB_DL_Logo.png
Binary files differ
diff --git a/Assets/Editor/Logo/gtios/Icon.png b/Assets/Editor/Logo/gtios/Icon.png
index 944d170..c49446c 100644
--- a/Assets/Editor/Logo/gtios/Icon.png
+++ b/Assets/Editor/Logo/gtios/Icon.png
Binary files differ
diff --git a/Assets/Editor/Logo/gtios/SplashImage.png b/Assets/Editor/Logo/gtios/SplashImage.png
index 7519127..fbf76e3 100644
--- a/Assets/Editor/Logo/gtios/SplashImage.png
+++ b/Assets/Editor/Logo/gtios/SplashImage.png
Binary files differ
diff --git a/Assets/Editor/Logo/gtios/TB_DL_Logo.png b/Assets/Editor/Logo/gtios/TB_DL_Logo.png
index 6ee3748..f7afb14 100644
--- a/Assets/Editor/Logo/gtios/TB_DL_Logo.png
+++ b/Assets/Editor/Logo/gtios/TB_DL_Logo.png
Binary files differ
diff --git a/Assets/Editor/Tool/UpdateAssetBundleName.cs b/Assets/Editor/Tool/UpdateAssetBundleName.cs
index 37e1af8..30c0508 100644
--- a/Assets/Editor/Tool/UpdateAssetBundleName.cs
+++ b/Assets/Editor/Tool/UpdateAssetBundleName.cs
@@ -512,8 +512,12 @@
if (extension == ".meta")
{
continue;
+ }
+
+ if (extension == ".DS_Store")
+ {
+ continue;
}
-
var directoryName = file.DirectoryName.Replace("\\", "/");
var relativeDirectory = directoryName.Replace(amendRootPath, "");
diff --git a/Assets/Editor/VersionConfigs/Versions.txt b/Assets/Editor/VersionConfigs/Versions.txt
index c5dbd9f..cf17e2c 100644
--- a/Assets/Editor/VersionConfigs/Versions.txt
+++ b/Assets/Editor/VersionConfigs/Versions.txt
@@ -1,14 +1,14 @@
锘縄d name AppId VersionAuthority m_Version m_ClientPackageFlag m_Branch m_GameId m_AssetAccess m_PartAssetPackage m_ProductName m_BundleIdentifier m_KeystoreFileName m_KeystorePassword m_KeystoreAlias m_KeystoreAliasPassword m_AppleDeveloperTeamID m_DebugVersion m_IsBanShu m_LogoPosition m_BanHao m_SpID m_Recharge m_CreateRolePattern
鐗堟湰鏍囪瘑 鐗堟湰鍚嶇О 娓犻亾id 鐗堟湰鏉冮檺锛�0鏄祴璇曠増鏈紝1鏄彂甯冪増鏈� 鐗堟湰鍙� 瀹㈡埛绔爣璇� 鍒嗘敮 娓告垙椤圭洰鏍囪瘑 璧勬簮,0NullAsset,1HalfAsset,2FullAsset,3IgnoreDownLoad 鏄惁鍒嗗寘锛�0涓嶅垎鍖咃紝1鍒嗗寘 浜у搧鍚� 浜у搧鍖呭悕 绛惧悕鏂囦欢鍚� 绛惧悕鏂囦欢瀵嗙爜 绛惧悕鏂囦欢鍒悕 绛惧悕鏂囦欢鍒悕瀵嗙爜 寮�鍙戣�呰处鍙峰瘑鐮� 鏄惁debug鐗堟湰锛�0鍚�1鏄� 鏄惁鐗堢讲鐗堟湰锛�0鍚�1鏄� 鐧诲綍鐣岄潰鐨凩ogo浣嶇疆 鐗堝彿 杩愯惀鍟咺D 鍏呭�肩晫闈㈤鏍� 鍒涜鍦烘櫙椋庢牸
10000 TheSecondWorld test 0 1.100.1 2021 7 xbqy 1 1 浠欏疂濂囩紭 com.secondworld.snxxz thesecondworld thesecondworld2018 thesecondworld thesecondworld2018 0 0 (-32,144) 0
-1 gtgame gtgame 1 1.100.5 2021 1 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
-2 gtgame gtgame 1 1.100.5 2021 2 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
-3 gtgame gtgame 1 1.100.6 2021 3 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
-11 gtios gtios 1 1.100.5 2021 11 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
-12 gtios gtios 1 1.100.5 2021 12 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
-13 gtios gtios 1 1.100.5 2021 13 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
-901 gtgame gtgame 1 1.100.5 2021 901 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
-911 gtios gtios 1 1.100.5 2021 911 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
+1 gtgame gtgame 1 1.100.7 2021 1 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
+2 gtgame gtgame 1 1.100.7 2021 2 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
+3 gtgame gtgame 1 1.100.7 2021 3 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
+11 gtios gtios 1 1.100.7 2021 11 xbqy 2 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
+12 gtios gtios 1 1.100.7 2021 12 xbqy 2 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
+13 gtios gtios 1 1.100.7 2021 13 xbqy 2 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
+901 gtgame gtgame 1 1.100.7 2021 901 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
+911 gtios gtios 1 1.100.7 2021 911 xbqy 1 1 閹瓟瑷� com.sanxiagame.zmjas gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtios 0 0
999 gtgame gtgame 1 1.0.0 2021 999 xbqy 0 0 閹瓟瑷� com.sanxiagame.zmjgp gtgame Fjsx123123 Key0 Fjsx123123 0 0 (0,80) gtgame 0 0
9998 xmyjgame xmyjgame 1 1.100.2 2021 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
diff --git a/Assets/Editor/XCodeProjectMod.cs b/Assets/Editor/XCodeProjectMod.cs
index b0c8fd5..5791439 100644
--- a/Assets/Editor/XCodeProjectMod.cs
+++ b/Assets/Editor/XCodeProjectMod.cs
@@ -38,7 +38,8 @@
project.AddBuildProperty(targetGUID, "OTHER_LDFLAGS", "-ObjC");
project.AddBuildProperty(targetGUID, "GCC_GENERATE_DEBUGGING_SYMBOLS", "NO");
-
+ //webkit
+ project.AddFrameworkToProject(fwTargetGUID, "WebKit.framework", true);
//bugly
project.AddFrameworkToProject(fwTargetGUID, "SystemConfiguration.framework", true);
project.AddFrameworkToProject(fwTargetGUID, "Security.framework", true);
@@ -110,9 +111,30 @@
rootDict.SetString("NSMicrophoneUsageDescription", "浣跨敤楹﹀厠椋庢潈闄�");
rootDict.SetString("NSPhotoLibraryAddUsageDescription", "浣跨敤鐩稿唽鏉冮檺,鐢ㄤ互瀛樺偍鎴睆鐨勮处鍙蜂俊鎭�,浠ラ槻蹇樿璐﹀彿瀵嗙爜");
+ //google login
+ var urlTypes = rootDict.CreateArray("CFBundleURLTypes");
+ var dic0 = urlTypes.AddDict();
+ dic0.SetString("CFBundleTypeRole", "Editor");
+ dic0.SetString("CFBundleURLName", "");
+ var cfArray0 = dic0.CreateArray("CFBundleURLSchemes");
+ cfArray0.AddString("com.sanxiagame.zmjas");
+
+ var dic1 = urlTypes.AddDict();
+ dic1.SetString("CFBundleTypeRole", "Editor");
+ dic1.SetString("CFBundleURLName", "");
+ var cfArray1 = dic1.CreateArray("CFBundleURLSchemes");
+ cfArray1.AddString("com.googleusercontent.apps.468442318367-ocoqrm0kei0gpkrnnq1ql628v4g4dbqd");
+
+ var dic2 = urlTypes.AddDict();
+ dic2.SetString("CFBundleTypeRole", "Editor");
+ dic2.SetString("CFBundleURLName", "");
+ var cfArray2 = dic2.CreateArray("CFBundleURLSchemes");
+ cfArray2.AddString("fb1749518565212194");
+
+ //facebook
rootDict.SetString("FacebookAppID", "1749518565212194");
- rootDict.SetString("FacebookDisplayName", "闀囬瓟璇�");
- var array = nsAppTransportSecurity.CreateArray("LSApplicationQueriesSchemes");
+ rootDict.SetString("FacebookDisplayName", "閹瓟瑷�");
+ var array = rootDict.CreateArray("LSApplicationQueriesSchemes");
array.AddString("fbapi");
array.AddString("fbauth2");
@@ -154,6 +176,15 @@
" _universalSDK = [[UniversalSDK alloc] init];\n [_universalSDK QuickSDKInit:application didFinishLaunchingWithOptions:launchOptions];";
xclass.WriteBelow("[KeyboardDelegate Initialize];", newCode);
+ //AF 鐢熷懡鍛ㄦ湡
+ xclass.WriteBelow("#import <AVFoundation/AVFoundation.h>", "#import <YYJPlatform/YYJPlatform.h>");
+ xclass.WriteBelow("[self removeSnapshotViewController];", "[[YYJPlatform yyj_defaultPlatform] yyj_applicationDidBecomeActive:application];");
+ xclass.WriteBelow("- (BOOL)application:(UIApplication*)app openURL:(NSURL*)url options:(NSDictionary<NSString*, id>*)options\n{",
+ "[[YYJPlatform yyj_defaultPlatform] yyj_application:app openURL:url options:options];");
+ xclass.WriteBelow("NSURL* url = userActivity.webpageURL;", "[[YYJPlatform yyj_defaultPlatform] yyj_application:application continueUserActivity:userActivity restorationHandler:restorationHandler];");
+ xclass.WriteBelow("- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))handler\n{",
+ "[[YYJPlatform yyj_defaultPlatform] yyj_application:application didReceiveRemoteNotification:userInfo fetchCompletionHandler:handler];");
+
/**淇敼UnityAppController.h 鏂囦欢**/
diff --git a/Assets/Firebase/Editor/generate_xml_from_google_services_json.py b/Assets/Firebase/Editor/generate_xml_from_google_services_json.py
index fbe91c6..913f8b6 100644
--- a/Assets/Firebase/Editor/generate_xml_from_google_services_json.py
+++ b/Assets/Firebase/Editor/generate_xml_from_google_services_json.py
@@ -121,7 +121,7 @@
json_struct = {
'project_info': {
'project_number': xml_dict['GCM_SENDER_ID'],
- 'firebase_url': xml_dict['DATABASE_URL'],
+ 'firebase_url': xml_dict.get('DATABASE_URL', ""),
'project_id': xml_dict['PROJECT_ID'],
'storage_bucket': xml_dict['STORAGE_BUCKET']
},
diff --git a/Assets/ILRuntime/Editor/ILRuntimeCLRBinding.cs b/Assets/ILRuntime/Editor/ILRuntimeCLRBinding.cs
index d796f06..ebcd4b5 100644
--- a/Assets/ILRuntime/Editor/ILRuntimeCLRBinding.cs
+++ b/Assets/ILRuntime/Editor/ILRuntimeCLRBinding.cs
@@ -30,6 +30,7 @@
typeof(Text),
typeof(Button),
typeof(Image),
+ typeof(Toggle),
//涓诲伐绋嬬浉鍏�
typeof(Redpoint),
typeof(Int2),
diff --git a/Assets/ILRuntime/Src/ILBehaviourProxy.cs b/Assets/ILRuntime/Src/ILBehaviourProxy.cs
index f28e34b..e8547b2 100644
--- a/Assets/ILRuntime/Src/ILBehaviourProxy.cs
+++ b/Assets/ILRuntime/Src/ILBehaviourProxy.cs
@@ -117,8 +117,10 @@
ILBehaviourHolder holder;
if (ilBehaviourHolders.TryGetValue(name, out holder))
{
- if (holder.onDisable != null)
+ if (holder.onDisable != null && appDomain != null)
+ {
appDomain.Invoke(holder.onDisable, holder.instance);
+ }
}
}
}
diff --git a/Assets/ILRuntime/Src/ILLauncherProxy.cs b/Assets/ILRuntime/Src/ILLauncherProxy.cs
index b419524..1ba12c5 100644
--- a/Assets/ILRuntime/Src/ILLauncherProxy.cs
+++ b/Assets/ILRuntime/Src/ILLauncherProxy.cs
@@ -203,6 +203,29 @@
});
});
+ appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<bool>>((act) =>
+ {
+ return new UnityEngine.Events.UnityAction<bool>((arg0) =>
+ {
+ ((System.Action<bool>)act)(arg0);
+ });
+ });
+
+ appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<float>>((act) =>
+ {
+ return new UnityEngine.Events.UnityAction<float>((arg0) =>
+ {
+ ((System.Action<float>)act)(arg0);
+ });
+ });
+
+ appdomain.DelegateManager.RegisterDelegateConvertor<UnityEngine.Events.UnityAction<string>>((act) =>
+ {
+ return new UnityEngine.Events.UnityAction<string>((arg0) =>
+ {
+ ((System.Action<string>)act)(arg0);
+ });
+ });
}
public void LaunchStart()
diff --git a/Assets/Plugins/Android/libs.meta b/Assets/Plugins/Android/libs.meta
index b884009..dfa1108 100644
--- a/Assets/Plugins/Android/libs.meta
+++ b/Assets/Plugins/Android/libs.meta
@@ -1,7 +1,8 @@
fileFormatVersion: 2
-guid: 9cd62bafd75e7604daf2b561b80d136d
+guid: 8ee33a9b24450ac4abb781fd3fb2bc46
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..26d6b68
--- /dev/null
+++ b/Assets/Plugins/Android/libs/arm64-v8a.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f4636136e515d743914c7338ac63785
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/arm64-v8a/libopus.so b/Assets/Plugins/Android/libs/arm64-v8a/libopus.so
new file mode 100644
index 0000000..b718fb7
--- /dev/null
+++ b/Assets/Plugins/Android/libs/arm64-v8a/libopus.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/arm64-v8a/libopus.so.meta b/Assets/Plugins/Android/libs/arm64-v8a/libopus.so.meta
new file mode 100644
index 0000000..1ed5df9
--- /dev/null
+++ b/Assets/Plugins/Android/libs/arm64-v8a/libopus.so.meta
@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 419f0e930e89f844280e3ee43ea3bd69
+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
index ba53f0f..17691af 100644
--- a/Assets/Plugins/Android/libs/armeabi-v7a.meta
+++ b/Assets/Plugins/Android/libs/armeabi-v7a.meta
@@ -1,7 +1,8 @@
fileFormatVersion: 2
-guid: b8d0cd0f5702f0144af2498bce3ee3e9
+guid: 49800597deef82e4a93943235d7210b2
folderAsset: yes
DefaultImporter:
+ externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so b/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so
index c41f71f..18c9eb0 100644
--- a/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so
+++ 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
index 0957150..1bfbeff 100644
--- a/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta
+++ b/Assets/Plugins/Android/libs/armeabi-v7a/libopus.so.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7f6f1fa45f740e4499d165a5229cfbc4
+guid: 4acfd5fb885680b4e959aece41dee432
PluginImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Plugins/Android/libs/x86.meta b/Assets/Plugins/Android/libs/x86.meta
index 0861447..3783895 100644
--- a/Assets/Plugins/Android/libs/x86.meta
+++ b/Assets/Plugins/Android/libs/x86.meta
@@ -1,7 +1,8 @@
fileFormatVersion: 2
-guid: 079ea0ed741ff194a80cce029630b5ac
+guid: 553bb5fb28aa09e48a971dc35918c4bc
folderAsset: yes
DefaultImporter:
+ externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86/libopus.so b/Assets/Plugins/Android/libs/x86/libopus.so
index 9024bdf..1fb4c93 100644
--- a/Assets/Plugins/Android/libs/x86/libopus.so
+++ 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
index f2b6725..bb4a376 100644
--- a/Assets/Plugins/Android/libs/x86/libopus.so.meta
+++ b/Assets/Plugins/Android/libs/x86/libopus.so.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 60087e115971d284e979bcf12138ae8d
+guid: 5ca6c04343670924d8b2d5d363587f1d
PluginImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Plugins/Android/libs/x86_64.meta b/Assets/Plugins/Android/libs/x86_64.meta
new file mode 100644
index 0000000..efa3f33
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86_64.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9a4850649b73bd54699a2c41dafb982e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/libs/x86_64/libopus.so b/Assets/Plugins/Android/libs/x86_64/libopus.so
new file mode 100644
index 0000000..47336f7
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86_64/libopus.so
Binary files differ
diff --git a/Assets/Plugins/Android/libs/x86_64/libopus.so.meta b/Assets/Plugins/Android/libs/x86_64/libopus.so.meta
new file mode 100644
index 0000000..89c18b3
--- /dev/null
+++ b/Assets/Plugins/Android/libs/x86_64/libopus.so.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 8c2116649829e7d44a38241c96d0fc03
+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/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index 239b669..3b7b48e 100644
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -1,4 +1,3 @@
-// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
// Android Resolver Repos Start
([rootProject] + (rootProject.subprojects as List)).each { project ->
@@ -34,12 +33,12 @@
// Android Resolver Exclusions Start
android {
packagingOptions {
- exclude ('/lib/arm64-v8a/*' + '*')
- exclude ('/lib/armeabi/*' + '*')
- exclude ('/lib/mips/*' + '*')
- exclude ('/lib/mips64/*' + '*')
- exclude ('/lib/x86/*' + '*')
- exclude ('/lib/x86_64/*' + '*')
+ // exclude ('/lib/arm64-v8a/*' + '*')
+ // exclude ('/lib/armeabi/*' + '*')
+ // exclude ('/lib/mips/*' + '*')
+ // exclude ('/lib/mips64/*' + '*')
+ // exclude ('/lib/x86/*' + '*')
+ // exclude ('/lib/x86_64/*' + '*')
}
}
// Android Resolver Exclusions End
diff --git a/Assets/Plugins/Android/unityopus.aar b/Assets/Plugins/Android/unityopus.aar
new file mode 100644
index 0000000..770a1d0
--- /dev/null
+++ b/Assets/Plugins/Android/unityopus.aar
Binary files differ
diff --git a/Assets/Plugins/Android/unityopus.aar.meta b/Assets/Plugins/Android/unityopus.aar.meta
new file mode 100644
index 0000000..2d119f4
--- /dev/null
+++ b/Assets/Plugins/Android/unityopus.aar.meta
@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 9e68815c63442724c9cd2a9e7f06b139
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ Android: Android
+ second:
+ enabled: 1
+ settings: {}
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 0
+ settings:
+ DefaultValueInitialized: true
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly b/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly
index 56c16f9..1701c6e 100644
--- a/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly
+++ b/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Bugly
Binary files differ
diff --git a/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers/Bugly.h b/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers/Bugly.h
index 050c037..908e454 100644
--- a/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers/Bugly.h
+++ b/Assets/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers/Bugly.h
@@ -1,7 +1,7 @@
//
// Bugly.h
//
-// Version: 2.5(71)
+// Version: 2.5(9)
//
// Copyright (c) 2017骞� Tencent. All rights reserved.
//
diff --git a/Assets/Plugins/x86_64/UnityOpus.dll b/Assets/Plugins/x86_64/UnityOpus.dll
new file mode 100644
index 0000000..38710ab
--- /dev/null
+++ b/Assets/Plugins/x86_64/UnityOpus.dll
Binary files differ
diff --git a/Assets/Plugins/x86_64/UnityOpus.dll.meta b/Assets/Plugins/x86_64/UnityOpus.dll.meta
new file mode 100644
index 0000000..e8effbc
--- /dev/null
+++ b/Assets/Plugins/x86_64/UnityOpus.dll.meta
@@ -0,0 +1,108 @@
+fileFormatVersion: 2
+guid: ed3e96f85077fb940ab466efc0395102
+PluginImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ iconMap: {}
+ executionOrder: {}
+ defineConstraints: []
+ isPreloaded: 0
+ isOverridable: 0
+ isExplicitlyReferenced: 0
+ validateReferences: 1
+ platformData:
+ - first:
+ '': Any
+ second:
+ enabled: 0
+ settings:
+ Exclude Android: 1
+ Exclude Editor: 0
+ Exclude Linux: 0
+ Exclude Linux64: 0
+ Exclude LinuxUniversal: 0
+ Exclude OSXUniversal: 0
+ Exclude Win: 1
+ Exclude Win64: 0
+ - first:
+ '': OSXIntel
+ second:
+ enabled: 0
+ settings:
+ CPU: None
+ - first:
+ '': OSXIntel64
+ second:
+ enabled: 1
+ settings:
+ CPU: AnyCPU
+ - first:
+ Android: Android
+ second:
+ enabled: 0
+ settings:
+ CPU: ARMv7
+ - first:
+ Any:
+ second:
+ enabled: 0
+ settings: {}
+ - first:
+ Editor: Editor
+ second:
+ enabled: 1
+ settings:
+ CPU: x86_64
+ DefaultValueInitialized: true
+ OS: AnyOS
+ - first:
+ Facebook: Win
+ second:
+ enabled: 0
+ settings:
+ CPU: None
+ - first:
+ Facebook: Win64
+ second:
+ enabled: 1
+ settings:
+ CPU: AnyCPU
+ - first:
+ Standalone: Linux
+ second:
+ enabled: 1
+ settings:
+ CPU: None
+ - first:
+ Standalone: Linux64
+ second:
+ enabled: 1
+ settings:
+ CPU: x86_64
+ - first:
+ Standalone: LinuxUniversal
+ second:
+ enabled: 1
+ settings:
+ CPU: AnyCPU
+ - first:
+ Standalone: OSXUniversal
+ second:
+ enabled: 1
+ settings:
+ CPU: x86_64
+ - first:
+ Standalone: Win
+ second:
+ enabled: 0
+ settings:
+ CPU: None
+ - first:
+ Standalone: Win64
+ second:
+ enabled: 1
+ settings:
+ CPU: AnyCPU
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.8.0