From fb936a520c3c5b700c4269c60427e887809ca1a9 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 30 Jun 2022 11:45:06 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E5=87=A6?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/MiniGame/MiniGame.unity | 52 +------------------ .../Scenes/MiniGame/Scripts/GameManager.cs | 23 ++++---- 2 files changed, 14 insertions(+), 61 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index 5283119a..7f747a73 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -152,31 +152,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &169743260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 175614541} ---- !u!114 &175614541 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7322157960569866670, guid: 041c0f3d96c90d64094cc76c5c87c26f, - type: 3} - m_PrefabInstance: {fileID: 4559813503860727169} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &275350936 GameObject: m_ObjectHideFlags: 0 @@ -905,18 +880,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 4559813503860727175} ---- !u!114 &1464096862 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5034752975584991938, guid: 199214813202e5f478789161b538685b, - type: 3} - m_PrefabInstance: {fileID: 5034752974072861411} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1657044091 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1187,19 +1150,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 4559813503860727174} ---- !u!114 &1834858121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1464096862} --- !u!1 &1870432532 GameObject: m_ObjectHideFlags: 0 @@ -1267,7 +1217,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isDebug: - value: 1 + value: 0 character: {fileID: 787907550} resetScoreButton: {fileID: 1725870973} resetPlayCountButton: {fileID: 2085388516} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index c9b016e6..fb28d578 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -239,17 +239,20 @@ namespace MyGame.Scenes.MiniGame.Scripts return; } #if UNITY_EDITOR - var sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere); - sphere.GetComponent().material.color = Color.red; - sphere.transform.SetLocalScale(.4f); - sphere.transform.position = x.ClosestPoint(playerTransform.position); - sphere.transform.SetPositionZ(-5f); - if (item.ItemType == StageItem.Type.Obstacle && isDebug) + if (isDebug) { - Observable.NextFrame().Subscribe(_ => - { - EditorApplication.isPaused = true; - }).AddTo(this); + var sphere = GameObject.CreatePrimitive(PrimitiveType.Sphere); + sphere.GetComponent().material.color = Color.red; + sphere.transform.SetLocalScale(.4f); + sphere.transform.position = x.ClosestPoint(playerTransform.position); + sphere.transform.SetPositionZ(-5f); + // if (item.ItemType == StageItem.Type.Obstacle) + // { + // Observable.NextFrame().Subscribe(_ => + // { + // EditorApplication.isPaused = true; + // }).AddTo(this); + // } } #endif x.enabled = false;