From 44abc5ded13d47f1309bacf7273a54487e217e43 Mon Sep 17 00:00:00 2001 From: suntao Date: Thu, 29 Apr 2021 22:14:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=9A=84=E5=85=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/MainScene.unity | 8 ++++---- Assets/Scripts/Apis/ApiBase.cs | 2 +- Assets/Scripts/App.cs | 2 +- Assets/Scripts/UI/Prefab/Panel/BigMapController.cs | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 325ae9e6..038d6169 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -641,7 +641,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!108 &873388894 Light: m_ObjectHideFlags: 0 @@ -649,11 +649,11 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 873388893} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Color: {r: 1, g: 0.9764706, b: 0.5411765, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -688,7 +688,7 @@ Light: m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} - m_RenderMode: 0 + m_RenderMode: 2 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/Assets/Scripts/Apis/ApiBase.cs b/Assets/Scripts/Apis/ApiBase.cs index 24e15c02..339d3d8e 100644 --- a/Assets/Scripts/Apis/ApiBase.cs +++ b/Assets/Scripts/Apis/ApiBase.cs @@ -253,7 +253,7 @@ namespace Assets.Scripts.Apis //} var request = (HttpWebRequest)WebRequest.Create(ConfigHelper.Host + url); request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString(); - request.Headers.Add("Language", "Zh-cn"); + request.Headers.Add("Language", "en"); request.CookieContainer = new CookieContainer(); foreach (Cookie item in cookies) { diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index b39fd7c0..65fff09f 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -7,7 +7,7 @@ using UnityEngine; public static class App { - public static string Host = "http://192.168.0.101:5082/"; + public static string Host = "http://192.168.0.97:5082/"; public static string AppVersion = "1.0.0"; diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs index 9e35723e..f9106de5 100644 --- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs @@ -75,7 +75,7 @@ public class BigMapController : PFUIPanel mapManager.OnUpdated += MapManager_OnUpdated; //// mapManager.OnTileFinished += MapManager_OnTileFinished; - mapManager.SetZoom(7); + mapManager.SetZoom(5.8f); //mapManager.SetCenterLatitudeLongitude(new Mapbox.Utils.Vector2d(32.051203, 118.771572)); this.transform.Find("Map").GetComponent()._referenceCamera = Camera.main; @@ -179,12 +179,12 @@ public class BigMapController : PFUIPanel } private void MapManager_OnUpdated() { - Debug.Log("update"); + Debug.Log("update "+ mapManager.Zoom); - if(mapManager.Zoom <= 6) + if(mapManager.Zoom <= 4.8) { mapManager.OnUpdated -= MapManager_OnUpdated; - + maskImage.gameObject.SetActive(true); maskImage.DOFade(1f, 0.9f).SetEase(Ease.InSine).OnComplete(() => {