Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-08-03 18:06:33 +08:00
commit c927af441a
2 changed files with 15 additions and 8 deletions

View File

@ -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:

View File

@ -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();
});
}
}
}