From 428ea0ca5b9f1877efa0b11a2d5fb79adf5c1c3f Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 27 Oct 2021 12:04:58 +0900 Subject: [PATCH] =?UTF-8?q?DebugOption=E3=81=AB=E3=83=81=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=A2=E3=83=AB=E3=82=B9=E3=82=AD=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=95=E3=83=A9=E3=82=B0=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/DebugOption/DebugOption.unity | 153 +++++++++++++++++- .../DebugOption/Scripts/DebugOptionManager.cs | 11 ++ 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 66f9b37c..754a5337 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -121,6 +121,153 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &6551977 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 744739666} + m_Modifications: + - target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Name + value: SkipTutorialToggle + objectReference: {fileID: 0} + - target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6855072136971505580, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Text + value: "\u30B9\u30AD\u30C3\u30D7\n\u30C1\u30E5\u30FC\u30C8\n\u30EA\u30A2\u30EB" + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc0b42d29ba9f4568aa0b803c18574c5, type: 3} +--- !u!224 &6551978 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 6551977} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6551979 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8246534116929882156, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 6551977} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &153639483 PrefabInstance: m_ObjectHideFlags: 0 @@ -642,6 +789,7 @@ RectTransform: - {fileID: 1076049185} - {fileID: 1998240840} - {fileID: 1074704276} + - {fileID: 6551978} - {fileID: 1484413800} - {fileID: 839487031} m_Father: {fileID: 785180938} @@ -901,7 +1049,7 @@ PrefabInstance: - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} @@ -1619,7 +1767,7 @@ PrefabInstance: - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} @@ -2141,6 +2289,7 @@ MonoBehaviour: dailyMissionResetButton: {fileID: 297099900} alwaysVideoFailToLoadToggle: {fileID: 1076049186} fastGrowingToggle: {fileID: 1998240841} + skipTutorialToggle: {fileID: 6551979} manyWalkerToggle: {fileID: 1074704277} coinCount: {fileID: 1484413801} heartCount: {fileID: 839487032} diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 0d26a73b..68645da2 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -22,6 +22,7 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Button dailyMissionResetButton; [SerializeField] private Toggle alwaysVideoFailToLoadToggle; [SerializeField] private Toggle fastGrowingToggle; + [SerializeField] private Toggle skipTutorialToggle; [SerializeField] private Toggle manyWalkerToggle; [SerializeField] private InputField coinCount; [SerializeField] private InputField heartCount; @@ -45,6 +46,11 @@ public class DebugOptionManager : MonoBehaviour Market.Instance.SetGameData(GameDataManager.GameData); Market.Instance.ReShuffle(GameDataManager.GameData.ShopStock); Market.Instance.CheckStock(GameDataManager.GameData.ShopStock); + if (UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugTutorialEnable", false)) + { + GameDataManager.GameData.ViewedShopLevel = 1; + GameDataManager.GameData.FinishTutorial(); + } TransitionManager.Instance.LoadScene(GameScenes.DebugOption); }).AddTo(this); @@ -162,6 +168,11 @@ public class DebugOptionManager : MonoBehaviour { UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugManyWalker", x); }).AddTo(this); + skipTutorialToggle.isOn = UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugTutorialEnable", false); + skipTutorialToggle.OnValueChangedAsObservable().Subscribe(x => + { + UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugTutorialEnable", x); + }).AddTo(this); } #endif }