From ca87c97318fffee57d06187a1d41acd041a81023 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 15 Apr 2022 16:01:05 +0900 Subject: [PATCH] =?UTF-8?q?debugOption=20=E8=87=AA=E5=8B=95=E8=AA=BF?= =?UTF-8?q?=E7=90=86=E5=AE=8C=E6=88=90=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92?= =?UTF-8?q?=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 | 235 +++++++++++++++++- .../DebugOption/Scripts/DebugOptionManager.cs | 9 + 2 files changed, 238 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 3d3c3c82..d1c4dc63 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -273,7 +273,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 785180939} + m_TransformParent: {fileID: 915376435} m_Modifications: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -288,7 +288,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -409,6 +409,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &97196999 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 97196997} + m_PrefabAsset: {fileID: 0} --- !u!1001 &153639483 PrefabInstance: m_ObjectHideFlags: 0 @@ -1318,7 +1324,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 785180939} + m_TransformParent: {fileID: 915376435} m_Modifications: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -1333,7 +1339,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 9 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -1454,6 +1460,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &606428294 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 606428292} + m_PrefabAsset: {fileID: 0} --- !u!1 &667278155 GameObject: m_ObjectHideFlags: 0 @@ -2187,6 +2199,210 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &915376434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 915376435} + - component: {fileID: 915376436} + m_Layer: 5 + m_Name: Buttons Transraion + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &915376435 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915376434} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 97196999} + - {fileID: 606428294} + - {fileID: 1191515585} + m_Father: {fileID: 785180938} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 378} + m_SizeDelta: {x: -100, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &915376436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915376434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 0, y: 0} + m_Constraint: 1 + m_ConstraintCount: 2 +--- !u!1001 &916882296 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 785180939} + m_Modifications: + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Text + value: "\u81EA\u52D5\u8ABF\u7406\n\u5B8C\u6210" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: AutoCookComplete + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} +--- !u!114 &916882297 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 916882296} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &953162332 GameObject: m_ObjectHideFlags: 0 @@ -2885,7 +3101,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 785180939} + m_TransformParent: {fileID: 915376435} m_Modifications: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -2900,7 +3116,7 @@ PrefabInstance: - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} @@ -3021,6 +3237,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1191515585 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 1191515583} + m_PrefabAsset: {fileID: 0} --- !u!1 &1229184021 GameObject: m_ObjectHideFlags: 0 @@ -5641,6 +5863,7 @@ MonoBehaviour: shopLevelUpResetButton: {fileID: 1349073832} dailyMissionResetButton: {fileID: 297099900} normalMissionResetButton: {fileID: 1001425729} + autoCookCompleteButton: {fileID: 916882297} japaneseButton: {fileID: 1191515584} chineseButton: {fileID: 606428293} englishButton: {fileID: 97196998} diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 04ee28ec..e103620d 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -22,9 +22,13 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Button shopLevelUpResetButton; [SerializeField] private Button dailyMissionResetButton; [SerializeField] private Button normalMissionResetButton; + [SerializeField] private Button autoCookCompleteButton; + + [Space] [SerializeField] private Button japaneseButton; [SerializeField] private Button chineseButton; [SerializeField] private Button englishButton; + [SerializeField] private Toggle alwaysVideoFailToLoadToggle; [SerializeField] private Toggle fastGrowingToggle; [SerializeField] private Toggle skipTutorialToggle; @@ -149,6 +153,11 @@ public class DebugOptionManager : MonoBehaviour gameData.ResetNormalTotalCount(); }).AddTo(this); + autoCookCompleteButton.OnClickAsObservable().Subscribe(_ => + { + gameData.AutoCookFinishTime = DateTime.UtcNow.ToBinary(); + }).AddTo(this); + japaneseButton.OnClickAsObservable().Subscribe(_ => { LocalizationManager.CurrentLanguage = "Japanese";