From 35b5ab59d38e00fdaefd6e68960f5a25eaf8c2c5 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Mon, 9 Aug 2021 10:01:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/MyBuildPostprocessor.cs | 3 +- .../Core/Plugins/iOS/MapboxMetricsClient.m | 2 +- .../MapboxMobileEvents/MapboxMobileEvents.h | 8 +- Assets/Plugins/Android.meta | 8 ++ Assets/Plugins/Android/AndroidManifest.xml | 17 +++ .../Plugins/Android/AndroidManifest.xml.meta | 7 ++ Assets/Scripts/Apis/MapCompetitionApi.cs | 1 - Assets/Scripts/App.cs | 14 +-- Assets/Scripts/Devices/MainDeviceAdapter.cs | 2 + Assets/Scripts/Scenes/LoginController.cs | 31 +++-- .../Scripts/AbstratctLoadingController.cs | 4 +- .../Scenes/Ride/Scripts/PlayerController.cs | 4 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 37 +++--- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 108 +++++++++++++++++- 15 files changed, 201 insertions(+), 46 deletions(-) create mode 100644 Assets/Plugins/Android.meta create mode 100644 Assets/Plugins/Android/AndroidManifest.xml create mode 100644 Assets/Plugins/Android/AndroidManifest.xml.meta diff --git a/Assets/Editor/MyBuildPostprocessor.cs b/Assets/Editor/MyBuildPostprocessor.cs index ac1b3c59..1ef078a6 100644 --- a/Assets/Editor/MyBuildPostprocessor.cs +++ b/Assets/Editor/MyBuildPostprocessor.cs @@ -12,10 +12,11 @@ public class MyBuildPostprocessor { //Debug.Log(pathToBuiltProject); //System.IO.File.AppendAllText("D:\\test.txt",pathToBuiltProject); +#if !(UNITY_IOS || UNITY_ANDROID) var dir = Path.GetDirectoryName(pathToBuiltProject); - File.Copy(dir + "\\PowerFun_Data\\Plugins\\x86_64\\ANT_WrappedLib.dll", dir + "\\PowerFun_Data\\Managed\\ANT_WrappedLib.dll"); File.Copy(dir + "\\PowerFun_Data\\Plugins\\x86_64\\DSI_CP210xManufacturing_3_1.dll", dir + "\\PowerFun_Data\\Managed\\DSI_CP210xManufacturing_3_1.dll"); File.Copy(dir + "\\PowerFun_Data\\Plugins\\x86_64\\DSI_SiUSBXp_3_1.dll", dir + "\\PowerFun_Data\\Managed\\DSI_SiUSBXp_3_1.dll"); +#endif } } diff --git a/Assets/Mapbox/Core/Plugins/iOS/MapboxMetricsClient.m b/Assets/Mapbox/Core/Plugins/iOS/MapboxMetricsClient.m index cb5ed5cf..682955bc 100644 --- a/Assets/Mapbox/Core/Plugins/iOS/MapboxMetricsClient.m +++ b/Assets/Mapbox/Core/Plugins/iOS/MapboxMetricsClient.m @@ -1,4 +1,4 @@ -#import +#import "MapboxMobileEvents/include/MapboxMobileEvents/MapboxMobileEvents.h" void initialize(const char* accessToken, const char* userAgentBase, const char* hostSDKVersion) { [[MMEEventsManager sharedManager] initializeWithAccessToken:[NSString stringWithUTF8String:accessToken] diff --git a/Assets/Mapbox/Core/Plugins/iOS/MapboxMobileEvents/include/MapboxMobileEvents/MapboxMobileEvents.h b/Assets/Mapbox/Core/Plugins/iOS/MapboxMobileEvents/include/MapboxMobileEvents/MapboxMobileEvents.h index a90ea2b6..9df7fa7c 100644 --- a/Assets/Mapbox/Core/Plugins/iOS/MapboxMobileEvents/include/MapboxMobileEvents/MapboxMobileEvents.h +++ b/Assets/Mapbox/Core/Plugins/iOS/MapboxMobileEvents/include/MapboxMobileEvents/MapboxMobileEvents.h @@ -8,7 +8,7 @@ FOUNDATION_EXPORT const unsigned char MapboxMobileEventsVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import -#import -#import -#import -#import +#import +#import +#import +#import \ No newline at end of file diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta new file mode 100644 index 00000000..895deb6f --- /dev/null +++ b/Assets/Plugins/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c0b73ecbec479c43a99fc8513bbf95b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml new file mode 100644 index 00000000..3e6a69ac --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta new file mode 100644 index 00000000..83e598e6 --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 506e447c8b55f0449ae2b5b5ed37dd99 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Apis/MapCompetitionApi.cs b/Assets/Scripts/Apis/MapCompetitionApi.cs index 071c9ce1..27600bcb 100644 --- a/Assets/Scripts/Apis/MapCompetitionApi.cs +++ b/Assets/Scripts/Apis/MapCompetitionApi.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - namespace Assets.Scripts.Apis { internal class MapCompetitionApi : ApiBase diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 76a90747..506cf267 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -11,7 +11,7 @@ using Assets.Scripts.Devices; public static class App { - public static string Host = "http://192.168.0.101:5084/"; + public static string Host = "http://192.168.0.101:5083/"; public static string AppVersion = Application.version; @@ -72,12 +72,12 @@ public static class App static App() { #if !UNITY_EDITOR -// Host = "http://pf.juze.pro/"; -// UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); -// TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); - Host = "https://wx.powerfun.com.cn/"; - UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); - TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + Host = "http://pf.juze.pro/"; + UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); + TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); + //Host = "https://wx.powerfun.com.cn/"; + //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); + //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); #endif } } diff --git a/Assets/Scripts/Devices/MainDeviceAdapter.cs b/Assets/Scripts/Devices/MainDeviceAdapter.cs index de5a621f..3e50f026 100644 --- a/Assets/Scripts/Devices/MainDeviceAdapter.cs +++ b/Assets/Scripts/Devices/MainDeviceAdapter.cs @@ -14,8 +14,10 @@ namespace Assets.Scripts.Devices private List adapters = new List(); public MainDeviceAdapter() { + #if !(UNITY_IOS || UNITY_ANDROID) this.CreateAntAdapter(); this.CreateBleAdapter(); + #endif } private void CreateAntAdapter() diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index c478443f..d341a369 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -21,7 +21,9 @@ using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; using UnityEngine.UI; +#if !(UNITY_IOS || UNITY_ANDROID) using ZenFulcrum.EmbeddedBrowser; +#endif //记录:小f 是-457和-681 public class QUserInfo @@ -86,7 +88,9 @@ public class LoginController : MonoBehaviour //注册主页面 private UserResultModel userResult; /*微信相关*/ +#if !(UNITY_IOS || UNITY_ANDROID) private Browser wxBrowser; +#endif private string wxState; private Transform wxLogin1; private Transform wxLogin2; @@ -252,6 +256,7 @@ public class LoginController : MonoBehaviour var wechatLogin = loginContainer.Find("otherContainer").Find("Wechat").GetComponent