diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 3a266566..3f2ba978 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -8,7 +8,6 @@ dependencies { implementation(name: 'animated-vector-drawable-25.1.0', ext:'aar') implementation(name: 'appcompat-v7-25.1.0', ext:'aar') implementation(name: 'com.mapbox.android.unity-debug', ext:'aar') - implementation files ('libs/ImageSelector-release.aar') implementation(name: 'libcore-release', ext:'aar') implementation(name: 'libtelemetry-full-release', ext:'aar') implementation(name: 'support-compat-25.1.0', ext:'aar') @@ -18,6 +17,7 @@ dependencies { implementation(name: 'support-v4-25.1.0', ext:'aar') implementation(name: 'support-vector-drawable-25.1.0', ext:'aar') implementation(name: 'UnityCallWechatShare-release', ext:'aar') + implementation files ('libs/ImageSelector-release.aar') } android { diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 7350413a..df53ac40 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -99,12 +99,14 @@ public static class App static App() { #if !UNITY_EDITOR - Host = "http://192.168.0.101:5085/"; - 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/"; + ////Host = "http://192.168.0.101:5085/"; + //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 var isRower = PlayerPrefs.GetString("IsRowerMode"); if (!string.IsNullOrEmpty(isRower)) diff --git a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs index 29550169..d5521d9b 100644 --- a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs @@ -10,6 +10,7 @@ using UnityEngine.EventSystems; using DG.Tweening; using Assets.Scripts.Devices.Ble.Devices; using Assets.Scripts; +using System.IO; public class DeviceController : PFUIPanel { @@ -91,7 +92,13 @@ public class DeviceController : PFUIPanel protected override void Awake() { base.Awake(); - //Debug.Log("device awake"); +#if UNITY_STANDALONE_WIN + Debug.Log("进入设备连接页面"); + if (!File.Exists("C:\\Windows\\System32\\msvcp140.dll") && File.Exists("C:\\Program Files\\PowerFun\\_​CommonRedist\\vcredist\\VC_redist.x64.exe")) + { + Utils.ExecFile("C:\\Program Files\\PowerFun\\_​CommonRedist\\vcredist\\VC_redist.x64.exe", "/passive"); + } +#endif } // Start is called before the first frame update diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index 7617ad3b..594690eb 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -462,13 +462,14 @@ namespace Assets.Scripts /*文本框/下拉框错误*/ - public static void ExecFile(string path) + public static void ExecFile(string path,string args = "") { System.Diagnostics.Process proc = null; try { proc = new System.Diagnostics.Process(); proc.StartInfo.FileName = path; + proc.StartInfo.Arguments = args; proc.StartInfo.CreateNoWindow = false; proc.StartInfo.Verb = "runas"; proc.Start(); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}