From 8f47a19cdc2c3e671f72e502e20f944bb0e6baae Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 6 Aug 2021 17:50:55 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scripts/FooterManager.cs | 2 ++ popcorn/Assets/MyGame/Scripts/TransitionManager.cs | 4 ++++ popcorn/ProjectSettings/EditorBuildSettings.asset | 11 ++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 85d4207e..79c5da46 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -25,10 +25,12 @@ public class FooterManager : MonoBehaviour }).AddTo(this); stockButton.BindToOnClick(shareGate, _ => { + TransitionManager.Instance.LoadScene(GameScenes.shopping); return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); }).AddTo(this); saleButton.BindToOnClick(shareGate, _ => { + TransitionManager.Instance.LoadScene(GameScenes.marketing); return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); }).AddTo(this); } diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index 1c0afedc..a43e9a64 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -11,6 +11,10 @@ public enum GameScenes CornField, Recipe, RecipeChoice, + marketing, + shopping, + ShoppingExplanation, + Purchase, SettingsDialog, DebugOption, UnableWatchVideoDialog, diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset index 6a433833..d085904e 100644 --- a/popcorn/ProjectSettings/EditorBuildSettings.asset +++ b/popcorn/ProjectSettings/EditorBuildSettings.asset @@ -21,6 +21,15 @@ EditorBuildSettings: path: Assets/MyGame/Scenes/CornField/CornField.unity guid: 7ee833196453c8045b9ec713662ccf4e - enabled: 1 - path: Assets/MyGame/Scenes/marketing/Marketing.unity + path: Assets/MyGame/Scenes/marketing/marketing.unity guid: 0578a0087d4b17041b0a94debf03e0d6 + - enabled: 1 + path: Assets/MyGame/Scenes/shopping/shopping.unity + guid: 9c9b9e2851656c84e91e3c457a81433d + - enabled: 1 + path: Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity + guid: 56dcb15cfd0593b4ab5045ee38a03b1f + - enabled: 1 + path: Assets/MyGame/Scenes/shopping/Purchase.unity + guid: 6cdf801ecd42cd543a2b68afba311048 m_configObjects: {}