From 732e5ac6c624839353880db2337835e8fbb0855c Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Tue, 23 Nov 2021 16:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8C=85=EF=BC=9B=E9=80=80?= =?UTF-8?q?=E5=87=BA=E9=AA=91=E8=A1=8C=E5=9C=BA=E6=99=AF=E9=87=8A=E6=94=BE?= =?UTF-8?q?tcp=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/App.cs | 4 ++-- Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs | 5 +++++ Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs | 1 + ProjectSettings/EditorBuildSettings.asset | 4 ++-- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 8 ++++---- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 83ed7a79..7de6f361 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -109,8 +109,8 @@ public static class App //Host = "http://192.168.0.101:5087/"; //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/"; - //Host = "http://192.168.0.101:5084/"; + //Host = "https://wx.powerfun.com.cn/"; + Host = "http://192.168.0.101:5085/"; UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); Debug.unityLogger.logEnabled = false; diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index 9d492fb2..c03c7be6 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -167,6 +167,7 @@ namespace Assets.Scenes.Ride.Scripts /// public static void SendGizpModel() { + LastActiveTime = DateTime.Now; var client = App.AppVersion; #if UNITY_ANDROID client = "Unity-Android" + App.AppVersion; @@ -267,6 +268,10 @@ namespace Assets.Scenes.Ride.Scripts } finally { + if (_udpService != null) + { + _udpService.Close(); + } //停止计时 if (heartbeat != null) { diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index e3c575a0..38ceb052 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -89,6 +89,7 @@ public class CyclingController : DeviceServiceMonoBase void OnDestroy() { + MapUDPService.Dispose(); Resources.UnloadUnusedAssets(); GC.Collect(); } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c5b8a1b5..999e430b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login.unity - guid: 6dce3e17997730b4492f91dd8fede429 + path: Assets/Scenes/Login-Mobile.unity + guid: 4be878da00cf764499988cf403faf94d - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc 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} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8ed8d1ce..93eda92f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.0.7 + bundleVersion: 2.0.8 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -180,7 +180,7 @@ PlayerSettings: Android: com.ZhiXingPai.PowerFunUnity buildNumber: iPhone: 2.0.7.0 - AndroidBundleVersionCode: 10 + AndroidBundleVersionCode: 11 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1 @@ -256,7 +256,7 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 3 + AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 1 + Android: 0 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0