From 6419d8ba1dd4eaa65483110b49ff0fcd757db097 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Tue, 31 May 2022 13:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4unity=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scripts/ApplicationExitConfirmDialogManager.cs | 5 +++-- popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs b/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs index 97d48265..21c5abcd 100644 --- a/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs +++ b/popcorn/Assets/MyGame/Scripts/ApplicationExitConfirmDialogManager.cs @@ -29,11 +29,12 @@ public sealed class ApplicationExitConfirmDialogManager : MonoBehaviour public void OnExit(){ #if UNITY_EDITOR UnityEditor.EditorApplication.isPlaying = false; -#else +#elif ANDROID_GP + Debug.Log("Application.Quit();"); UnityEngine.Application.Quit(); #endif } - + public void OnHide(){ this.CallWaitForOneFrame(() => { TransitionManager.Instance.UnloadScene(GameScenes.ApplicationExitConfirmDialog); diff --git a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs index cf3f0ee7..b16ba888 100644 --- a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs +++ b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs @@ -11,8 +11,8 @@ public sealed class InitializeUnitySettings : MonoBehaviour { #if DEVELOPMENT_BUILD || UNITY_EDITOR #if UNITY_EDITOR - // SRDebuggerのEventSystem自動生成がデフォルト有効なので、有効であれば無効にして保存する - // 有効のままだと管理していないEventSystemが発生し、releaseでのみ発現するバグが生まれる +// SRDebuggerのEventSystem自動生成がデフォルト有効なので、有効であれば無効にして保存する +// 有効のままだと管理していないEventSystemが発生し、releaseでのみ発現するバグが生まれる // if(SRDebugger.Settings.Instance.EnableEventSystemGeneration){ // SRDebugger.Settings.Instance.EnableEventSystemGeneration = false; // UnityEditor.EditorUtility.SetDirty(SRDebugger.Settings.Instance); @@ -22,7 +22,9 @@ public sealed class InitializeUnitySettings : MonoBehaviour { // SRDebug.Init(); #endif +#if ANDROID_GP BackButtonManager.Instance.SetGenericAction(ApplicationExitConfirmDialogManager.ShowDialog); +#endif Application.targetFrameRate = 60;