diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs index 09228f9c..b5516cc4 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs @@ -1,6 +1,7 @@ #if UNITY_EDITOR using System; using UniRx; +using UniRx.Triggers; using UnityEngine; namespace MyGame.Scenes.MiniGame.Scripts @@ -39,7 +40,7 @@ namespace MyGame.Scenes.MiniGame.Scripts lineRendererFront.endColor = Color.green; var boundsSize = character.GetComponent()?.bounds.size ?? default; - var centerOffset = new Vector3(-boundsSize.x / 2, -boundsSize.y / 2); + var centerOffset = new Vector3(-boundsSize.x / 2, boundsSize.y / 2); var frontOffset = new Vector3(boundsSize.x / 2, -boundsSize.y / 2); lineRendererCenter.SetPosition(0, character.position + centerOffset); @@ -53,6 +54,13 @@ namespace MyGame.Scenes.MiniGame.Scripts lineRendererFront.positionCount++; lineRendererFront.SetPosition(lineRendererFront.positionCount-1, character.position + frontOffset); }).AddTo(this); + + this.UpdateAsObservable() + .Where(_ => Input.GetKeyDown(KeyCode.R)) + .Subscribe(_ => + { + UnityEngine.SceneManagement.SceneManager.LoadScene("MiniGame"); + }).AddTo(this); } } } diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index 0f7a037d..0299b86f 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -119,7 +119,7 @@ namespace MyGame.Scenes.MiniGame.Scripts switch (item.ItemType) { case StageItem.Type.Item1: - headerView.AddCount(); + headerView.AddCount(item.Point); break; case StageItem.Type.Obstacle: player.Hit(); diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs index e3d065e6..57ae4c1c 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/HeaderView.cs @@ -32,9 +32,9 @@ namespace MyGame.Scenes.MiniGame.Scripts timeCount.Value = 0; } - public void AddCount() + public void AddCount(int value) { - itemCount.Value++; + itemCount.Value += value; } public void ChangeTimeCount(float newTime) diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset index be407fce..52b8fb6f 100644 --- a/popcorn/ProjectSettings/EditorBuildSettings.asset +++ b/popcorn/ProjectSettings/EditorBuildSettings.asset @@ -134,4 +134,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity guid: dd7c837547bf89f489bc36b6a2ebbca4 + - enabled: 1 + path: Assets/MyGame/Scenes/MiniGame/MiniGame.unity + guid: c21a0a611342d4e4b90e83df43aa3e5e m_configObjects: {}