diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 397e8bcc..54ae2147 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -121,6 +121,147 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &153639483 +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: 3 + 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: "\u5546\u54C1\n\u88DC\u5145\u5C11" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: RefillLittleProduct + 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 &153639484 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 153639483} + 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!1001 &450754451 PrefabInstance: m_ObjectHideFlags: 0 @@ -243,6 +384,11 @@ PrefabInstance: propertyPath: m_Name value: FieldResetButton 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 &450754452 stripped @@ -335,7 +481,7 @@ GameObject: - component: {fileID: 744739668} - component: {fileID: 744739667} m_Layer: 5 - m_Name: GameObject + m_Name: Toggles m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -353,12 +499,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1998240840} + - {fileID: 1074704276} + - {fileID: 839487031} m_Father: {fileID: 785180938} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -144} + m_AnchoredPosition: {x: 186.4, y: -90} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &744739667 @@ -527,6 +675,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2541661408982824306, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2541661409141469742, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_Constraint + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2541661409141469742, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_ConstraintCount + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2541661409648867663, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32f8e8f0ced494daeb0f218e6be9d9db, type: 3} --- !u!224 &785180938 stripped @@ -565,6 +733,436 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &839487030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 744739666} + m_Modifications: + - target: {fileID: 6737172384039791724, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_Text + value: "\u30CF\u30FC\u30C8" + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6737172384967821846, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + propertyPath: m_Name + value: HeartCount + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 485257dfeb2144672bcc21b704b6ca0f, type: 3} +--- !u!224 &839487031 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6737172384967821841, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + m_PrefabInstance: {fileID: 839487030} + m_PrefabAsset: {fileID: 0} +--- !u!114 &839487032 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6737172384967821842, guid: 485257dfeb2144672bcc21b704b6ca0f, + type: 3} + m_PrefabInstance: {fileID: 839487030} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1074704275 +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: WalkerRushToggle + 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: "\u6B69\u884C\u8005\u5897" + 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: 1 + 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 &1074704276 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 1074704275} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1074704277 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8246534116929882156, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 1074704275} + 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 &1651104559 +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: 2 + 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: "\u5546\u54C1\n\u88DC\u5145\u591A" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: RefillManyProduct + 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 &1651104560 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 1651104559} + 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!1001 &1711540512 PrefabInstance: m_ObjectHideFlags: 0 @@ -756,6 +1354,11 @@ PrefabInstance: propertyPath: m_Name value: RefillButton 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 &1767352104 stripped @@ -803,7 +1406,11 @@ MonoBehaviour: backButton: {fileID: 785180940} resetFieldButton: {fileID: 450754452} refillMaterialButton: {fileID: 1767352104} + refillManyProductButton: {fileID: 1651104560} + refillLittleProductButton: {fileID: 153639484} fastGrowingToggle: {fileID: 1998240841} + manyWalkerToggle: {fileID: 1074704277} + heartCount: {fileID: 839487032} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -830,6 +1437,11 @@ PrefabInstance: propertyPath: m_Name value: FastGrowingToggle 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 diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index f6c7778d..0f56ba78 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -1,5 +1,7 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; +using System.Linq; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -12,10 +14,18 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Button backButton; [SerializeField] private Button resetFieldButton; [SerializeField] private Button refillMaterialButton; + [SerializeField] private Button refillManyProductButton; + [SerializeField] private Button refillLittleProductButton; [SerializeField] private Toggle fastGrowingToggle; + [SerializeField] private Toggle manyWalkerToggle; + [SerializeField] private InputField heartCount; // Start is called before the first frame update void Start() { + if (!LocalCacheManager.Exists(DebugPrevSceneTag)) + { + TransitionManager.Instance.LoadScene(GameScenes.Main); + } var prevScene = LocalCacheManager.Load(DebugPrevSceneTag); resetButton.OnClickAsObservable().Subscribe(_ => { @@ -44,6 +54,27 @@ public class DebugOptionManager : MonoBehaviour } }).AddTo(this); + refillManyProductButton.OnClickAsObservable().Subscribe(_ => + { + gameData.ShopStock = Enumerable.Repeat(1, 10).ToList(); + gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList()); + gameData.StorageTanks[0].FlavorId = 2; + gameData.StorageTanks[0].Stock = 50; + }).AddTo(this); + + refillLittleProductButton.OnClickAsObservable().Subscribe(_ => + { + gameData.ShopStock = Enumerable.Repeat(2, 2).ToList(); + gameData.ShopStock = Enumerable.Repeat(1, 10).ToList(); + gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList()); + }).AddTo(this); + + heartCount.text = $"{gameData.Heart}"; + heartCount.OnValueChangedAsObservable().Subscribe(x => + { + gameData.Heart = Int32.Parse(x); + }).AddTo(this); + // debugfielddata // gameData.PlantLines = new List // { @@ -57,5 +88,10 @@ public class DebugOptionManager : MonoBehaviour { UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugFastGrowing", x); }).AddTo(this); + manyWalkerToggle.isOn = UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugManyWalker", false); + manyWalkerToggle.OnValueChangedAsObservable().Subscribe(x => + { + UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugManyWalker", x); + }).AddTo(this); } } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index fa941ce7..e3b232ad 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -68,8 +68,7 @@ public class Market : MonoBehaviour HeartMeter.Instance.Initialize(shopLevelList.Select(x => x.heart).ToList()); HeartMeter.Instance.SetHeart(gameData.Heart); - HeartMeter.Instance.SetHeart(99999); - + // 在庫数表示 stockView.SetStock(gameData.StorageTanks); @@ -328,11 +327,16 @@ public class Market : MonoBehaviour .Do(_ => { Debug.Log($"clicked");}) .Delay(TimeSpan.FromSeconds(2f)) .Select(x => adWalkerObservable).Switch(); - // Observable.Timer(TimeSpan.FromSeconds(3f)).Subscribe(_ => { adClickObservable.OnNext(default); }).AddTo(this); +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugManyWalker", false)) + { + Observable.Timer(TimeSpan.FromSeconds(1f), TimeSpan.FromSeconds(70f)).Subscribe(_ => { adClickObservable.OnNext(default); }).AddTo(this); + } +#endif // キャラ生成 Observable.Merge(walkerObservable, customerObservable) - // .Merge(adClickWalkerObservable) + .Merge(adClickWalkerObservable) .Subscribe(x => { var customer = Instantiate(customerPrefab);