diff --git a/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab b/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab index 1120d93..158fca6 100644 --- a/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab +++ b/Assets/Engine/Assets/Prefabs/UI/Gamemaster Canvas.prefab @@ -1,5 +1,265 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &645535651561670835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6000588368100331823} + m_Layer: 5 + m_Name: Room Size + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6000588368100331823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645535651561670835} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6287037411157557552} + - {fileID: 5512969436623976929} + - {fileID: 5410716308468796752} + - {fileID: 4041894032453896055} + - {fileID: 6898805180676670530} + - {fileID: 1820410926439358110} + - {fileID: 8421739936074329982} + m_Father: {fileID: 4522052738963994966} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -10} + m_SizeDelta: {x: 210, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!1 &747625076043598712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5273975953603767832} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5273975953603767832 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 747625076043598712} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 865696691450252539} + m_Father: {fileID: 1820410926439358110} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2160510170057070452 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8339766710613791163} + - component: {fileID: 7429828921669718250} + - component: {fileID: 560723293036597526} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8339766710613791163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2160510170057070452} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5609154947844217158} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7429828921669718250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2160510170057070452} + m_CullTransparentMesh: 1 +--- !u!114 &560723293036597526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2160510170057070452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2504196432302044171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1820410926439358110} + - component: {fileID: 1208278212604960030} + m_Layer: 5 + m_Name: Length Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1820410926439358110 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504196432302044171} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3915301346289146733} + - {fileID: 9177790099524434635} + - {fileID: 5273975953603767832} + m_Father: {fileID: 6000588368100331823} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 58, y: -67.70001} + m_SizeDelta: {x: 125, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1208278212604960030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2504196432302044171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7048852660593082032} + m_FillRect: {fileID: 8435147345517691865} + m_HandleRect: {fileID: 865696691450252539} + m_Direction: 0 + m_MinValue: 2 + m_MaxValue: 8 + m_WholeNumbers: 1 + m_Value: 4 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6342815206448132038} + m_TargetAssemblyTypeName: EscapeRoomEngine.Engine.Runtime.UI.GameControl, + Engine + m_MethodName: SetRoomSize + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2801345200061880593 GameObject: m_ObjectHideFlags: 0 @@ -88,17 +348,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4522052738508588346} - - {fileID: 3651690039212746853} - - {fileID: 6111926162705994754} - - {fileID: 1606827657543776964} - {fileID: 8506001028645180302} + - {fileID: 3651690039212746853} + - {fileID: 6434422615423022383} - {fileID: 5237193151499999207} - {fileID: 4759128159024176926} - {fileID: 1891571209360683323} - - {fileID: 6434422615423022383} - {fileID: 3909503323894949288} + - {fileID: 6111926162705994754} + - {fileID: 1606827657543776964} - {fileID: 7086005505455629097} + - {fileID: 4522052738508588346} - {fileID: 76348826299067250} - {fileID: 1019622809213071054} m_Father: {fileID: 4522052738963994966} @@ -258,10 +518,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7182894751559651105} + - {fileID: 6000588368100331823} - {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} @@ -285,6 +546,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -354,8 +616,117 @@ MonoBehaviour: estimateTimeText: {fileID: 5237193151499999206} targetTimeText: {fileID: 7086005505455629096} percentileText: {fileID: 6754372771656696046} + widthText: {fileID: 4041894032453896054} + lengthText: {fileID: 8421739936074329983} + roomWidth: {fileID: 177233965105736907} + roomLength: {fileID: 1208278212604960030} + roomSizeElement: {fileID: 6000588368100331823} puzzlePlan: {fileID: 6766262628066891748} gameState: 0 +--- !u!1 &5089010474724971539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5410716308468796752} + - component: {fileID: 177233965105736907} + m_Layer: 5 + m_Name: Width Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5410716308468796752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089010474724971539} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6270732561272112277} + - {fileID: 3805209077438812727} + - {fileID: 5609154947844217158} + m_Father: {fileID: 6000588368100331823} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 58, y: -37.7} + m_SizeDelta: {x: 125, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &177233965105736907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089010474724971539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 560723293036597526} + m_FillRect: {fileID: 4445709765345197137} + m_HandleRect: {fileID: 8339766710613791163} + m_Direction: 0 + m_MinValue: 2 + m_MaxValue: 8 + m_WholeNumbers: 1 + m_Value: 2 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6342815206448132038} + m_TargetAssemblyTypeName: EscapeRoomEngine.Engine.Runtime.UI.GameControl, + Engine + m_MethodName: SetRoomSize + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &5267753817356931382 GameObject: m_ObjectHideFlags: 0 @@ -433,6 +804,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5309809194690759730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8435147345517691865} + - component: {fileID: 940032565864018924} + - component: {fileID: 6149340588869090903} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8435147345517691865 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5309809194690759730} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9177790099524434635} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &940032565864018924 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5309809194690759730} + m_CullTransparentMesh: 1 +--- !u!114 &6149340588869090903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5309809194690759730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5644458805796663834 GameObject: m_ObjectHideFlags: 0 @@ -533,6 +980,421 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 1 +--- !u!1 &5972908534052312875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6270732561272112277} + - component: {fileID: 2218709894556537625} + - component: {fileID: 3692513848627262998} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6270732561272112277 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5972908534052312875} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5410716308468796752} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2218709894556537625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5972908534052312875} + m_CullTransparentMesh: 1 +--- !u!114 &3692513848627262998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5972908534052312875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6265322034568624917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5609154947844217158} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5609154947844217158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6265322034568624917} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8339766710613791163} + m_Father: {fileID: 5410716308468796752} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6819410632710704640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3805209077438812727} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3805209077438812727 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6819410632710704640} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4445709765345197137} + m_Father: {fileID: 5410716308468796752} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7936428595735713397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 865696691450252539} + - component: {fileID: 1230229068852886904} + - component: {fileID: 7048852660593082032} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &865696691450252539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936428595735713397} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5273975953603767832} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1230229068852886904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936428595735713397} + m_CullTransparentMesh: 1 +--- !u!114 &7048852660593082032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7936428595735713397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8282488291713226760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9177790099524434635} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9177790099524434635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8282488291713226760} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8435147345517691865} + m_Father: {fileID: 1820410926439358110} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8563645623372468921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3915301346289146733} + - component: {fileID: 4121178781058115521} + - component: {fileID: 3285987115996936754} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3915301346289146733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8563645623372468921} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1820410926439358110} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4121178781058115521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8563645623372468921} + m_CullTransparentMesh: 1 +--- !u!114 &3285987115996936754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8563645623372468921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8754207826814250691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4445709765345197137} + - component: {fileID: 4107961183390603835} + - component: {fileID: 4657156489241012055} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4445709765345197137 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8754207826814250691} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3805209077438812727} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4107961183390603835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8754207826814250691} + m_CullTransparentMesh: 1 +--- !u!114 &4657156489241012055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8754207826814250691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8812200079196013201 GameObject: m_ObjectHideFlags: 0 @@ -1549,6 +2411,152 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1881346252679449620} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2075557198174621273 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6000588368100331823} + m_Modifications: + - target: {fileID: 2655555272253868329, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Name + value: Width + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 190 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -34 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Text + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} +--- !u!114 &4041894032453896054 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 2075557198174621273} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &4041894032453896055 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 2075557198174621273} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2116799517952066565 PrefabInstance: m_ObjectHideFlags: 0 @@ -2794,6 +3802,152 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5475628624166606309} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5781050347048265296 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6000588368100331823} + m_Modifications: + - target: {fileID: 2655555272253868329, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Name + value: Length + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 190 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -64 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Text + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} +--- !u!224 &8421739936074329982 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 5781050347048265296} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8421739936074329983 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 5781050347048265296} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5967568217610869408 PrefabInstance: m_ObjectHideFlags: 0 @@ -2928,6 +4082,140 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5967568217610869408} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7518879480825589967 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6000588368100331823} + m_Modifications: + - target: {fileID: 2655555272253868329, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Name + value: Width Label + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.x + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -34 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Text + value: Width + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} +--- !u!224 &5512969436623976929 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 7518879480825589967} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7814961547219803849 PrefabInstance: m_ObjectHideFlags: 0 @@ -3215,6 +4503,142 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8073688616030330156} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8330082904390027294 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6000588368100331823} + m_Modifications: + - target: {fileID: 2655555272253868329, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Name + value: Title + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Text + value: 'Room Size (at least 8m^2) + +' + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} +--- !u!224 &6287037411157557552 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 8330082904390027294} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8343461623963180121 PrefabInstance: m_ObjectHideFlags: 0 @@ -3511,3 +4935,137 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8747740128642894273} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8892102042080775532 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6000588368100331823} + m_Modifications: + - target: {fileID: 2655555272253868329, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Name + value: Length Label + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.x + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -64 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655555272253868335, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + propertyPath: m_Text + value: Length + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa44f6047bc35a141a84d1b4e0919ff9, type: 3} +--- !u!224 &6898805180676670530 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2655555272253868334, guid: fa44f6047bc35a141a84d1b4e0919ff9, + type: 3} + m_PrefabInstance: {fileID: 8892102042080775532} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Engine/Runtime/Engine.cs b/Assets/Engine/Runtime/Engine.cs index b35cb98..fe0c5a4 100644 --- a/Assets/Engine/Runtime/Engine.cs +++ b/Assets/Engine/Runtime/Engine.cs @@ -63,7 +63,7 @@ namespace EscapeRoomEngine.Engine.Runtime { _playSpaceOrigin = new GameObject("Play Space Origin"); _playSpaceOrigin.transform.SetParent(transform); - _playSpaceOrigin.transform.localPosition = new Vector3(-theme.playSpace.x / 2f, 0, -theme.playSpace.y / 2f); + _playSpaceOrigin.transform.localPosition = new Vector3(-GameControl.Instance.RoomSize.x / 2f, 0, -GameControl.Instance.RoomSize.y / 2f); } #region Generation diff --git a/Assets/Engine/Runtime/EngineTheme.cs b/Assets/Engine/Runtime/EngineTheme.cs index a99a9ac..4a48223 100644 --- a/Assets/Engine/Runtime/EngineTheme.cs +++ b/Assets/Engine/Runtime/EngineTheme.cs @@ -13,16 +13,6 @@ namespace EscapeRoomEngine.Engine.Runtime [CreateAssetMenu(menuName = "Engine Theme")] public class EngineTheme : ScriptableObject { - #region Size - - [BoxGroup("Size")] [Tooltip("The minimum size that should be allowed for rooms.")] - public Vector2Int minRoomSize; - - [BoxGroup("Size")] [Tooltip("The size of the physical play space available to the engine.")] - public Vector2Int playSpace; - - #endregion - #region Theme [BoxGroup("Theme")] [Required] diff --git a/Assets/Engine/Runtime/Space.cs b/Assets/Engine/Runtime/Space.cs index d51944b..5c9dc27 100644 --- a/Assets/Engine/Runtime/Space.cs +++ b/Assets/Engine/Runtime/Space.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.Description; +using EscapeRoomEngine.Engine.Runtime.UI; using EscapeRoomEngine.Engine.Runtime.Utilities; using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; @@ -51,10 +52,11 @@ namespace EscapeRoomEngine.Engine.Runtime internal Space(Room room, Passage entrance) { this.room = room; - rrPlacement = GenerateSpaceDimensions( - entrance, - Engine.Theme.minRoomSize.ProjectAtFloor(), - Engine.Theme.playSpace.ProjectAtFloor()); + rrPlacement = new Placement + { + position = Vector3Int.zero, + size = new Vector2Int(GameControl.Instance.RoomSize.x, GameControl.Instance.RoomSize.y) + }; // connect the space to its entrance passage entrance.PlaceEntrance(new DoorModule(this, @@ -146,62 +148,5 @@ namespace EscapeRoomEngine.Engine.Runtime /// /// The room relative (RR) position that should be converted to a space relative (SR) position. internal Vector3Int ToSpaceRelative(Vector3Int rrPosition) => rrPosition - rrPlacement.position; - - /// - /// Generate space dimensions that fit the required size constraints and cover the position of the entrance. - /// - /// A room relative (RR) placement with the generated dimensions. Always faces North. - private static Placement GenerateSpaceDimensions(Passage entrance, Vector3Int minSize, Vector3Int availableSpace) - { - var x = new Range(-1, -1); - var z = new Range(-1, -1); - var door = entrance.fromOut; - var position = door.RrPosition; - var bottomLeft = door.srPlacement.BottomLeft; - var doorSize = door.Size; - - // fix the side the door is facing away from - switch (door.Orientation) - { - case Orientation.North: - z.min = position.z; - z.max = Utilities.Utilities.RandomInclusive(z.min + minSize.z, availableSpace.z); - break; - case Orientation.East: - x.min = position.x; - x.max = Utilities.Utilities.RandomInclusive(x.min + minSize.x, availableSpace.x); - break; - case Orientation.South: - z.max = position.z + 1; - z.min = Utilities.Utilities.RandomInclusive(0, z.max - minSize.z); - break; - case Orientation.West: - x.max = position.x + 1; - x.min = Utilities.Utilities.RandomInclusive(0, x.max - minSize.x); - break; - default: - throw new ArgumentOutOfRangeException(); - } - - // calculate remaining values if they haven't been covered by the switch statement yet - if(x.min == -1) - x.min = Utilities.Utilities.RandomInclusive(0, Math.Min(bottomLeft.x, availableSpace.x - minSize.x)); - if(x.max == -1) - x.max = Utilities.Utilities.RandomInclusive(Math.Max(bottomLeft.x + doorSize.x, x.min + minSize.x), availableSpace.x); - if(z.min == -1) - z.min = Utilities.Utilities.RandomInclusive(0, Math.Min(bottomLeft.z, availableSpace.z - minSize.z)); - if(z.max == -1) - z.max = Utilities.Utilities.RandomInclusive(Math.Max(bottomLeft.z + doorSize.x, z.min + minSize.z), availableSpace.z); - - var dimensions = new Placement - { - position = new Vector3Int(x.min, 0, z.min), - size = new Vector2Int(x.Length, z.Length) - }; - - Logger.Log($"Generated space dimensions {dimensions} from entrance position {position}", LogType.RoomGeneration); - - return dimensions; - } } } diff --git a/Assets/Engine/Runtime/UI/GameControl.cs b/Assets/Engine/Runtime/UI/GameControl.cs index 4e60444..ec29bba 100644 --- a/Assets/Engine/Runtime/UI/GameControl.cs +++ b/Assets/Engine/Runtime/UI/GameControl.cs @@ -19,6 +19,8 @@ namespace EscapeRoomEngine.Engine.Runtime.UI /// public class GameControl : MonoBehaviour { + public static readonly Vector2Int DefaultRoomSize = new Vector2Int(2, 4); + /// /// The active instance of the game control. /// @@ -33,7 +35,11 @@ namespace EscapeRoomEngine.Engine.Runtime.UI [BoxGroup("Internal")] [SerializeField] private Button startButton, stopButton, pauseButton, addTimeButton, removeTimeButton; [BoxGroup("Internal")] [SerializeField] - private Text timeText, roomTimeText, estimateTimeText, targetTimeText, percentileText; + private Text timeText, roomTimeText, estimateTimeText, targetTimeText, percentileText, widthText, lengthText; + [BoxGroup("Internal")] [SerializeField] + private Slider roomWidth, roomLength; + [BoxGroup("Internal")] [SerializeField] + private Transform roomSizeElement; [BoxGroup("Internal")] [SerializeField] private PuzzlePlan puzzlePlan; @@ -67,12 +73,15 @@ namespace EscapeRoomEngine.Engine.Runtime.UI /// The estimated total time the player will spend in the experience. /// public float EstimatedTime { get; private set; } + public Vector2Int RoomSize { get; private set; } private float _previousUIUpdate, _previousPlanUpdate; private void Awake() { Instance = this; + + RoomSize = DefaultRoomSize; } private void Start() @@ -114,6 +123,8 @@ namespace EscapeRoomEngine.Engine.Runtime.UI pauseButton.interactable = gameState is GameState.Running or GameState.Paused; addTimeButton.interactable = gameState is GameState.Running or GameState.Paused; removeTimeButton.interactable = gameState is GameState.Running or GameState.Paused && TargetTime >= TimeElapsed + 60; + roomWidth.interactable = gameState == GameState.Stopped; + roomLength.interactable = gameState == GameState.Stopped; } #region Time Controls @@ -124,6 +135,8 @@ namespace EscapeRoomEngine.Engine.Runtime.UI TimeElapsed = 0; + Destroy(roomSizeElement.gameObject); + // generate the first room if it hasn't been generated yet Engine.Instance.CurrentRoom.Match(none: () => Engine.Instance.GenerateRoom()); @@ -217,6 +230,13 @@ namespace EscapeRoomEngine.Engine.Runtime.UI #endregion + public void SetRoomSize() + { + RoomSize = new Vector2Int((int)roomWidth.value, (int)roomLength.value); + widthText.text = RoomSize.x.ToString(); + lengthText.text = RoomSize.y.ToString(); + } + public void ExitGame() { StopGame(); diff --git a/Assets/Scenes/EscapeRoomEngine.unity b/Assets/Scenes/EscapeRoomEngine.unity index 51f661a..53192c7 100644 --- a/Assets/Scenes/EscapeRoomEngine.unity +++ b/Assets/Scenes/EscapeRoomEngine.unity @@ -302,6 +302,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2536345795331795879, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2536345795331795879, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2536345795331795879, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2702596707407149509, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2702596707407149509, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6669187003974842087, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6669187003974842087, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6669187003974842087, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6854256364732531324, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} propertyPath: m_Name @@ -362,6 +402,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7871291356846442061, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7871291356846442061, guid: ecbf9ce952d5f38458b8237a4483c562, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/URP/URP-HighFidelity-Renderer.asset b/Assets/URP/URP-HighFidelity-Renderer.asset index 4674894..1e2f40a 100644 --- a/Assets/URP/URP-HighFidelity-Renderer.asset +++ b/Assets/URP/URP-HighFidelity-Renderer.asset @@ -102,6 +102,7 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: - {fileID: -1381608776974771741} - {fileID: -7323701910238630107} @@ -126,6 +127,7 @@ MonoBehaviour: coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, diff --git a/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset new file mode 100644 index 0000000..7466a7d --- /dev/null +++ b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 690929a59dc7a42da9030305190d391f, type: 3} + m_Name: XRDeviceSimulatorSettings + m_EditorClassIdentifier: + m_AutomaticallyInstantiateSimulatorPrefab: 0 + m_SimulatorPrefab: {fileID: 0} diff --git a/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta new file mode 100644 index 0000000..72d0e49 --- /dev/null +++ b/Assets/XRI/Settings/Resources/XRDeviceSimulatorSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8dc191dd1ed110442ba3033ce39f67fe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index d8e268f..599c69f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", - "com.unity.xr.interaction.toolkit": "2.2.0", + "com.unity.xr.interaction.toolkit": "2.3.1", "com.unity.xr.mock-hmd": "1.3.1-preview.1", "com.unity.xr.openxr": "1.7.0", "io.realm.unity": "10.21.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a6d8c86..7487b60 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -65,7 +65,7 @@ "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.2", + "com.unity.burst": "1.8.4", "com.unity.render-pipelines.core": "14.0.7", "com.unity.shadergraph": "14.0.7" } @@ -86,15 +86,6 @@ "com.unity.searcher": "4.9.2" } }, - "com.unity.subsystemregistration": { - "version": "1.1.1", - "depth": 2, - "source": "registry", - "dependencies": { - "com.unity.modules.subsystems": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.textmeshpro": { "version": "3.0.6", "depth": 0, @@ -136,7 +127,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.1.1", + "version": "2.2.0", "depth": 1, "source": "registry", "dependencies": { @@ -145,14 +136,15 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "2.2.0", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.inputsystem": "1.3.0", + "com.unity.inputsystem": "1.4.4", + "com.unity.mathematics": "1.2.6", "com.unity.ugui": "1.0.0", - "com.unity.xr.core-utils": "2.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.8", + "com.unity.xr.core-utils": "2.2.0", + "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.audio": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.physics": "1.0.0" @@ -170,15 +162,14 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.2.0", + "version": "4.3.3", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7", - "com.unity.subsystemregistration": "1.0.6" + "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 48098f4..d1c07a3 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.2.14f1 -m_EditorVersionWithRevision: 2022.2.14f1 (b2c9b1ac6cc0) +m_EditorVersion: 2022.2.19f1 +m_EditorVersionWithRevision: 2022.2.19f1 (765657fe9343)