From 924ef43361349fd752d3091e0e2e16c8f93c9b6d Mon Sep 17 00:00:00 2001 From: "milan @ U1" Date: Tue, 16 May 2023 16:09:45 +0200 Subject: [PATCH] skipping puzzles --- .../Assets/Prefabs/UI/Current Puzzle.prefab | 316 ++++++++++++++++++ .../Prefabs/UI/Current Puzzle.prefab.meta | 7 + .../Prefabs/UI/Gamemaster Canvas.prefab | 298 ++++++++--------- .../Prefabs/UI/Puzzle Plan Entry.prefab | 2 +- Assets/Engine/Runtime/Measurements/Measure.cs | 6 +- Assets/Engine/Runtime/UI/GameControl.cs | 4 - Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs | 8 + 7 files changed, 486 insertions(+), 155 deletions(-) create mode 100644 Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab create mode 100644 Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab.meta diff --git a/Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab b/Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab new file mode 100644 index 0000000..e85de44 --- /dev/null +++ b/Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab @@ -0,0 +1,316 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1426389422660023004 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3093889143253032090, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_Name + value: Current Puzzle + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_SizeDelta.x + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5130676646786296218} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cad05994b2fb37746988912bce5a31f5, type: 3} +--- !u!114 &1167465838608174999 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 286020777690709323, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + m_PrefabInstance: {fileID: 1426389422660023004} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ef80fc9016c4a46a190769f3b771bfa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &4117484506985705025 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, + type: 3} + m_PrefabInstance: {fileID: 1426389422660023004} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8450872368111848395 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4117484506985705025} + m_Modifications: + - target: {fileID: 3635623839229914385, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_Text + value: Skip + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501520, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_SizeDelta.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1167465838608174999} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Skip + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: EscapeRoomEngine.Engine.Runtime.UI.PuzzlePlanEntry, Engine + objectReference: {fileID: 0} + - target: {fileID: 3635623840709501522, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7b840466ebfae1468d75282ab9334f5, type: 3} +--- !u!224 &5130676646786296218 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3635623840709501521, guid: c7b840466ebfae1468d75282ab9334f5, + type: 3} + m_PrefabInstance: {fileID: 8450872368111848395} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab.meta b/Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab.meta new file mode 100644 index 0000000..20b7aae --- /dev/null +++ b/Assets/Engine/Assets/Prefabs/UI/Current Puzzle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9503821b3d498f84bb509bc30bfe48bd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab b/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab index f0f5f8b..f2c9961 100644 --- a/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab +++ b/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab @@ -295,7 +295,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8009434559142878411} - - {fileID: 4003649744034896024} + - {fileID: 6713424965590935305} - {fileID: 6274503117580424567} - {fileID: 6774799649923343634} m_Father: {fileID: 4522052738963994966} @@ -320,7 +320,7 @@ MonoBehaviour: m_EditorClassIdentifier: entryOffset: {x: 0, y: -28} plan: {fileID: 6774799649923343634} - currentPuzzle: {fileID: 2204590716513089870} + currentPuzzle: {fileID: 8375980377505990367} entryPrefab: {fileID: 286020777690709323, guid: cad05994b2fb37746988912bce5a31f5, type: 3} currentPuzzleTitle: {fileID: 8009434559142878412} @@ -605,7 +605,7 @@ RectTransform: - {fileID: 7578302057580157030} - {fileID: 9062548758054197003} m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2821,152 +2821,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2075557198174621273} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2116799517952066565 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7578302057580157030} - m_Modifications: - - target: {fileID: 3093889143253032090, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_Name - value: Current Puzzle - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032090, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_SizeDelta.x - value: 320 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -30 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cad05994b2fb37746988912bce5a31f5, type: 3} ---- !u!114 &2204590716513089870 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 286020777690709323, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - m_PrefabInstance: {fileID: 2116799517952066565} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ef80fc9016c4a46a190769f3b771bfa, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &4003649744034896024 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3093889143253032093, guid: cad05994b2fb37746988912bce5a31f5, - type: 3} - m_PrefabInstance: {fileID: 2116799517952066565} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2501054174014209494 PrefabInstance: m_ObjectHideFlags: 0 @@ -4485,6 +4339,152 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5967568217610869408} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7209944386158184776 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7578302057580157030} + m_Modifications: + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_SizeDelta.x + value: 320 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705030, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_Name + value: Current Puzzle + objectReference: {fileID: 0} + - target: {fileID: 4117484506985705030, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9503821b3d498f84bb509bc30bfe48bd, type: 3} +--- !u!224 &6713424965590935305 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4117484506985705025, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + m_PrefabInstance: {fileID: 7209944386158184776} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8375980377505990367 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1167465838608174999, guid: 9503821b3d498f84bb509bc30bfe48bd, + type: 3} + m_PrefabInstance: {fileID: 7209944386158184776} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ef80fc9016c4a46a190769f3b771bfa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7518879480825589967 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Engine/Assets/Prefabs/UI/Puzzle Plan Entry.prefab b/Assets/Engine/Assets/Prefabs/UI/Puzzle Plan Entry.prefab index 6164067..81e2a54 100644 --- a/Assets/Engine/Assets/Prefabs/UI/Puzzle Plan Entry.prefab +++ b/Assets/Engine/Assets/Prefabs/UI/Puzzle Plan Entry.prefab @@ -225,7 +225,7 @@ PrefabInstance: - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} propertyPath: m_SizeDelta.x - value: 160 + value: 122 objectReference: {fileID: 0} - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} diff --git a/Assets/Engine/Runtime/Measurements/Measure.cs b/Assets/Engine/Runtime/Measurements/Measure.cs index e724a92..e18e655 100644 --- a/Assets/Engine/Runtime/Measurements/Measure.cs +++ b/Assets/Engine/Runtime/Measurements/Measure.cs @@ -89,7 +89,11 @@ namespace EscapeRoomEngine.Engine.Runtime.Measurements { throw new EngineException("Measuring session must be started before taking measurements."); } - + + if (!_runningMeasurements.ContainsKey(puzzle.Id)) + { + return; + } var measurement = _runningMeasurements[puzzle.Id]; if (Store) diff --git a/Assets/Engine/Runtime/UI/GameControl.cs b/Assets/Engine/Runtime/UI/GameControl.cs index 3c5f70d..52cf131 100644 --- a/Assets/Engine/Runtime/UI/GameControl.cs +++ b/Assets/Engine/Runtime/UI/GameControl.cs @@ -229,15 +229,11 @@ namespace EscapeRoomEngine.Engine.Runtime.UI #endregion - #region Measurements - public void StoreMeasurements(Toggle toggle) { Measure.Store = toggle.isOn; } - #endregion - public void ExitGame() { StopGame(); diff --git a/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs b/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs index eb0aa3f..97b0150 100644 --- a/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs +++ b/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs @@ -30,5 +30,13 @@ namespace EscapeRoomEngine.Engine.Runtime.UI estimatedTime.text = $"Est. {Measure.EstimateTime(value).ToTimeSpan():mm':'ss}"; } } + + public void Skip() + { + var store = Measure.Store; + Measure.Store = false; + Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom()); + Measure.Store = store; + } } } \ No newline at end of file