From b039388a596f2e695aaf4b22ef020083136d7129 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 24 Feb 2022 14:49:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BA=BF=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/App.cs | 12 ++++++------ ProjectSettings/AndroidResolverDependencies.xml | 4 ++-- ProjectSettings/EditorBuildSettings.asset | 4 ++-- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 8 ++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index ac75f51b..388c4cdc 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -203,13 +203,13 @@ public static class App InitLanguage(); #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 = "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 = "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://192.168.0.101:5085/"; //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index c2cee6dc..b7cdca94 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - + \ No newline at end of file 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 682bf7b9..669f8140 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -179,8 +179,8 @@ PlayerSettings: applicationIdentifier: Android: com.ZhiXingPai.PowerFunUnity buildNumber: - iPhone: 2.1.3.0 - AndroidBundleVersionCode: 16 + iPhone: 2.1.3.1 + AndroidBundleVersionCode: 18 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: 1 + AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 0 + Android: 1 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0