From 6f878a13bd903beb063a15aff0fd8f08ea75c3ca Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 20 Oct 2021 11:17:06 +0900 Subject: [PATCH] =?UTF-8?q?=E5=8B=95=E7=94=BB=E3=83=AA=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=82=B7?= =?UTF-8?q?=E3=83=BC=E3=83=B3=E6=83=85=E5=A0=B1=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resources/DontDestroyObject.prefab | 13 +++++++++++++ popcorn/Assets/MyGame/Scripts/TransitionManager.cs | 4 +++- popcorn/ProjectSettings/EditorBuildSettings.asset | 9 +++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab index cfcbcd99..da6b5318 100644 --- a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab +++ b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab @@ -95,6 +95,7 @@ GameObject: - component: {fileID: 3756929251745663541} - component: {fileID: 5400893423074421525} - component: {fileID: 7906393928596777865} + - component: {fileID: 7743573513958854474} m_Layer: 0 m_Name: DontDestroyObject m_TagString: Untagged @@ -190,6 +191,18 @@ MonoBehaviour: m_EditorClassIdentifier: checkInterval: value: 0.1 +--- !u!114 &7743573513958854474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3459593390050872226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e2021f1b8ce47f79191ab8732fba298, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8739647597683206087 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index 3584324d..501c04e3 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -32,7 +32,9 @@ public enum GameScenes Information, SettingsDialog, DebugOption, - UnableWatchVideoDialog, + WatchMovieFailure, + WatchMovieCoin, + WatchMovieCoinGet, ApplicationExitConfirmDialog, } diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset index 6a032239..82435d70 100644 --- a/popcorn/ProjectSettings/EditorBuildSettings.asset +++ b/popcorn/ProjectSettings/EditorBuildSettings.asset @@ -80,4 +80,13 @@ EditorBuildSettings: - enabled: 1 path: Assets/MyGame/Scenes/Main/Information.unity guid: 492d370a1a11f7e4ba2860fa98a0addb + - enabled: 1 + path: Assets/MyGame/Scenes/Main/WatchMovieFailure.unity + guid: c7a1b5c409fde72468a57617c0943288 + - enabled: 1 + path: Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity + guid: 5f95bfe845a5087469d45e850c779703 + - enabled: 1 + path: Assets/MyGame/Scenes/Main/WatchMovieCoin.unity + guid: 5f6b6a432bfecff4985db4b408a11eaa m_configObjects: {}