From b82f910df8024c9ede4c183f17d0a9939fa7d6d1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Aug 2021 15:47:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=83=AD=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=80=91=E7=83=AD=E6=9B=B4=E6=96=B0=E7=95=8C=E9=9D=A2=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=B8=B8=E6=88=8F=E5=BC=B9=E7=AA=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/GameInit/UpdatePanel.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs index 5318239c5e..84cc9d1dae 100644 --- a/Assets/Scripts/GameInit/UpdatePanel.cs +++ b/Assets/Scripts/GameInit/UpdatePanel.cs @@ -120,11 +120,18 @@ namespace GameLogic { if (Input.GetKeyDown(KeyCode.Escape)) { - msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) => + if(AppConst.isSDK && App.SDKMgr.IsSupportExit()) { - if (result == 1) - Application.Quit(); - }); + App.SDKMgr.ExitGame(); + } + else + { + msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) => + { + if (result == 1) + Application.Quit(); + }); + } } } From 1827fa7217590097d19a491d472089598c26cbb0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 3 Aug 2021 16:50:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E7=9A=AE=E8=82=A4=E9=94=99=E4=B9=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 48ff1513f8..9de414a60b 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -1968,10 +1968,10 @@ RectTransform: m_Father: {fileID: 164915241442772717} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 6, y: 257.15997} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 280} + m_SizeDelta: {x: 0, y: 594} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3257626532348234313 CanvasRenderer: