diff --git a/Assets/Editor/XCodePostProcessBuild.cs b/Assets/Editor/XCodePostProcessBuild.cs index 7109c314..e475f7ec 100644 --- a/Assets/Editor/XCodePostProcessBuild.cs +++ b/Assets/Editor/XCodePostProcessBuild.cs @@ -79,6 +79,8 @@ public static class XCodePostProcessBuild plist.root.SetString("NSContactsUsageDescription", "contactsDesciption"); plist.root.SetString("NSMicrophoneUsageDescription", "microphoneDesciption"); plist.root.SetString("NSPhotoLibraryUsageDescription", "photoLibraryDesciption"); + plist.root.SetString("NSLocationWhenInUseUsageDescription", "locationWhenInUseUsageDescription"); + plist.root.SetBoolean("ITSAppUsesNonExemptEncryption", false); File.WriteAllText(listPath, plist.WriteToString()); } diff --git a/Assets/Plugins/Android/ImageSelector-release.aar b/Assets/Plugins/Android/ImageSelector-release.aar index 4cd17790..421cc8cc 100644 Binary files a/Assets/Plugins/Android/ImageSelector-release.aar and b/Assets/Plugins/Android/ImageSelector-release.aar differ diff --git a/Assets/Resources/Images/Race/next-hover.png b/Assets/Resources/Images/Race/next-hover.png index aee04c50..fc393af2 100644 Binary files a/Assets/Resources/Images/Race/next-hover.png and b/Assets/Resources/Images/Race/next-hover.png differ diff --git a/Assets/Resources/Images/Race/next-hover.png.meta b/Assets/Resources/Images/Race/next-hover.png.meta index 3e5d6899..b3699d8c 100644 --- a/Assets/Resources/Images/Race/next-hover.png.meta +++ b/Assets/Resources/Images/Race/next-hover.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Assets/Resources/Images/Race/next-normal.png b/Assets/Resources/Images/Race/next-normal.png index ecbd4c4f..d9bc1406 100644 Binary files a/Assets/Resources/Images/Race/next-normal.png and b/Assets/Resources/Images/Race/next-normal.png differ diff --git a/Assets/Resources/Images/Race/next-normal.png.meta b/Assets/Resources/Images/Race/next-normal.png.meta index 8fcf5e6c..532fa854 100644 --- a/Assets/Resources/Images/Race/next-normal.png.meta +++ b/Assets/Resources/Images/Race/next-normal.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Assets/Resources/Images/Race/pre-hover.png b/Assets/Resources/Images/Race/pre-hover.png index c78f3ab1..9810e39d 100644 Binary files a/Assets/Resources/Images/Race/pre-hover.png and b/Assets/Resources/Images/Race/pre-hover.png differ diff --git a/Assets/Resources/Images/Race/pre-hover.png.meta b/Assets/Resources/Images/Race/pre-hover.png.meta index 792062f6..f10c0e9d 100644 --- a/Assets/Resources/Images/Race/pre-hover.png.meta +++ b/Assets/Resources/Images/Race/pre-hover.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Assets/Resources/Images/Race/pre-normal.png b/Assets/Resources/Images/Race/pre-normal.png index 247194e2..2b1a3794 100644 Binary files a/Assets/Resources/Images/Race/pre-normal.png and b/Assets/Resources/Images/Race/pre-normal.png differ diff --git a/Assets/Resources/Images/Race/pre-normal.png.meta b/Assets/Resources/Images/Race/pre-normal.png.meta index 0b0f7f60..dcc93bd2 100644 --- a/Assets/Resources/Images/Race/pre-normal.png.meta +++ b/Assets/Resources/Images/Race/pre-normal.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab index cde59dae..ab9b73a3 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab @@ -1463,7 +1463,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 9215991904088383053} - m_Horizontal: 1 + m_Horizontal: 0 m_Vertical: 0 m_MovementType: 1 m_Elasticity: 0.1 diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 46b5e54a..50a1a8d2 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -92,6 +92,8 @@ public static class App 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 + Screen.sleepTimeout = SleepTimeout.NeverSleep; } } diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index d8e867b2..0b411532 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -65,7 +65,7 @@ public class MainController : BaseScene //}); if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"])) { - UIManager.PushHome(); + UIManager.ShowHomePanel(); if (App.MainSceneParam["Name"] == "MapListPanel") { UIManager.ShowMapListPanel(); 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}