暂存
This commit is contained in:
parent
d035361718
commit
6d1bc8e2c8
@ -8,7 +8,6 @@ dependencies {
|
|||||||
implementation(name: 'animated-vector-drawable-25.1.0', ext:'aar')
|
implementation(name: 'animated-vector-drawable-25.1.0', ext:'aar')
|
||||||
implementation(name: 'appcompat-v7-25.1.0', ext:'aar')
|
implementation(name: 'appcompat-v7-25.1.0', ext:'aar')
|
||||||
implementation(name: 'com.mapbox.android.unity-debug', 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: 'libcore-release', ext:'aar')
|
||||||
implementation(name: 'libtelemetry-full-release', ext:'aar')
|
implementation(name: 'libtelemetry-full-release', ext:'aar')
|
||||||
implementation(name: 'support-compat-25.1.0', 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-v4-25.1.0', ext:'aar')
|
||||||
implementation(name: 'support-vector-drawable-25.1.0', ext:'aar')
|
implementation(name: 'support-vector-drawable-25.1.0', ext:'aar')
|
||||||
implementation(name: 'UnityCallWechatShare-release', ext:'aar')
|
implementation(name: 'UnityCallWechatShare-release', ext:'aar')
|
||||||
|
implementation files ('libs/ImageSelector-release.aar')
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
@ -99,12 +99,14 @@ public static class App
|
|||||||
static App()
|
static App()
|
||||||
{
|
{
|
||||||
#if !UNITY_EDITOR
|
#if !UNITY_EDITOR
|
||||||
Host = "http://192.168.0.101:5085/";
|
//Host = "http://pf.juze.pro/";
|
||||||
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
|
////Host = "http://192.168.0.101:5085/";
|
||||||
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
|
//UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
|
||||||
//Host = "https://wx.powerfun.com.cn/";
|
//TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
|
||||||
//UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
|
Host = "https://wx.powerfun.com.cn/";
|
||||||
//TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
|
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
|
||||||
|
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
var isRower = PlayerPrefs.GetString("IsRowerMode");
|
var isRower = PlayerPrefs.GetString("IsRowerMode");
|
||||||
if (!string.IsNullOrEmpty(isRower))
|
if (!string.IsNullOrEmpty(isRower))
|
||||||
|
|||||||
@ -10,6 +10,7 @@ using UnityEngine.EventSystems;
|
|||||||
using DG.Tweening;
|
using DG.Tweening;
|
||||||
using Assets.Scripts.Devices.Ble.Devices;
|
using Assets.Scripts.Devices.Ble.Devices;
|
||||||
using Assets.Scripts;
|
using Assets.Scripts;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
public class DeviceController : PFUIPanel
|
public class DeviceController : PFUIPanel
|
||||||
{
|
{
|
||||||
@ -91,7 +92,13 @@ public class DeviceController : PFUIPanel
|
|||||||
protected override void Awake()
|
protected override void Awake()
|
||||||
{
|
{
|
||||||
base.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
|
// Start is called before the first frame update
|
||||||
|
|||||||
@ -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;
|
System.Diagnostics.Process proc = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
proc = new System.Diagnostics.Process();
|
proc = new System.Diagnostics.Process();
|
||||||
proc.StartInfo.FileName = path;
|
proc.StartInfo.FileName = path;
|
||||||
|
proc.StartInfo.Arguments = args;
|
||||||
proc.StartInfo.CreateNoWindow = false;
|
proc.StartInfo.CreateNoWindow = false;
|
||||||
proc.StartInfo.Verb = "runas";
|
proc.StartInfo.Verb = "runas";
|
||||||
proc.Start();
|
proc.Start();
|
||||||
|
|||||||
@ -38,6 +38,7 @@ GraphicsSettings:
|
|||||||
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_PreloadedShaders: []
|
m_PreloadedShaders: []
|
||||||
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
|
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
|
||||||
type: 0}
|
type: 0}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user