lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂存

Browse Source
This commit is contained in:
CaiYanPeng 2021-10-08 15:22:20 +08:00
parent d035361718
commit 6d1bc8e2c8
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Plugins/Android/mainTemplate.gradle
View File

@ -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 {

14
Assets/Scripts/App.cs
View File

@ -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))

9
Assets/Scripts/UI/Prefab/Panel/DeviceController.cs
View File

@ -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

3
Assets/Scripts/Utils/Utils.cs
View File

@ -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();

1
ProjectSettings/GraphicsSettings.asset
View File

@ -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}