From b434d8fd69f6c9f14230fa5eae8157b25c07382a Mon Sep 17 00:00:00 2001 From: xBambusekD Date: Mon, 1 Jun 2020 16:24:06 +0200 Subject: [PATCH 01/37] Fix: AO were working with global positions and rotations; gizmo changed back to world space --- .../TABLET/Prefabs/AR Session Origin.prefab | 2 +- .../Assets/TABLET/Scenes/TabletGUI.unity | 662 +++++++++++++++--- .../Assets/TABLET/Scripts/ActionObject3D.cs | 4 +- 3 files changed, 554 insertions(+), 114 deletions(-) diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab index 16461db68..a4e8b5243 100644 --- a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab +++ b/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab @@ -208,7 +208,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c0ad0e8e55c95c4e931911c4b943a64, type: 3} m_Name: m_EditorClassIdentifier: - space: 1 + space: 0 transformType: 0 pivot: 0 centerType: 0 diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 698b3a6ca..14ce880cb 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -3726,12 +3726,12 @@ PrefabInstance: - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} @@ -3746,7 +3746,7 @@ PrefabInstance: - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} @@ -3793,11 +3793,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 8064793146822891690, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8064793146822891690, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.x @@ -3866,12 +3861,12 @@ PrefabInstance: - target: {fileID: 8064793147153119764, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 8064793147153119764, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 8064793147153119764, guid: f0880da28fd8a3445a37166529baa870, type: 3} @@ -3921,7 +3916,7 @@ PrefabInstance: - target: {fileID: 8064793147154419921, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 8064793147154419921, guid: f0880da28fd8a3445a37166529baa870, type: 3} @@ -5777,7 +5772,7 @@ PrefabInstance: - target: {fileID: 5387975123586311097, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5387975123586311097, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} @@ -5973,7 +5968,7 @@ PrefabInstance: - target: {fileID: 5387975124007786044, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5387975124007786044, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} @@ -6288,12 +6283,12 @@ PrefabInstance: - target: {fileID: 5387975124990458776, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 5387975124990458776, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 5387975124990458779, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} @@ -6355,11 +6350,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 5387975125276962341, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5387975125276962341, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchoredPosition.x @@ -9119,17 +9109,17 @@ PrefabInstance: - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, type: 3} propertyPath: m_AnchoredPosition.y - value: -1499 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, type: 3} @@ -9803,12 +9793,12 @@ PrefabInstance: - target: {fileID: 1771758554277484937, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 1771758554277484937, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 1771758554277484937, guid: def3169f9eb264940bb689878d06ba51, type: 3} @@ -9853,7 +9843,7 @@ PrefabInstance: - target: {fileID: 1771758554794508032, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 1771758554794508032, guid: def3169f9eb264940bb689878d06ba51, type: 3} @@ -10051,11 +10041,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1771758555340198368, guid: def3169f9eb264940bb689878d06ba51, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1771758555340198368, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_AnchoredPosition.x @@ -11145,12 +11130,12 @@ PrefabInstance: - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -11165,7 +11150,7 @@ PrefabInstance: - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -11310,12 +11295,12 @@ PrefabInstance: - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -11325,7 +11310,7 @@ PrefabInstance: - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchoredPosition.y - value: -749 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -11390,12 +11375,12 @@ PrefabInstance: - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -11405,7 +11390,7 @@ PrefabInstance: - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchoredPosition.y - value: -379.835 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -13221,12 +13206,12 @@ PrefabInstance: - target: {fileID: 5146173423632480372, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 5146173423632480372, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 5146173423632480373, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} @@ -13333,11 +13318,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5146173424541003786, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5146173424541003786, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchoredPosition.x @@ -13441,17 +13421,17 @@ PrefabInstance: - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} @@ -13662,7 +13642,7 @@ PrefabInstance: - target: {fileID: 5146173425131539463, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5146173425131539463, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} @@ -14463,17 +14443,12 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1945084.9 - objectReference: {fileID: 0} - - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 1943078.9 + value: 1944908.4 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.x - value: -7126437 + value: -7212233 objectReference: {fileID: 0} - target: {fileID: 224818740107539070, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -16559,6 +16534,36 @@ PrefabInstance: propertyPath: m_textInfo.pageCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 2083562121273274920, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274920, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274920, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274920, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274920, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274920, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2083562121273274927, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMax.x @@ -16574,6 +16579,36 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2083562121273274983, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274983, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274983, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274983, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274983, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273274983, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2083562121273275016, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMin.y @@ -16789,6 +16824,81 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2083562121273275090, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275091, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275091, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275094, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275094, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275094, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275094, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275094, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275094, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275098, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275098, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275098, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275098, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275098, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275098, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2083562121273275100, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMin.y @@ -16809,6 +16919,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2083562121273275101, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275101, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275101, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275101, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275101, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083562121273275101, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2083562121273275117, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMin.y @@ -16879,6 +17019,66 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2085994633906874631, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874631, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874631, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874631, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874631, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874631, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874696, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874696, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874696, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874696, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874696, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874696, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2085994633906874768, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMin.y @@ -17074,6 +17274,111 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2085994633906874866, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874866, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874866, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874866, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874866, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874866, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874869, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874869, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874869, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874869, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874869, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874869, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874873, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874873, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874873, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874873, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874873, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874873, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874876, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874876, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2085994633906874877, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2085994633906875138, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: CanvasRoot @@ -18759,6 +19064,66 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 4308884904745489460, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489460, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489460, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489460, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489460, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489460, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489531, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489531, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489531, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489531, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489531, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489531, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4308884904745489532, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMax.x @@ -18769,6 +19134,111 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4308884904745489536, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489536, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489537, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489541, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489541, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489541, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489541, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489541, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489541, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489545, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489545, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489545, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489545, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489545, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489545, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489550, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489550, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489550, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489550, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489550, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4308884904745489550, guid: d455cbc77f502434fb6b462fe5ea992b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4308884904745489551, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchorMin.y @@ -21494,12 +21964,12 @@ PrefabInstance: - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} @@ -21556,11 +22026,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_AnchoredPosition.x @@ -21895,7 +22360,7 @@ PrefabInstance: - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} @@ -23872,11 +24337,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 6216758926721125335, guid: 5cbe364d69770da45b60638f7063dbbb, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6216758926721125335, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_AnchoredPosition.x @@ -24020,7 +24480,7 @@ PrefabInstance: - target: {fileID: 6216758927118031462, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 730 objectReference: {fileID: 0} - target: {fileID: 6216758927118031462, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} @@ -24105,12 +24565,12 @@ PrefabInstance: - target: {fileID: 6216758927294702443, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 6216758927294702443, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 6216758927294702443, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} @@ -24565,7 +25025,7 @@ PrefabInstance: - target: {fileID: 5651539255775674548, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5651539255775674548, guid: 15db7d064d3db684495e711599b768e3, type: 3} @@ -24680,12 +25140,12 @@ PrefabInstance: - target: {fileID: 6339420666132169866, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 6339420666132169866, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 6339420666132169866, guid: 15db7d064d3db684495e711599b768e3, type: 3} @@ -24820,7 +25280,7 @@ PrefabInstance: - target: {fileID: 6339420666686939651, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 6339420666686939651, guid: 15db7d064d3db684495e711599b768e3, type: 3} @@ -25108,11 +25568,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 6339420667215334627, guid: 15db7d064d3db684495e711599b768e3, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6339420667215334627, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchoredPosition.x @@ -25322,12 +25777,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 5915929.5 - objectReference: {fileID: 0} - - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 5915601.5 + value: 5919477.5 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -26646,17 +27096,17 @@ PrefabInstance: - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 357.5 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} @@ -26671,7 +27121,7 @@ PrefabInstance: - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 1401866934940210444, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} @@ -34614,12 +35064,12 @@ PrefabInstance: - target: {fileID: 8723196978310527387, guid: 3a508840590a04d4ea5612b3a67a83fb, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 265 objectReference: {fileID: 0} - target: {fileID: 8723196978310527387, guid: 3a508840590a04d4ea5612b3a67a83fb, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 530 objectReference: {fileID: 0} - target: {fileID: 8723196978310527387, guid: 3a508840590a04d4ea5612b3a67a83fb, type: 3} @@ -34967,12 +35417,12 @@ PrefabInstance: - target: {fileID: 686204649742473271, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 686204649742473271, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 686204649742473271, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} @@ -35022,7 +35472,7 @@ PrefabInstance: - target: {fileID: 686204649852068154, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 730 objectReference: {fileID: 0} - target: {fileID: 686204649852068154, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} @@ -35069,11 +35519,6 @@ PrefabInstance: propertyPath: m_textInfo.wordCount value: 1 objectReference: {fileID: 0} - - target: {fileID: 686204650257330315, guid: 831d3305262fd744b9cd0d88cd5e3dbd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 686204650257330315, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_AnchoredPosition.x @@ -43874,12 +44319,12 @@ PrefabInstance: - target: {fileID: 7295890121935956532, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 7295890121935956532, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 7295890121935956532, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} @@ -44040,7 +44485,7 @@ PrefabInstance: - target: {fileID: 7295890122492808381, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7295890122492808381, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} @@ -44122,11 +44567,6 @@ PrefabInstance: propertyPath: m_Name value: Ok objectReference: {fileID: 0} - - target: {fileID: 7295890123037729373, guid: 908ca497e2e4fa54ca468e776ffba003, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7295890123037729373, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/ActionObject3D.cs b/arcor2_AREditor/Assets/TABLET/Scripts/ActionObject3D.cs index 5b7d8fc0f..c509c1a4a 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/ActionObject3D.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/ActionObject3D.cs @@ -76,8 +76,8 @@ public override void SetSceneOrientation(Quaternion orientation) { } public IO.Swagger.Model.Pose GetPose() { - return new IO.Swagger.Model.Pose(position: DataHelper.Vector3ToPosition(TransformConvertor.UnityToROS(transform.position)), - orientation: DataHelper.QuaternionToOrientation(TransformConvertor.UnityToROS(transform.rotation))); + return new IO.Swagger.Model.Pose(position: DataHelper.Vector3ToPosition(TransformConvertor.UnityToROS(transform.localPosition)), + orientation: DataHelper.QuaternionToOrientation(TransformConvertor.UnityToROS(transform.localRotation))); } public override void OnClick(Click type) { From 1a807f2a283772b75e1babc8c7066faaed0b48af Mon Sep 17 00:00:00 2001 From: xBambusekD Date: Tue, 2 Jun 2020 21:30:18 +0200 Subject: [PATCH 02/37] IMPORTANT! - UPDATE GIT SUBMODULE AFTER PULLING THIS COMMIT - Unity3DRuntimeTransformGizmo switched to forked repo in xBambusekD --- .gitmodules | 2 +- arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4ab5e5ebf..f4774491c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ ignore = dirty [submodule "arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo"] path = arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo - url = https://github.com/HiddenMonk/Unity3DRuntimeTransformGizmo.git + url = https://github.com/xBambusekD/Unity3DRuntimeTransformGizmo.git ignore = dirty [submodule "arcor2_AREditor/Submodules/usfb"] path = arcor2_AREditor/Submodules/usfb diff --git a/arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo b/arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo index eda136f4a..e6eefb3c0 160000 --- a/arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo +++ b/arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo @@ -1 +1 @@ -Subproject commit eda136f4ab84b9139d44c43d923684f58281ef28 +Subproject commit e6eefb3c0ee4e093f520c3db3ce5b84420b80697 From f531e46964e107ff92fdeba8f30b6f8f229ff092 Mon Sep 17 00:00:00 2001 From: xBambusekD Date: Tue, 2 Jun 2020 21:31:14 +0200 Subject: [PATCH 03/37] Gizmo se to move relative to the object (Scene transform) in order to respect the calibration. --- .../TABLET/Prefabs/AR Session Origin.prefab | 3 +- .../Assets/TABLET/Scenes/TabletGUI.unity | 370 ++---------------- 2 files changed, 40 insertions(+), 333 deletions(-) diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab index a4e8b5243..3f33e7b2f 100644 --- a/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab +++ b/arcor2_AREditor/Assets/TABLET/Prefabs/AR Session Origin.prefab @@ -208,7 +208,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1c0ad0e8e55c95c4e931911c4b943a64, type: 3} m_Name: m_EditorClassIdentifier: - space: 0 + space: 2 + objectRelativeTransform: {fileID: 0} transformType: 0 pivot: 0 centerType: 0 diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 221a23619..3be0f3393 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -3733,16 +3733,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.x @@ -3758,11 +3748,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8064793146798578143, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_SizeDelta.y @@ -3811,7 +3796,7 @@ PrefabInstance: - target: {fileID: 8064793146822891690, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 8064793146822891690, guid: f0880da28fd8a3445a37166529baa870, type: 3} @@ -3883,16 +3868,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 8064793147153119764, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 8064793147153119764, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 8064793147153119764, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchoredPosition.y @@ -3943,11 +3918,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 8064793147154419921, guid: f0880da28fd8a3445a37166529baa870, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 8064793147154419921, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_AnchorMin.y @@ -4914,7 +4884,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 386309527} - - {fileID: 1965778219} + - {fileID: 516447806} m_Father: {fileID: 0} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5276,6 +5246,7 @@ MonoBehaviour: m_id: cfc8b322-4b65-4681-b665-bed5c16e082c m_leaveFreeSpace: 1 minimumFreeSpace: {x: 50, y: 50} + PreventDetachingLastDockedPanel: 0 m_panelResizableAreaLength: 40 m_canvasAnchorZoneLength: 20 m_panelAnchorZoneLength: 100 @@ -5803,11 +5774,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 5387975123586311097, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 5387975123586311097, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchorMin.y @@ -6004,11 +5970,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 5387975124007786044, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 5387975124007786044, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchorMin.y @@ -6329,16 +6290,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 5387975124990458776, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 5387975124990458776, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 5387975124990458779, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_Layer @@ -6402,7 +6353,7 @@ PrefabInstance: - target: {fileID: 5387975125276962341, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 5387975125276962341, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} @@ -6446,21 +6397,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} ---- !u!4 &516447806 +--- !u!4 &516447806 stripped Transform: - m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 406632, guid: 6d0acc00cc82d436b9d11446d2ddfef6, type: 3} m_PrefabInstance: {fileID: 380742871} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 637921825} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1965778219} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &517122706 PrefabInstance: m_ObjectHideFlags: 0 @@ -9162,22 +9104,7 @@ PrefabInstance: - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, type: 3} propertyPath: m_AnchoredPosition.x - value: 2510 - objectReference: {fileID: 0} - - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + value: 2630.523 objectReference: {fileID: 0} - target: {fileID: 4916727826583965029, guid: 242af89aff03c1f469c40e414195181a, type: 3} @@ -9722,22 +9649,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 242af89aff03c1f469c40e414195181a, type: 3} ---- !u!1 &637921825 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 380742871} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 516447806} - m_Layer: 0 - m_Name: Missing Prefab (Dummy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &645530829 GameObject: m_ObjectHideFlags: 0 @@ -9889,16 +9800,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 1771758554277484937, guid: def3169f9eb264940bb689878d06ba51, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 1771758554277484937, guid: def3169f9eb264940bb689878d06ba51, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 1771758554277484937, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_AnchorMin.y @@ -9944,11 +9845,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 1771758554794508032, guid: def3169f9eb264940bb689878d06ba51, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 1771758554794508032, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_AnchorMin.y @@ -10148,7 +10044,7 @@ PrefabInstance: - target: {fileID: 1771758555340198368, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 1771758555340198368, guid: def3169f9eb264940bb689878d06ba51, type: 3} @@ -11241,16 +11137,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchoredPosition.x @@ -11266,11 +11152,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5176358584859393096, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_SizeDelta.y @@ -11411,25 +11292,10 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 - objectReference: {fileID: 0} - - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 5176358585292050200, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -11516,16 +11382,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_AnchoredPosition.x @@ -11536,11 +11392,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5176358586260473702, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_SizeDelta.x @@ -13362,16 +13213,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 5146173423632480372, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 5146173423632480372, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 5146173423632480373, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_Layer @@ -13480,7 +13321,7 @@ PrefabInstance: - target: {fileID: 5146173424541003786, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 5146173424541003787, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} @@ -13592,21 +13433,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5146173424915465050, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_SizeDelta.y @@ -13818,11 +13644,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 5146173425131539463, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 5146173425131539463, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_AnchorMin.y @@ -14622,17 +14443,12 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1944488.9 - objectReference: {fileID: 0} - - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 1944908.4 + value: -446700.25 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.x - value: -7212233 + value: -14132646 objectReference: {fileID: 0} - target: {fileID: 224818740107539070, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -16556,7 +16372,7 @@ PrefabInstance: - target: {fileID: 2037016850183391548, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} propertyPath: m_AnchoredPosition.x - value: 223.99902 + value: 223.99878 objectReference: {fileID: 0} - target: {fileID: 2037016850183391548, guid: d455cbc77f502434fb6b462fe5ea992b, type: 3} @@ -22155,16 +21971,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_AnchoredPosition.y @@ -22223,7 +22029,7 @@ PrefabInstance: - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} @@ -22556,11 +22362,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} propertyPath: m_AnchoredPosition.y @@ -22829,6 +22630,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7694872491458505938, guid: 917a61edd84946d4d84b396b6e2eefc8, + type: 3} + propertyPath: objectRelativeTransform + value: + objectReference: {fileID: 311940053} - target: {fileID: 7694872492407101039, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} propertyPath: m_Name @@ -22991,6 +22797,7 @@ MonoBehaviour: type: 3} TrackingLostAnimation: {fileID: 834042260} WorldAnchorLocal: {fileID: 0} + WorldAnchorCloud: {fileID: 0} Calibrated: 0 --- !u!1 &1633935597 GameObject: @@ -24031,37 +23838,6 @@ MonoBehaviour: NotificationEntryPrefab: {fileID: 4313153503463648405, guid: 21ee133349412bc4e82a51de06edef3a, type: 3} NotificationMenuContent: {fileID: 318899661} ---- !u!1 &1965778218 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 380742871} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1965778219} - m_Layer: 0 - m_Name: LunarConsole (Missing Prefab) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1965778219 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 380742871} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1965778218} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 516447806} - m_Father: {fileID: 323698322} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1969230631 GameObject: m_ObjectHideFlags: 0 @@ -24569,7 +24345,7 @@ PrefabInstance: - target: {fileID: 6216758926721125335, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 6216758926721125335, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} @@ -24711,11 +24487,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 730 objectReference: {fileID: 0} - - target: {fileID: 6216758927118031462, guid: 5cbe364d69770da45b60638f7063dbbb, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 730 - objectReference: {fileID: 0} - target: {fileID: 6216758927118031462, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_AnchoredPosition.y @@ -24806,16 +24577,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 6216758927294702443, guid: 5cbe364d69770da45b60638f7063dbbb, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 6216758927294702443, guid: 5cbe364d69770da45b60638f7063dbbb, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 6216758927294702443, guid: 5cbe364d69770da45b60638f7063dbbb, type: 3} propertyPath: m_AnchoredPosition.y @@ -25271,11 +25032,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 5651539255775674548, guid: 15db7d064d3db684495e711599b768e3, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 5651539255775674548, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchorMin.y @@ -25396,16 +25152,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 6339420666132169866, guid: 15db7d064d3db684495e711599b768e3, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 6339420666132169866, guid: 15db7d064d3db684495e711599b768e3, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 6339420666132169866, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchorMin.y @@ -25541,11 +25287,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 6339420666686939651, guid: 15db7d064d3db684495e711599b768e3, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 6339420666686939651, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchorMin.y @@ -25835,7 +25576,7 @@ PrefabInstance: - target: {fileID: 6339420667215334627, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 6339420667215334627, guid: 15db7d064d3db684495e711599b768e3, type: 3} @@ -26041,12 +25782,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 5917641.5 - objectReference: {fileID: 0} - - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 5919477.5 + value: 5938650.5 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -35693,16 +35429,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 686204649742473271, guid: 831d3305262fd744b9cd0d88cd5e3dbd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 686204649742473271, guid: 831d3305262fd744b9cd0d88cd5e3dbd, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 686204649742473271, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_AnchorMin.y @@ -35753,11 +35479,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 730 objectReference: {fileID: 0} - - target: {fileID: 686204649852068154, guid: 831d3305262fd744b9cd0d88cd5e3dbd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 730 - objectReference: {fileID: 0} - target: {fileID: 686204649852068154, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_AnchorMin.y @@ -35806,7 +35527,7 @@ PrefabInstance: - target: {fileID: 686204650257330315, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280.5 + value: 1401.0231 objectReference: {fileID: 0} - target: {fileID: 686204650257330315, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} @@ -38591,7 +38312,7 @@ PrefabInstance: - target: {fileID: 728554504835127953, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00024414062 + value: 0 objectReference: {fileID: 0} - target: {fileID: 870116323103940500, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -38887,12 +38608,12 @@ PrefabInstance: - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1257.5 + value: 1378.0231 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 2515 + value: 2756.0461 objectReference: {fileID: 0} - target: {fileID: 1662977875022336822, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39484,7 +39205,7 @@ PrefabInstance: - target: {fileID: 2768830357252732581, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00048828125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2778343468369029799, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39625,7 +39346,7 @@ PrefabInstance: - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39965,7 +39686,7 @@ PrefabInstance: - target: {fileID: 3186733399446457868, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3186733399446457868, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -40035,12 +39756,12 @@ PrefabInstance: - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1257.5 + value: 1378.0231 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 2515 + value: 2756.0461 objectReference: {fileID: 0} - target: {fileID: 3232450956286077592, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -40411,7 +40132,7 @@ PrefabInstance: - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -40915,7 +40636,7 @@ PrefabInstance: - target: {fileID: 4173655184377456130, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 2510 + value: 2630.523 objectReference: {fileID: 0} - target: {fileID: 4173655184377456130, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -41163,7 +40884,7 @@ PrefabInstance: - target: {fileID: 4620524145206687212, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00048828125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4654071109875633369, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -41957,12 +41678,12 @@ PrefabInstance: - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1257.5 + value: 1378.0231 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 2515 + value: 2756.0461 objectReference: {fileID: 0} - target: {fileID: 5536432216976498313, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -44296,7 +44017,7 @@ PrefabInstance: - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 2510 + value: 2630.523 objectReference: {fileID: 0} - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -44610,16 +44331,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 1460 objectReference: {fileID: 0} - - target: {fileID: 7295890121935956532, guid: 908ca497e2e4fa54ca468e776ffba003, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 7295890121935956532, guid: 908ca497e2e4fa54ca468e776ffba003, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - target: {fileID: 7295890121935956532, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_AnchorMin.y @@ -44781,11 +44492,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15 objectReference: {fileID: 0} - - target: {fileID: 7295890122492808381, guid: 908ca497e2e4fa54ca468e776ffba003, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - target: {fileID: 7295890122492808381, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_AnchorMin.y @@ -44869,7 +44575,7 @@ PrefabInstance: - target: {fileID: 7295890123037729373, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_AnchoredPosition.x - value: 1280 + value: 1400.5231 objectReference: {fileID: 0} - target: {fileID: 7295890123037729373, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} From 90f438ba7da078bb68df09fa8dde5f43882a324f Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 11:58:48 +0200 Subject: [PATCH 04/37] * websockets now use NativeWebsocketLibrary * fixed renaming of scenes, projects and packages --- .gitmodules | 3 + .../Assets/2D_EDITOR/Scripts/MainMenu.cs | 1 - .../BASE/Scripts/Dialogs/InputDialog.cs | 22 ++- .../Assets/BASE/Scripts/GameManager.cs | 24 ++- .../Assets/BASE/Scripts/SceneManager.cs | 1 + .../Assets/BASE/Scripts/WebsocketManager.cs | 144 +++++++----------- .../Assets/TABLET/Scenes/TabletGUI.unity | 42 ++--- .../TABLET/Scripts/GUI/PackageOptionMenu.cs | 8 +- .../TABLET/Scripts/GUI/ProjectOptionMenu.cs | 8 +- .../TABLET/Scripts/GUI/SceneOptionMenu.cs | 16 +- arcor2_AREditor/Submodules/NativeWebSocket | 1 + scripts/link_submodules.bat | 2 + 12 files changed, 126 insertions(+), 146 deletions(-) create mode 160000 arcor2_AREditor/Submodules/NativeWebSocket diff --git a/.gitmodules b/.gitmodules index 4ab5e5ebf..f4f04b97c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule "arcor2_AREditor/Submodules/Simple-Side-Menu"] path = arcor2_AREditor/Submodules/Simple-Side-Menu url = https://github.com/Kapim/Simple-Side-Menu.git +[submodule "arcor2_AREditor/Submodules/NativeWebSocket"] + path = arcor2_AREditor/Submodules/NativeWebSocket + url = https://github.com/endel/NativeWebSocket.git diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs index a7dda18d8..a05ff367a 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs @@ -338,7 +338,6 @@ public void HideDynamicContent() { public void ConnectedToServer(object sender, Base.StringEventArgs e) { - ShowProjectControlButtons(); ShowDynamicContent(); } diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/InputDialog.cs b/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/InputDialog.cs index 721cf279b..02fe8af71 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/InputDialog.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/InputDialog.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.Events; @@ -11,7 +12,7 @@ public class InputDialog : UniversalDialog { [SerializeField] private TMPro.TMP_Text placeholder; - private Func validateFunc; + private Func> validateFunc; public string GetValue() { return input.text; @@ -22,21 +23,30 @@ public void SetInputHint(string hint) { } public void SetInputValue(string value) { - input.text = value; + input.text = value; + Validate(value); } - public void Open(string title, string description, string inputHint, string inputValue, UnityAction confirmationCallback, UnityAction cancelCallback, string confirmLabel = "Confirm", string cancelLabel = "Cancel", Func validateInput = null) { + public void Open(string title, string description, string inputHint, string inputValue, UnityAction confirmationCallback, UnityAction cancelCallback, string confirmLabel = "Confirm", string cancelLabel = "Cancel", Func> validateInput = null) { SetInputHint(inputHint); - SetInputValue(inputValue); + validateFunc = null; Open(title, description, confirmationCallback, cancelCallback, confirmLabel, cancelLabel); if (validateInput != null) { input.onValueChanged.AddListener((value) => Validate(value)); validateFunc = validateInput; } + + SetInputValue(inputValue); + } - public void Validate(string value) { - Base.RequestResult result = validateFunc.Invoke(value); + public async void Validate(string value) { + if (validateFunc == null) { + okBtn.SetInteractivity(true, ""); + return; + } + + Base.RequestResult result = await validateFunc.Invoke(value); if (result.Success) { okBtn.SetInteractivity(true, ""); } else { diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs index 72e837a47..2b8a84030 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs @@ -76,6 +76,7 @@ public class GameManager : Singleton { public event EventHandler OnProjectsListChanged; public event EventHandler OnPackagesListChanged; public event EventHandler OnSceneListChanged; + public event StringEventHandler OnConnectedToServer; public event StringEventHandler OnConnectingToServer; public event EventHandler OnDisconnectedFromServer; @@ -287,8 +288,13 @@ private void Start() { VersionInfo.text = EditorVersion; Scene.SetActive(false); ActionsManager.Instance.OnActionsLoaded += OnActionsLoaded; + WebsocketManager.Instance.OnConnectedEvent += OnConnected; + } + private void OnConnected(object sender, EventArgs args) { + ConnectionStatus = ConnectionStatusEnum.Connected; } + private async void OnConnectionStatusChanged(ConnectionStatusEnum newState) { switch (newState) { case ConnectionStatusEnum.Connected: @@ -372,7 +378,7 @@ private void Init() { public async void ConnectToSever(string domain, int port) { ShowLoadingScreen(); OnConnectingToServer?.Invoke(this, new StringEventArgs(WebsocketManager.Instance.GetWSURI(domain, port))); - if (await WebsocketManager.Instance.ConnectToServer(domain, port)) { + /*if (await WebsocketManager.Instance.ConnectToServer(domain, port)) { try { await Task.Run(() => WebsocketManager.Instance.WaitForInitData(5000)); ConnectionStatus = GameManager.ConnectionStatusEnum.Connected; @@ -386,13 +392,14 @@ public async void ConnectToSever(string domain, int port) { Notifications.Instance.ShowNotification("Connection failed", "Failed to connect to remote server. Is it running?"); WebsocketManager.Instance.DisconnectFromSever(); - } + }*/ + WebsocketManager.Instance.ConnectToServer(domain, port); } public void DisconnectFromSever() { - WebsocketManager.Instance.DisconnectFromSever(); + //WebsocketManager.Instance.DisconnectFromSever(); } private void OnActionsLoaded(object sender, EventArgs e) { @@ -1226,13 +1233,14 @@ public async Task RenameActionObject(string id, string newUserId) { return false; } } - public async Task RenameScene(string id, string newUserId) { + public async Task RenameScene(string id, string newUserId, bool dryRun) { try { - await WebsocketManager.Instance.RenameScene(id, newUserId); - return true; + await WebsocketManager.Instance.RenameScene(id, newUserId, dryRun); + return (true, ""); } catch (RequestFailedException e) { - Notifications.Instance.ShowNotification("Failed to rename scene", e.Message); - return false; + if (!dryRun) + Notifications.Instance.ShowNotification("Failed to rename scene", e.Message); + return (false, e.Message); } } diff --git a/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs index 62d81948d..2646902ed 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs @@ -180,6 +180,7 @@ ex is InvalidDataException || } } } + } public void ClearServices() { diff --git a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs index 2482d3a33..4eaaf5d89 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs @@ -1,14 +1,15 @@ using System; using System.Collections.Generic; -using System.Net.WebSockets; using System.Text; using System.Threading; using UnityEngine; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; using System.Threading.Tasks; using System.IO; -using RestSharp.Extensions; + +using NativeWebSocket; +using UnityEditor.Callbacks; +using System.ComponentModel; namespace Base { @@ -26,7 +27,7 @@ public RobotEefUpdatedEventArgs(IO.Swagger.Model.RobotEefData data) { public class WebsocketManager : Singleton { public string APIDomainWS = ""; - private ClientWebSocket clientWebSocket; + private WebSocket websocket; private Queue> sendingQueue = new Queue>(); @@ -45,6 +46,7 @@ public class WebsocketManager : Singleton { public delegate void RobotEefUpdatedEventHandler(object sender, RobotEefUpdatedEventArgs args); public event RobotEefUpdatedEventHandler OnRobotEefUpdated; + public event EventHandler OnConnectedEvent; @@ -56,49 +58,59 @@ private void Awake() { ignoreProjectChanged = false; connecting = false; receivedData = ""; + + } + + + private void OnClose(WebSocketCloseCode closeCode) { + Debug.Log("Connection closed!"); + } + + private void OnError(string errorMsg) { + Debug.LogError(errorMsg); + connecting = false; + } + + private void OnConnected() { + connecting = false; + Debug.Log("On connected"); + OnConnectedEvent?.Invoke(this, EventArgs.Empty); + } - public async Task ConnectToServer(string domain, int port) { + public async void ConnectToServer(string domain, int port) { + GameManager.Instance.ConnectionStatus = GameManager.ConnectionStatusEnum.Connecting; packageStateArrived = false; connecting = true; APIDomainWS = GetWSURI(domain, port); - serverDomain = domain; - clientWebSocket = new ClientWebSocket(); - Debug.Log("[WS]:Attempting connection."); - try { - Uri uri = new Uri(APIDomainWS); - await clientWebSocket.ConnectAsync(uri, CancellationToken.None); - - Debug.Log("[WS][connect]:" + "Connected"); - } catch (Exception e) { - Debug.Log("[WS][exception]:" + e.Message); - if (e.InnerException != null) { - Debug.Log("[WS][inner exception]:" + e.InnerException.Message); - } - } - - connecting = false; + websocket = new WebSocket(APIDomainWS); - return clientWebSocket.State == WebSocketState.Open; - } + websocket.OnOpen += OnConnected; + websocket.OnError += OnError; + websocket.OnClose += OnClose; + websocket.OnMessage += HandleReceivedData; + + await websocket.Connect(); + } + async public void DisconnectFromSever() { Debug.Log("Disconnecting"); GameManager.Instance.ConnectionStatus = GameManager.ConnectionStatusEnum.Disconnected; try { - await clientWebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Done", CancellationToken.None); + await websocket.Close(); } catch (WebSocketException e) { //already closed probably.. } - clientWebSocket = null; + websocket = null; serverDomain = null; GameManager.Instance.HideLoadingScreen(); } - + public string GetServerDomain() { - if (clientWebSocket.State != WebSocketState.Open) { + if (websocket.State != WebSocketState.Open) { return null; } return serverDomain; @@ -123,56 +135,16 @@ public bool CheckInitData() { return packageStateArrived; } - // Update is called once per frame - private async void Update() { - if (clientWebSocket == null) - return; - if (clientWebSocket.State != WebSocketState.Open && GameManager.Instance.ConnectionStatus == GameManager.ConnectionStatusEnum.Connected) { - GameManager.Instance.ConnectionStatus = GameManager.ConnectionStatusEnum.Disconnected; - } - - if (!waitingForMessage && clientWebSocket.State == WebSocketState.Open) { - WebSocketReceiveResult result = null; - waitingForMessage = true; - ArraySegment bytesReceived = WebSocket.CreateClientBuffer(8192, 8192); - MemoryStream ms = new MemoryStream(); - try { - do { - result = await clientWebSocket.ReceiveAsync( - bytesReceived, - CancellationToken.None - ); - - if (bytesReceived.Array != null) - ms.Write(bytesReceived.Array, bytesReceived.Offset, result.Count); - - } while (!result.EndOfMessage); - } catch (WebSocketException e) { - DisconnectFromSever(); - return; - } - - receivedData = Encoding.Default.GetString(ms.ToArray()); - HandleReceivedData(receivedData); - receivedData = ""; - waitingForMessage = false; - - } - - if (sendingQueue.Count > 0 && readyToSend) { - SendDataToServer(); - } - - } + public string GetWSURI(string domain, int port) { return "ws://" + domain + ":" + port.ToString(); } - + private void OnApplicationQuit() { DisconnectFromSever(); } - + public void SendDataToServer(string data, int key = -1, bool storeResult = false, bool logInfo = true) { if (key < 0) { key = Interlocked.Increment(ref requestID); @@ -183,30 +155,18 @@ public void SendDataToServer(string data, int key = -1, bool storeResult = false if (storeResult) { responses[key] = null; } - sendingQueue.Enqueue(new KeyValuePair(key, data)); + SendWebSocketMessage(data); } + - async public void SendDataToServer() { - if (sendingQueue.Count == 0) - return; - KeyValuePair keyVal = sendingQueue.Dequeue(); - readyToSend = false; - if (clientWebSocket.State != WebSocketState.Open) - return; - - ArraySegment bytesToSend = new ArraySegment( - Encoding.UTF8.GetBytes(keyVal.Value) - ); - await clientWebSocket.SendAsync( - bytesToSend, - WebSocketMessageType.Text, - true, - CancellationToken.None - ); - readyToSend = true; + private async void SendWebSocketMessage(string data) { + if (websocket.State == WebSocketState.Open) { + await websocket.SendText(data); + } } - private void HandleReceivedData(string data) { + private void HandleReceivedData(byte[] message) { + string data = Encoding.Default.GetString(message); var dispatchType = new { id = 0, response = "", @@ -953,10 +913,10 @@ internal async Task RemoveScene(string id) { throw new RequestFailedException(response == null ? "Request timed out" : response.Messages[0]); } - public async Task RenameScene(string id, string newName) { + public async Task RenameScene(string id, string newName, bool dryRun) { int r_id = Interlocked.Increment(ref requestID); IO.Swagger.Model.RenameArgs args = new IO.Swagger.Model.RenameArgs(id: id, newName: newName); - IO.Swagger.Model.RenameSceneRequest request = new IO.Swagger.Model.RenameSceneRequest(r_id, "RenameScene", args); + IO.Swagger.Model.RenameSceneRequest request = new IO.Swagger.Model.RenameSceneRequest(r_id, "RenameScene", args, dryRun: dryRun); SendDataToServer(request.ToJson(), r_id, true); IO.Swagger.Model.RenameSceneResponse response = await WaitForResult(r_id); diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 510d6f704..af7516681 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -14467,7 +14467,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1944488.9 + value: 1963781.4 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -25336,7 +25336,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 5917641.5 + value: 5943353.5 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -26655,17 +26655,17 @@ PrefabInstance: - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchoredPosition.x - value: 357.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} @@ -26680,7 +26680,7 @@ PrefabInstance: - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_SizeDelta.x - value: 715 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1401866934940210444, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} @@ -37866,7 +37866,7 @@ PrefabInstance: - target: {fileID: 728554504835127953, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00024414062 + value: 0 objectReference: {fileID: 0} - target: {fileID: 870116323103940500, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -38152,22 +38152,22 @@ PrefabInstance: - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1257.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 2515 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1662977875022336822, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -38759,7 +38759,7 @@ PrefabInstance: - target: {fileID: 2768830357252732581, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00048828125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2778343468369029799, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39300,22 +39300,22 @@ PrefabInstance: - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1257.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 2515 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3232450956286077592, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -40438,7 +40438,7 @@ PrefabInstance: - target: {fileID: 4620524145206687212, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00048828125 + value: -0.000061035156 objectReference: {fileID: 0} - target: {fileID: 4654071109875633369, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -41222,22 +41222,22 @@ PrefabInstance: - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 1257.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 2515 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5536432216976498313, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/PackageOptionMenu.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/PackageOptionMenu.cs index 13cec6768..38a44d807 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/PackageOptionMenu.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/PackageOptionMenu.cs @@ -59,13 +59,11 @@ public void ShowRenameDialog() { packageTile.GetLabel(), () => RenamePackage(inputDialog.GetValue()), () => inputDialog.Close(), - /*validateInput: ValidateProjectName*/ - null); + validateInput: ValidateProjectName); } - public RequestResult ValidateProjectName(string newName) { - Task result = Task.Run(async () => await GameManager.Instance.RenamePackage(packageTile.PackageId, newName, true)); - return result.Result; + public async Task ValidateProjectName(string newName) { + return await GameManager.Instance.RenamePackage(packageTile.PackageId, newName, true); } public async void RenamePackage(string newUserId) { diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectOptionMenu.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectOptionMenu.cs index 77d06af96..7fd66b006 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectOptionMenu.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectOptionMenu.cs @@ -35,13 +35,11 @@ public void ShowRenameDialog() { projectTile.GetLabel(), () => RenameProject(inputDialog.GetValue()), () => inputDialog.Close(), - validateInput: ValidateProjectName); + validateInput: ValidateProjectNameAsync); } - public RequestResult ValidateProjectName(string newName) { - Task result = Task.Run(async () => await GameManager.Instance.RenameProject(projectTile.ProjectId, newName, true)); - - return result.Result; + public async Task ValidateProjectNameAsync(string newName) { + return await GameManager.Instance.RenameProject(projectTile.ProjectId, newName, true); } public async void RenameProject(string newUserId) { diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/SceneOptionMenu.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/SceneOptionMenu.cs index 7a4707935..53fc42fd4 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/SceneOptionMenu.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/SceneOptionMenu.cs @@ -3,6 +3,7 @@ using System; using Base; using UnityEngine.UI; +using System.Threading.Tasks; public class SceneOptionMenu : TileOptionMenu { @@ -35,12 +36,17 @@ public void ShowRenameDialog() { "New name", sceneTile.GetLabel(), () => RenameScene(inputDialog.GetValue()), - () => inputDialog.Close()); + () => inputDialog.Close(), + validateInput: ValidateSceneNameAsync); + } + + public async Task ValidateSceneNameAsync(string newName) { + return await GameManager.Instance.RenameScene(sceneTile.SceneId, newName, true); } public async void RenameScene(string newUserId) { Base.GameManager.Instance.ShowLoadingScreen(); - bool result = await Base.GameManager.Instance.RenameScene(sceneTile.SceneId, newUserId); + bool result = (await Base.GameManager.Instance.RenameScene(sceneTile.SceneId, newUserId, false)).Success; if (result) { inputDialog.Close(); sceneTile.SetLabel(newUserId); @@ -91,12 +97,6 @@ public async void ChangeImage() { } Close(); GameManager.Instance.HideLoadingScreen(); - /*NativeGallery.Permission permission = NativeGallery.GetImageFromGallery((path) => - { - Notifications.Instance.ShowNotification("Image path: ", path); - - }, "Select a PNG image", "image/png"); - */ } diff --git a/arcor2_AREditor/Submodules/NativeWebSocket b/arcor2_AREditor/Submodules/NativeWebSocket new file mode 160000 index 000000000..9c8a2c502 --- /dev/null +++ b/arcor2_AREditor/Submodules/NativeWebSocket @@ -0,0 +1 @@ +Subproject commit 9c8a2c502de66d258e03fa52cfdaff59c2c2bd16 diff --git a/scripts/link_submodules.bat b/scripts/link_submodules.bat index 72ffe9b38..0ab7253b6 100644 --- a/scripts/link_submodules.bat +++ b/scripts/link_submodules.bat @@ -6,6 +6,8 @@ mklink /j ..\arcor2_AREditor\Assets\Submodules\UnityStandaloneFileBrowser ..\arc mklink /j ..\arcor2_AREditor\Assets\Submodules\Unity3DRuntimeTransformGizmo ..\arcor2_AREditor\Submodules\Unity3DRuntimeTransformGizmo\Assets mklink /j ..\arcor2_AREditor\Assets\Submodules\RosSharp ..\arcor2_AREditor\Submodules\RosSharp\Unity3D\Assets\RosSharp mklink /j ..\arcor2_AREditor\Assets\Submodules\Simple-Side-Menu ..\arcor2_AREditor\Submodules\Simple-Side-Menu +mklink /j ..\arcor2_AREditor\Assets\Submodules\NativeWebSocket ..\arcor2_AREditor\Submodules\NativeWebSocket del ..\arcor2_AREditor\Submodules\RosSharp\Unity3D\Assets\RosSharp\Plugins\External\Newtonsoft.Json.dll* del ..\arcor2_AREditor\Submodules\RosSharp\Unity3D\Assets\RosSharp\Plugins\External\Newtonsoft.Json.xml* +del /F /Q ..\arcor2_AREditor\Assets\Submodules\NativeWebSocket\NativeWebSocket\Assets\WebSocketExample\* pause \ No newline at end of file From 33ff6edaa11287022c1bc1679c4e0b91531356cd Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 13:55:37 +0200 Subject: [PATCH 05/37] fixed: build and run btn was interactable in projects with no logic --- .../Prefabs/Menus/MainMenu Tablet.prefab | 166 +++++++++++++++--- .../Assets/2D_EDITOR/Scripts/MainMenu.cs | 27 ++- .../Assets/TABLET/Scenes/TabletGUI.unity | 42 ++--- .../TABLET/Scripts/GUI/ButtonWithTooltip.cs | 1 - 4 files changed, 184 insertions(+), 52 deletions(-) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/MainMenu Tablet.prefab b/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/MainMenu Tablet.prefab index 3ac601474..f5acb9c99 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/MainMenu Tablet.prefab +++ b/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/MainMenu Tablet.prefab @@ -469,7 +469,9 @@ MonoBehaviour: PauseBtn: {fileID: 2602803325618711257} ResumeBtn: {fileID: 4763129059757850484} CloseProjectBtn: {fileID: 8616855374179830428} - CloseSceneBtn: {fileID: 0} + CloseSceneBtn: {fileID: 3405079512723995730} + BuildAndRunBtn: {fileID: 1648228721388500492} + BuildBtn: {fileID: 2440574801711755902} OpenProjectDialog: {fileID: 0} OpenSceneDialog: {fileID: 0} CloseProjectDialog: {fileID: 0} @@ -897,8 +899,8 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 265, y: 0} + m_SizeDelta: {x: 530, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8732059655508387234 CanvasRenderer: @@ -1683,6 +1685,51 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &1648228721388500492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3504847282276429536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c51c72ffdfd9174788c173c64918514, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltip: {fileID: 3430351507056298562} + TooltipContent: {fileID: 8564928081863389743} +--- !u!114 &3430351507056298562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3504847282276429536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 460eb6905d847b04aa698917ba20ca95, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipContent: {fileID: 8564928081863389743} + Description: + DescriptionAlternative: +--- !u!114 &8564928081863389743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3504847282276429536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a81a9e081a4afa64dae6b9d42bc38c9f, type: 3} + m_Name: + m_EditorClassIdentifier: + description: + tooltipRect: {fileID: 0} + descriptionText: {fileID: 0} + tooltipAnimator: {fileID: 0} --- !u!1 &3745008418911204948 GameObject: m_ObjectHideFlags: 0 @@ -2211,7 +2258,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tooltip: {fileID: 922705802334208577} - Button: {fileID: 0} TooltipContent: {fileID: 0} --- !u!114 &3283393729855080066 MonoBehaviour: @@ -2242,7 +2288,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tooltip: {fileID: 5166314182476372107} - Button: {fileID: 0} TooltipContent: {fileID: 0} --- !u!114 &5166314182476372107 MonoBehaviour: @@ -2417,6 +2462,51 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2440574801711755902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8564798022532319774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c51c72ffdfd9174788c173c64918514, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltip: {fileID: 9150355320384950388} + TooltipContent: {fileID: 810452417757070402} +--- !u!114 &810452417757070402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8564798022532319774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a81a9e081a4afa64dae6b9d42bc38c9f, type: 3} + m_Name: + m_EditorClassIdentifier: + description: + tooltipRect: {fileID: 0} + descriptionText: {fileID: 0} + tooltipAnimator: {fileID: 0} +--- !u!114 &9150355320384950388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8564798022532319774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 460eb6905d847b04aa698917ba20ca95, type: 3} + m_Name: + m_EditorClassIdentifier: + tooltipContent: {fileID: 810452417757070402} + Description: + DescriptionAlternative: --- !u!1001 &127810716429638605 PrefabInstance: m_ObjectHideFlags: 0 @@ -2783,6 +2873,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} +--- !u!1 &8564798022532319774 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f, + type: 3} + m_PrefabInstance: {fileID: 194461675505324559} + m_PrefabAsset: {fileID: 0} --- !u!1001 &855460094997308404 PrefabInstance: m_ObjectHideFlags: 0 @@ -3292,12 +3388,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} ---- !u!224 &283490897199036940 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f, - type: 3} - m_PrefabInstance: {fileID: 2016716778844809324} - m_PrefabAsset: {fileID: 0} --- !u!114 &5482851328996412875 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6335387108731086247, guid: c77917a7826c62e419cc9a2867495b1f, @@ -3310,6 +3400,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &283490897199036940 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f, + type: 3} + m_PrefabInstance: {fileID: 2016716778844809324} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2469875556045936342 PrefabInstance: m_ObjectHideFlags: 0 @@ -3808,18 +3904,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} ---- !u!1 &6418294503858662566 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f, - type: 3} - m_PrefabInstance: {fileID: 3277713883522643127} - m_PrefabAsset: {fileID: 0} --- !u!224 &3850365649767114455 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} m_PrefabInstance: {fileID: 3277713883522643127} m_PrefabAsset: {fileID: 0} +--- !u!1 &6418294503858662566 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f, + type: 3} + m_PrefabInstance: {fileID: 3277713883522643127} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3341939251906342382 PrefabInstance: m_ObjectHideFlags: 0 @@ -5159,6 +5255,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} +--- !u!1 &3504847282276429536 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f, + type: 3} + m_PrefabInstance: {fileID: 4957658046256494321} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5279815339322241687 PrefabInstance: m_ObjectHideFlags: 0 @@ -6249,20 +6351,26 @@ PrefabInstance: propertyPath: m_firstOverflowCharacterIndex value: -1 objectReference: {fileID: 0} + - target: {fileID: 9156433198861585090, guid: 962caad8dd1393d4d91494c0abe624cc, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, + type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 962caad8dd1393d4d91494c0abe624cc, type: 3} ---- !u!1 &6168760762578877045 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 920948528114228850, guid: 962caad8dd1393d4d91494c0abe624cc, - type: 3} - m_PrefabInstance: {fileID: 6439033612322694151} - m_PrefabAsset: {fileID: 0} --- !u!224 &2451322607190902694 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8888084865542841249, guid: 962caad8dd1393d4d91494c0abe624cc, type: 3} m_PrefabInstance: {fileID: 6439033612322694151} m_PrefabAsset: {fileID: 0} +--- !u!1 &6168760762578877045 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 920948528114228850, guid: 962caad8dd1393d4d91494c0abe624cc, + type: 3} + m_PrefabInstance: {fileID: 6439033612322694151} + m_PrefabAsset: {fileID: 0} --- !u!224 &9056115924848578177 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2662123842529454726, guid: 962caad8dd1393d4d91494c0abe624cc, @@ -6952,6 +7060,12 @@ PrefabInstance: propertyPath: m_firstOverflowCharacterIndex value: -1 objectReference: {fileID: 0} + - target: {fileID: 9156433198861585090, guid: 962caad8dd1393d4d91494c0abe624cc, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, + type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 962caad8dd1393d4d91494c0abe624cc, type: 3} --- !u!1 &7595573524200769426 stripped @@ -7234,6 +7348,12 @@ PrefabInstance: propertyPath: m_firstOverflowCharacterIndex value: -1 objectReference: {fileID: 0} + - target: {fileID: 9156433198861585090, guid: 962caad8dd1393d4d91494c0abe624cc, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, + type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 962caad8dd1393d4d91494c0abe624cc, type: 3} --- !u!224 &508588593965809697 stripped diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs index a05ff367a..a63f7389d 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs @@ -12,7 +12,7 @@ public class MainMenu : MonoBehaviour, IMenu { public GameObject PauseBtn, ResumeBtn; [SerializeField] - private ButtonWithTooltip CloseProjectBtn, CloseSceneBtn; + private ButtonWithTooltip CloseProjectBtn, CloseSceneBtn, BuildAndRunBtn, BuildBtn; public OpenProjectDialog OpenProjectDialog; public OpenSceneDialog OpenSceneDialog; @@ -115,6 +115,12 @@ private void OnOpenProjectEditor(object sender, EventArgs eventArgs) { ProjectControlButtons.SetActive(true); ServicesUpdated(null, new Base.ServiceEventArgs(null)); Services.SetActive(true); + if (ProjectManager.Instance.Project.HasLogic) { + BuildAndRunBtn.SetInteractivity(true); + } else { + BuildAndRunBtn.SetInteractivity(false, "Project without defined logic could not be run from editor"); + + } } @@ -369,6 +375,7 @@ public async void SaveProject() { Base.Notifications.Instance.ShowNotification("Failed to save project", (saveProjectResponse.Messages.Count > 0 ? ": " + saveProjectResponse.Messages[0] : "")); return; } + UpdateMenu(); Base.Notifications.Instance.ShowNotification("Project saved successfully", ""); } @@ -449,24 +456,30 @@ public void SetDebugMode() { } public async void UpdateMenu() { - bool success = false; - string message = ""; + bool successForce = false; + string messageForce = ""; ButtonWithTooltip button = null; switch (GameManager.Instance.GetGameState()) { case GameManager.GameStateEnum.ProjectEditor: - (success, message) = await GameManager.Instance.CloseProject(true, true); + (bool success, _) = await GameManager.Instance.CloseProject(false, true); + (successForce, messageForce) = await GameManager.Instance.CloseProject(true, true); button = CloseProjectBtn; + if (success) { + BuildBtn.SetInteractivity(true); + } else { + BuildBtn.SetInteractivity(false, "There are unsaved changes on project"); + } break; case GameManager.GameStateEnum.SceneEditor: - (success, message) = await GameManager.Instance.CloseScene(true, true); + (successForce, messageForce) = await GameManager.Instance.CloseScene(true, true); button = CloseSceneBtn; break; } if (button != null) { - if (success) { + if (successForce) { button.SetInteractivity(true); } else { - button.SetInteractivity(false, message); + button.SetInteractivity(false, messageForce); } } } diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index af7516681..fa5dc9f77 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -14467,7 +14467,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1963781.4 + value: 1978408 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -25336,7 +25336,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 5943353.5 + value: 5963380 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -26655,17 +26655,17 @@ PrefabInstance: - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 357.5 objectReference: {fileID: 0} - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} @@ -26680,7 +26680,7 @@ PrefabInstance: - target: {fileID: 1395264303805572328, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 1401866934940210444, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, type: 3} @@ -38152,22 +38152,22 @@ PrefabInstance: - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1257.5 objectReference: {fileID: 0} - target: {fileID: 1645184373844423982, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 2515 objectReference: {fileID: 0} - target: {fileID: 1662977875022336822, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -38759,7 +38759,7 @@ PrefabInstance: - target: {fileID: 2768830357252732581, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.000015258789 objectReference: {fileID: 0} - target: {fileID: 2778343468369029799, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39240,7 +39240,7 @@ PrefabInstance: - target: {fileID: 3186733399446457868, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0.00030517578 objectReference: {fileID: 0} - target: {fileID: 3186733399446457868, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39300,22 +39300,22 @@ PrefabInstance: - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1257.5 objectReference: {fileID: 0} - target: {fileID: 3232450956005114733, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 2515 objectReference: {fileID: 0} - target: {fileID: 3232450956286077592, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -40438,7 +40438,7 @@ PrefabInstance: - target: {fileID: 4620524145206687212, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000061035156 + value: -0.000015258789 objectReference: {fileID: 0} - target: {fileID: 4654071109875633369, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -41222,22 +41222,22 @@ PrefabInstance: - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1257.5 objectReference: {fileID: 0} - target: {fileID: 5479873090914483846, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 2515 objectReference: {fileID: 0} - target: {fileID: 5536432216976498313, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs index a3a12bd42..eb2fcc850 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs @@ -8,7 +8,6 @@ public class ButtonWithTooltip : MonoBehaviour { [SerializeField] private ManualTooltip tooltip; - [SerializeField] private Button Button; [SerializeField] private TooltipContent TooltipContent; From 749b308caf45d536df20f524e854eeb2112b5809 Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 14:00:50 +0200 Subject: [PATCH 06/37] build and run button added to previous commit --- arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs | 4 +++- .../Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs index a63f7389d..57d5a9616 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs @@ -464,10 +464,12 @@ public async void UpdateMenu() { (bool success, _) = await GameManager.Instance.CloseProject(false, true); (successForce, messageForce) = await GameManager.Instance.CloseProject(true, true); button = CloseProjectBtn; - if (success) { + if (ProjectManager.Instance.Project.HasLogic && success) { BuildBtn.SetInteractivity(true); + BuildAndRunBtn.SetInteractivity(true); } else { BuildBtn.SetInteractivity(false, "There are unsaved changes on project"); + BuildAndRunBtn.SetInteractivity(false, "There are unsaved changes on project"); } break; case GameManager.GameStateEnum.SceneEditor: diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs index eb2fcc850..36a7990a1 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ButtonWithTooltip.cs @@ -35,4 +35,8 @@ public void SetInteractivity(bool interactable, string alternativeDescription) { public void HideTooltip() { TooltipContent.tooltipAnimator.Play("Out"); } + + public bool IsInteractive() { + return Button.interactable; + } } From be30d988d43d7b785f2517617fbb4416a7cb8b7b Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 14:12:11 +0200 Subject: [PATCH 07/37] fix of previous fix --- arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs index 57d5a9616..1ef0be9f4 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs @@ -464,12 +464,14 @@ public async void UpdateMenu() { (bool success, _) = await GameManager.Instance.CloseProject(false, true); (successForce, messageForce) = await GameManager.Instance.CloseProject(true, true); button = CloseProjectBtn; - if (ProjectManager.Instance.Project.HasLogic && success) { + if (success) { BuildBtn.SetInteractivity(true); - BuildAndRunBtn.SetInteractivity(true); + if (ProjectManager.Instance.Project.HasLogic) + BuildAndRunBtn.SetInteractivity(true); } else { BuildBtn.SetInteractivity(false, "There are unsaved changes on project"); - BuildAndRunBtn.SetInteractivity(false, "There are unsaved changes on project"); + if (!ProjectManager.Instance.Project.HasLogic) + BuildAndRunBtn.SetInteractivity(false, "Project without defined logic could not be run from editor"); } break; case GameManager.GameStateEnum.SceneEditor: From 493e77eebda6f58d8a75211483b528c49d77c132 Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 14:58:28 +0200 Subject: [PATCH 08/37] * Loading screen shows what is loading in some cases * when Build and Run is pressed, loading screen is displayed until the project is loaded --- .../Assets/2D_EDITOR/Scripts/MainMenu.cs | 19 +- .../BASE/Prefabs/Dialogs/CloseProject.prefab | 2932 ----------------- .../Prefabs/Dialogs/CloseProject.prefab.meta | 7 - .../BASE/Prefabs/Menu/Loading screen.prefab | 16 +- .../Scripts/Dialogs/CloseProjectDialog.cs | 15 - .../Assets/BASE/Scripts/GameManager.cs | 31 +- .../Assets/TABLET/Scenes/TabletGUI.unity | 783 +---- .../TABLET/Scripts/GUI/LoadingScreen.cs | 33 + .../Scripts/GUI/LoadingScreen.cs.meta} | 2 +- 9 files changed, 133 insertions(+), 3705 deletions(-) delete mode 100644 arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab delete mode 100644 arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab.meta delete mode 100644 arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs create mode 100644 arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs rename arcor2_AREditor/Assets/{BASE/Scripts/Dialogs/CloseProjectDialog.cs.meta => TABLET/Scripts/GUI/LoadingScreen.cs.meta} (83%) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs index 1ef0be9f4..b05b4d004 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/MainMenu.cs @@ -16,7 +16,6 @@ public class MainMenu : MonoBehaviour, IMenu { public OpenProjectDialog OpenProjectDialog; public OpenSceneDialog OpenSceneDialog; - public CloseProjectDialog CloseProjectDialog; public CloseSceneDialog CloseSceneDialog; public ServiceSettingsDialog ServiceSettingsDialog; public AutoAddObjectDialog AutoAddObjectDialog; @@ -31,6 +30,10 @@ public class MainMenu : MonoBehaviour, IMenu { [SerializeField] private InputDialog inputDialog; + [SerializeField] + private ConfirmationDialog confirmationDialog; + + // Start is called before the first frame update private void Start() { Debug.Assert(ButtonPrefab != null); @@ -45,7 +48,6 @@ private void Start() { Debug.Assert(RunningProjectControls != null); Debug.Assert(OpenProjectDialog != null); Debug.Assert(OpenSceneDialog != null); - Debug.Assert(CloseProjectDialog != null); Debug.Assert(CloseSceneDialog != null); Debug.Assert(ServiceSettingsDialog != null); Debug.Assert(AutoAddObjectDialog != null); @@ -53,6 +55,7 @@ private void Start() { Debug.Assert(NewProjectDialog != null); Debug.Assert(NewSceneDialog != null); Debug.Assert(inputDialog != null); + Debug.Assert(confirmationDialog != null); Debug.Assert(ResumeBtn != null); Debug.Assert(PauseBtn != null); @@ -268,11 +271,21 @@ public async void ShowCloseProjectDialog(string type) { (bool success, _) = await Base.GameManager.Instance.CloseProject(false); if (!success) { GameManager.Instance.HideLoadingScreen(); - CloseProjectDialog.WindowManager.OpenWindow(); + confirmationDialog.Open("Close project", + "Are you sure you want to close current project? Unsaved changes will be lost.", + () => CloseProject(), + () => inputDialog.Close()); } } + public async void CloseProject() { + GameManager.Instance.ShowLoadingScreen("Closing project"); + _ = await GameManager.Instance.CloseProject(true); + inputDialog.Close(); + GameManager.Instance.HideLoadingScreen(); + } + public void ShowAddObjectDialog(string type) { inputDialog.Open("Add object of type " + type, diff --git a/arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab b/arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab deleted file mode 100644 index 35846e41e..000000000 --- a/arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab +++ /dev/null @@ -1,2932 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &438712311961446175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7263894711965915545} - - component: {fileID: 774982765428273504} - - component: {fileID: 645970969967165050} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7263894711965915545 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438712311961446175} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 992697480411326427} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 35, y: 0} - m_SizeDelta: {x: 35, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &774982765428273504 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438712311961446175} - m_CullTransparentMesh: 0 ---- !u!114 &645970969967165050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438712311961446175} - 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: 0.37254903, g: 0.40784317, b: 0.45098042, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 76abe28924c3a9345adaa9cc63c803d3, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &512149837042557407 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1370268083846609323} - - component: {fileID: 3123058503574238533} - - component: {fileID: 4333640764622466910} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1370268083846609323 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 512149837042557407} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 992697480411326427} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3123058503574238533 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 512149837042557407} - m_CullTransparentMesh: 0 ---- !u!114 &4333640764622466910 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 512149837042557407} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f03f625cc7127f244a2f4da835b92720, type: 3} - 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 &861066485340270846 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5037213942931930079} - - component: {fileID: 2126118124950178533} - - component: {fileID: 9154659033180858654} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5037213942931930079 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861066485340270846} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2876144188338843923} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 35, y: 0} - m_SizeDelta: {x: 35, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2126118124950178533 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861066485340270846} - m_CullTransparentMesh: 0 ---- !u!114 &9154659033180858654 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861066485340270846} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 76abe28924c3a9345adaa9cc63c803d3, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1911950844800312001 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 122887226282927802} - - component: {fileID: 2321972324314296810} - - component: {fileID: 8372499713308164907} - - component: {fileID: 6337739408656384668} - - component: {fileID: 3420968611744719948} - m_Layer: 5 - m_Name: NO - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &122887226282927802 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911950844800312001} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2876144188338843923} - - {fileID: 992697480411326427} - m_Father: {fileID: 7996533092656418002} - m_RootOrder: 0 - 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: 250, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2321972324314296810 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911950844800312001} - m_CullTransparentMesh: 0 ---- !u!114 &8372499713308164907 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911950844800312001} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - 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: Highlighted - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3420968611744719948} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 7996533091523117870} - m_MethodName: CloseWindow - 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!95 &6337739408656384668 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911950844800312001} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 2fa2e87466111d248a120d5382f354fc, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &3420968611744719948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911950844800312001} - 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: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 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 &3958277056520208344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8382281153791133633} - - component: {fileID: 1189323132660688673} - - component: {fileID: 1701799329011801668} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8382281153791133633 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3958277056520208344} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2876144188338843923} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 17.5, y: 0} - m_SizeDelta: {x: -55, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1189323132660688673 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3958277056520208344} - m_CullTransparentMesh: 0 ---- !u!114 &1701799329011801668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3958277056520208344} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: NO - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2} - m_sharedMaterial: {fileID: 21261991626553910, guid: 84dd14695854bbc43a5faa24fcf93d0d, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 1} - m_textInfo: - textComponent: {fileID: 1701799329011801668} - characterCount: 2 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4039578555180215515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2890627742264901962} - - component: {fileID: 603555317077724223} - - component: {fileID: 3493281820808297114} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2890627742264901962 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4039578555180215515} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 992697480411326427} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 17.5, y: 0} - m_SizeDelta: {x: -55, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &603555317077724223 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4039578555180215515} - m_CullTransparentMesh: 0 ---- !u!114 &3493281820808297114 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4039578555180215515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: NO - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2} - m_sharedMaterial: {fileID: 21261991626553910, guid: 84dd14695854bbc43a5faa24fcf93d0d, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4285753439 - m_fontColor: {r: 0.37254903, g: 0.40784317, b: 0.45098042, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 1} - m_textInfo: - textComponent: {fileID: 3493281820808297114} - characterCount: 2 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4372940366835845811 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2876144188338843923} - - component: {fileID: 6782548110388959479} - - component: {fileID: 5821242040398979816} - m_Layer: 5 - m_Name: Normal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2876144188338843923 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4372940366835845811} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1880738451998589537} - - {fileID: 5037213942931930079} - - {fileID: 8382281153791133633} - m_Father: {fileID: 122887226282927802} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6782548110388959479 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4372940366835845811} - m_CullTransparentMesh: 0 ---- !u!225 &5821242040398979816 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4372940366835845811} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &4520734581576733951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 992697480411326427} - - component: {fileID: 591027113603018386} - - component: {fileID: 9059911332819520584} - m_Layer: 5 - m_Name: Highlighted - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &992697480411326427 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4520734581576733951} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1370268083846609323} - - {fileID: 7263894711965915545} - - {fileID: 2890627742264901962} - m_Father: {fileID: 122887226282927802} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &591027113603018386 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4520734581576733951} - m_CullTransparentMesh: 0 ---- !u!225 &9059911332819520584 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4520734581576733951} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &7996533090686832417 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533090686832416} - m_Layer: 5 - m_Name: Title Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533090686832416 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533090686832417} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7996533091913480289} - m_Father: {fileID: 7996533091325073266} - m_RootOrder: 2 - 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: 0, y: 70} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7996533091029317818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091029317817} - - component: {fileID: 7996533091029317820} - - component: {fileID: 7996533091029317821} - - component: {fileID: 7996533091029317822} - - component: {fileID: 7996533091029317823} - - component: {fileID: 7996533091029317816} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091029317817 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091029317818} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7996533092317722025} - - {fileID: 7996533091604475946} - m_Father: {fileID: 7996533091325073266} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 750, y: 0} - m_SizeDelta: {x: 1460, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091029317820 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091029317818} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091029317821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091029317818} - 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: 0.23529412, g: 0.25490198, b: 0.2901961, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f38987b2f12030947bea58483e18ce1a, type: 3} - 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!114 &7996533091029317822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091029317818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 15 - m_Right: 15 - m_Top: 8 - m_Bottom: 10 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!114 &7996533091029317823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091029317818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &7996533091029317816 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091029317818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &7996533091042742221 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091042742220} - - component: {fileID: 7996533091042742224} - - component: {fileID: 7996533091042742225} - - component: {fileID: 7996533091042742226} - - component: {fileID: 7996533091042742227} - m_Layer: 5 - m_Name: YES - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091042742220 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091042742221} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7996533091769059175} - - {fileID: 7996533091737657637} - m_Father: {fileID: 7996533092656418002} - 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: 250, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091042742224 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091042742221} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091042742225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091042742221} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - 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: Highlighted - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7996533091042742227} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6724019273790687101} - m_MethodName: CloseProject - 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!95 &7996533091042742226 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091042742221} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 2fa2e87466111d248a120d5382f354fc, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &7996533091042742227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091042742221} - 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: 0} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 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 &7996533091077265516 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091077265523} - - component: {fileID: 7996533091077265521} - - component: {fileID: 7996533091077265522} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091077265523 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091077265516} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091769059175} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 35, y: 0} - m_SizeDelta: {x: 35, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091077265521 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091077265516} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091077265522 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091077265516} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5d08ed2465c5c104c9c915959d69b527, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7996533091248032981 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091248032980} - - component: {fileID: 7996533091248032985} - - component: {fileID: 7996533091248032986} - - component: {fileID: 7996533091248032987} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091248032980 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091248032981} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091325073266} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091248032985 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091248032981} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091248032986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091248032981} - 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: 0.3137255, g: 0.34509805, b: 0.38431373, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f38987b2f12030947bea58483e18ce1a, type: 3} - 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!114 &7996533091248032987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091248032981} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &7996533091325073267 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091325073266} - - component: {fileID: 7996533091325073271} - - component: {fileID: 7996533091325073264} - - component: {fileID: 7996533091325073265} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091325073266 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091325073267} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7996533092324473301} - - {fileID: 7996533091248032980} - - {fileID: 7996533090686832416} - - {fileID: 7996533091029317817} - m_Father: {fileID: 7996533091523117864} - 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: 563, y: 0} - m_SizeDelta: {x: 1500, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091325073271 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091325073267} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091325073264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091325073267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 20 - m_Right: 20 - m_Top: 20 - m_Bottom: 20 - m_ChildAlignment: 0 - m_Spacing: 20 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!114 &7996533091325073265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091325073267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!1 &7996533091523117865 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091523117864} - - component: {fileID: 7996533091523117872} - - component: {fileID: 7996533091523117873} - - component: {fileID: 7996533091523117874} - - component: {fileID: 7996533091523117875} - - component: {fileID: 7996533091523117870} - - component: {fileID: 7996533091523117868} - - component: {fileID: 7996533091523117869} - - component: {fileID: 6724019273790687101} - m_Layer: 5 - m_Name: CloseProject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091523117864 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9999358, y: 0.9999358, z: 0.9999358} - m_Children: - - {fileID: 7996533092414724858} - - {fileID: 7996533091325073266} - - {fileID: 7996533092656418002} - m_Father: {fileID: 0} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091523117872 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_CullTransparentMesh: 0 ---- !u!95 &7996533091523117873 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 210f0314d76a2d5468eaa5985d803332, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!225 &7996533091523117874 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 1 ---- !u!114 &7996533091523117875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 20 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!114 &7996533091523117870 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff5b50d8ff89864090b86d1fee33b66, type: 3} - m_Name: - m_EditorClassIdentifier: - windowIcon: {fileID: 0} - windowTitle: {fileID: 0} - windowDescription: {fileID: 0} - confirmButton: {fileID: 0} - cancelButton: {fileID: 8372499713308164907} - icon: {fileID: 21300000, guid: 365600ce0ef00bf47ad91421c54d45a5, type: 3} - titleText: Title - descriptionText: Description here - onConfirm: - m_PersistentCalls: - m_Calls: [] - onCancel: - m_PersistentCalls: - m_Calls: [] - sharpAnimations: 0 - useCustomValues: 1 - isOn: 0 ---- !u!114 &7996533091523117868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61b11bb72526919478d1a13bdcb7aec8, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &7996533091523117869 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e577c30e78b6a8d428d2d7bc77913d0b, type: 3} - m_Name: - m_EditorClassIdentifier: - UIManagerAsset: {fileID: 11400000, guid: 2a619a9609984be49b53b928dd94e61b, type: 2} - background: {fileID: 7996533091248032986} - contentBackground: {fileID: 7996533091029317821} - icon: {fileID: 0} - title: {fileID: 7996533091913480288} - description: {fileID: 7996533092317722030} ---- !u!114 &6724019273790687101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091523117865} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb814c78182e29f4da1f873c6d0d887f, type: 3} - m_Name: - m_EditorClassIdentifier: - WindowManager: {fileID: 0} ---- !u!1 &7996533091604475947 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091604475946} - m_Layer: 5 - m_Name: Placeholder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091604475946 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091604475947} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091029317817} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7996533091737657638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091737657637} - - component: {fileID: 7996533091737657643} - - component: {fileID: 7996533091737657636} - m_Layer: 5 - m_Name: Highlighted - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091737657637 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091737657638} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7996533092521999141} - - {fileID: 7996533091973481056} - - {fileID: 7996533092427934254} - m_Father: {fileID: 7996533091042742220} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091737657643 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091737657638} - m_CullTransparentMesh: 0 ---- !u!225 &7996533091737657636 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091737657638} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &7996533091769059168 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091769059175} - - component: {fileID: 7996533091769059173} - - component: {fileID: 7996533091769059174} - m_Layer: 5 - m_Name: Normal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091769059175 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091769059168} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7996533092278716922} - - {fileID: 7996533091077265523} - - {fileID: 7996533092233809080} - m_Father: {fileID: 7996533091042742220} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091769059173 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091769059168} - m_CullTransparentMesh: 0 ---- !u!225 &7996533091769059174 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091769059168} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &7996533091913480290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091913480289} - - component: {fileID: 7996533091913480295} - - component: {fileID: 7996533091913480288} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091913480289 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091913480290} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533090686832416} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 42.5, y: 0} - m_SizeDelta: {x: -42.5, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &7996533091913480295 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091913480290} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091913480288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091913480290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Close project - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6, type: 2} - m_sharedMaterial: {fileID: 21918420405216288, guid: fa328c1ae3ffb6b4583cf371153b0be6, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 70 - m_fontSizeBase: 70 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 513 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: 0 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -36.8477, y: 0, z: 0, w: 1} - m_textInfo: - textComponent: {fileID: 7996533091913480288} - characterCount: 13 - spriteCount: 0 - spaceCount: 1 - wordCount: 2 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7996533091973481057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533091973481056} - - component: {fileID: 7996533091973481062} - - component: {fileID: 7996533091973481063} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533091973481056 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091973481057} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091737657637} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 35, y: 0} - m_SizeDelta: {x: 35, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533091973481062 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091973481057} - m_CullTransparentMesh: 0 ---- !u!114 &7996533091973481063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533091973481057} - 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: 0.37254903, g: 0.40784317, b: 0.45098042, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5d08ed2465c5c104c9c915959d69b527, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7996533092233809081 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092233809080} - - component: {fileID: 7996533092233809086} - - component: {fileID: 7996533092233809087} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092233809080 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092233809081} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091769059175} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 17.5, y: 0} - m_SizeDelta: {x: -55, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092233809086 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092233809081} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092233809087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092233809081} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: YES - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2} - m_sharedMaterial: {fileID: 21261991626553910, guid: 84dd14695854bbc43a5faa24fcf93d0d, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 1} - m_textInfo: - textComponent: {fileID: 7996533092233809087} - characterCount: 3 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7996533092278716923 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092278716922} - - component: {fileID: 7996533092278716920} - - component: {fileID: 7996533092278716921} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092278716922 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092278716923} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091769059175} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092278716920 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092278716923} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092278716921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092278716923} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e2253fc5a4b357243ad2021031bd943a, type: 3} - 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 &7996533092317722026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092317722025} - - component: {fileID: 7996533092317722029} - - component: {fileID: 7996533092317722030} - - component: {fileID: 7996533092317722031} - - component: {fileID: 7996533092317722024} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092317722025 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092317722026} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091029317817} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 15, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &7996533092317722029 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092317722026} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092317722030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092317722026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Are you sure you want to close current project? Unsaved changes will be - lost. - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2} - m_sharedMaterial: {fileID: 21539420542967178, guid: 4bd810f1cbcb0f446a8f5a31453e243f, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 60 - m_fontSizeBase: 60 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 257 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -665.4266, w: 0} - m_textInfo: - textComponent: {fileID: 7996533092317722030} - characterCount: 77 - spriteCount: 0 - spaceCount: 13 - wordCount: 14 - linkCount: 0 - lineCount: 2 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &7996533092317722031 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092317722026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: 400 - m_MinHeight: -1 - m_PreferredWidth: 765 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &7996533092317722024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092317722026} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!1 &7996533092324473302 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092324473301} - - component: {fileID: 7996533092324473306} - - component: {fileID: 7996533092324473307} - - component: {fileID: 7996533092324473300} - m_Layer: 5 - m_Name: Shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092324473301 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092324473302} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091325073266} - m_RootOrder: 0 - 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: 22, y: 22} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092324473306 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092324473302} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092324473307 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092324473302} - 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: 0.37254903, g: 0.40784317, b: 0.45098042, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5a2cc1793ca8c1e4381df95290d5022a, type: 3} - 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!114 &7996533092324473300 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092324473302} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &7996533092414724859 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092414724858} - - component: {fileID: 7996533092414724863} - - component: {fileID: 7996533092414724856} - - component: {fileID: 7996533092414724857} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092414724858 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092414724859} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091523117864} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092414724863 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092414724859} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092414724856 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092414724859} - 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: 0.37254903, g: 0.41176474, b: 0.45098042, a: 0.88235295} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 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!114 &7996533092414724857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092414724859} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &7996533092427934255 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092427934254} - - component: {fileID: 7996533092427934252} - - component: {fileID: 7996533092427934253} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092427934254 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092427934255} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091737657637} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 17.5, y: 0} - m_SizeDelta: {x: -55, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092427934252 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092427934255} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092427934253 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092427934255} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: YES - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 84dd14695854bbc43a5faa24fcf93d0d, type: 2} - m_sharedMaterial: {fileID: 21261991626553910, guid: 84dd14695854bbc43a5faa24fcf93d0d, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4285753439 - m_fontColor: {r: 0.37254903, g: 0.40784317, b: 0.45098042, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 1} - m_textInfo: - textComponent: {fileID: 7996533092427934253} - characterCount: 3 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7996533092521999142 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092521999141} - - component: {fileID: 7996533092521999147} - - component: {fileID: 7996533092521999140} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092521999141 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092521999142} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7996533091737657637} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092521999147 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092521999142} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092521999140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092521999142} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f03f625cc7127f244a2f4da835b92720, type: 3} - 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 &7996533092656418003 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7996533092656418002} - - component: {fileID: 7996533092656418000} - - component: {fileID: 7996533092656418001} - m_Layer: 5 - m_Name: Buttons - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7996533092656418002 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092656418003} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 122887226282927802} - - {fileID: 7996533091042742220} - m_Father: {fileID: 7996533091523117864} - m_RootOrder: 2 - 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: 1500, y: 82} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7996533092656418000 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092656418003} - m_CullTransparentMesh: 0 ---- !u!114 &7996533092656418001 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7996533092656418003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 16 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!1 &9001703517725899362 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1880738451998589537} - - component: {fileID: 5581456002990432207} - - component: {fileID: 7256535849014458965} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1880738451998589537 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9001703517725899362} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2876144188338843923} - m_RootOrder: 0 - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5581456002990432207 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9001703517725899362} - m_CullTransparentMesh: 0 ---- !u!114 &7256535849014458965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9001703517725899362} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e2253fc5a4b357243ad2021031bd943a, type: 3} - 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 diff --git a/arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab.meta b/arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab.meta deleted file mode 100644 index 71f9d767a..000000000 --- a/arcor2_AREditor/Assets/BASE/Prefabs/Dialogs/CloseProject.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/arcor2_AREditor/Assets/BASE/Prefabs/Menu/Loading screen.prefab b/arcor2_AREditor/Assets/BASE/Prefabs/Menu/Loading screen.prefab index 5054f95c8..bc23214e4 100644 --- a/arcor2_AREditor/Assets/BASE/Prefabs/Menu/Loading screen.prefab +++ b/arcor2_AREditor/Assets/BASE/Prefabs/Menu/Loading screen.prefab @@ -224,16 +224,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726247920309557066} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: 0.08823768, z: -0, w: 0.9960995} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 726247919581590289} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 10.124001, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7, y: -9.8} + m_AnchoredPosition: {x: -7.4, y: -9.799988} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &726247920309557061 @@ -328,16 +328,16 @@ MonoBehaviour: m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -15.260991, w: 0} + m_margin: {x: -105.15252, y: 0, z: -121.30463, w: 0} m_textInfo: textComponent: {fileID: 726247920309557060} - characterCount: 0 + characterCount: 10 spriteCount: 0 spaceCount: 0 - wordCount: 0 + wordCount: 1 linkCount: 0 - lineCount: 0 - pageCount: 0 + lineCount: 1 + pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs b/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs deleted file mode 100644 index 90cbbfc37..000000000 --- a/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Michsky.UI.ModernUIPack; -public class CloseProjectDialog : Dialog -{ - - public async void CloseProject() { - (bool success, _) = await Base.GameManager.Instance.CloseProject(true); - if (success) { - Base.GameManager.Instance.LoadingScreen.SetActive(true); - } - WindowManager.CloseWindow(); - } -} diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs index 2b8a84030..c40cd6cd8 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs @@ -99,7 +99,7 @@ public class GameManager : Singleton { private GameStateEnum gameState; private EditorStateEnum editorState; - public GameObject LoadingScreen; + public LoadingScreen LoadingScreen; public CanvasGroup MainMenuBtnCG, StatusPanelCG; public GameObject ButtonPrefab; public GameObject Tooltip; @@ -357,18 +357,18 @@ private async void OnConnectionStatusChanged(ConnectionStatusEnum newState) { } - public void ShowLoadingScreen() { + public void ShowLoadingScreen(string text = "Loading...", bool forceToHide = false) { Debug.Assert(LoadingScreen != null); // HACK to make loading screen in foreground // TODO - find better way headUpCanvas.enabled = false; headUpCanvas.enabled = true; - LoadingScreen.SetActive(true); + LoadingScreen.Show(text, forceToHide); } - public void HideLoadingScreen() { + public void HideLoadingScreen(bool force = false) { Debug.Assert(LoadingScreen != null); - LoadingScreen.SetActive(false); + LoadingScreen.Hide(force); } private void Init() { @@ -376,7 +376,7 @@ private void Init() { } public async void ConnectToSever(string domain, int port) { - ShowLoadingScreen(); + ShowLoadingScreen("Connecting to server"); OnConnectingToServer?.Invoke(this, new StringEventArgs(WebsocketManager.Instance.GetWSURI(domain, port))); /*if (await WebsocketManager.Instance.ConnectToServer(domain, port)) { try { @@ -846,7 +846,7 @@ public async Task BuildPackage(string name) { } public async Task BuildAndRunPackage(string name) { - ShowLoadingScreen(); + ShowLoadingScreen("Building package", true); Debug.Assert(Base.ProjectManager.Instance.Project != null); if (ProjectManager.Instance.ProjectChanged) { Notifications.Instance.ShowNotification("Unsaved changes", "There are some unsaved changes in project. Save it before build the package."); @@ -855,19 +855,21 @@ public async Task BuildAndRunPackage(string name) { try { string packageId = await WebsocketManager.Instance.BuildPackage(Base.ProjectManager.Instance.Project.Id, name); reopenProjectId = ProjectManager.Instance.Project.Id; - RequestResult result = await CloseProject(false); + RequestResult result = await CloseProject(true); if (!result.Success) { Notifications.Instance.ShowNotification("Failed to build and run package", result.Message); reopenProjectId = null; - HideLoadingScreen(); + HideLoadingScreen(true); return false; } + ShowLoadingScreen("Updating packages", true); await LoadPackages(); + ShowLoadingScreen("Running package", true); await WebsocketManager.Instance.RunPackage(packageId); return true; } catch (RequestFailedException ex) { Notifications.Instance.ShowNotification("Failed to build and run package", ex.Message); - HideLoadingScreen(); + HideLoadingScreen(true); return false; } finally { } @@ -1021,7 +1023,7 @@ public async Task CloseScene(bool force, bool dryRun = false) { public async Task CloseProject(bool force, bool dryRun = false) { if (!dryRun) - ShowLoadingScreen(); + ShowLoadingScreen("Closing project"); try { await WebsocketManager.Instance.CloseProject(force, dryRun: dryRun); if (!dryRun) { @@ -1159,7 +1161,7 @@ public void OpenSceneEditor() { Scene.SetActive(true); OnOpenSceneEditor?.Invoke(this, EventArgs.Empty); SetEditorState(EditorStateEnum.Normal); - HideLoadingScreen(); + HideLoadingScreen(true); } public void OpenProjectEditor() { @@ -1171,7 +1173,7 @@ public void OpenProjectEditor() { Scene.SetActive(true); OnOpenProjectEditor?.Invoke(this, EventArgs.Empty); SetEditorState(EditorStateEnum.Normal); - HideLoadingScreen(); + HideLoadingScreen(true); } public async void OpenPackageRunningScreen() { @@ -1191,7 +1193,7 @@ public async void OpenPackageRunningScreen() { Debug.LogError(ex); Notifications.Instance.ShowNotification("Failed to open package run screen", "Package info did not arrived"); } finally { - HideLoadingScreen(); + HideLoadingScreen(true); } } @@ -1213,6 +1215,7 @@ public void OpenDisconnectedScreen() { Scene.SetActive(false); SetGameState(GameStateEnum.Disconnected); EditorInfo.text = ""; + HideLoadingScreen(true); } diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index fa5dc9f77..090cea7ac 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -3511,7 +3511,7 @@ PrefabInstance: - target: {fileID: 8064793145543763805, guid: f0880da28fd8a3445a37166529baa870, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8064793145543763805, guid: f0880da28fd8a3445a37166529baa870, type: 3} @@ -4427,7 +4427,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fbf610b6f4978774981cfdc1b10e91ae, type: 3} m_Name: m_EditorClassIdentifier: - LoadingScreen: {fileID: 1123195957} + LoadingScreen: {fileID: 1123195960} MainMenuBtnCG: {fileID: 665247893} StatusPanelCG: {fileID: 317112625} ButtonPrefab: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f, @@ -5458,7 +5458,7 @@ PrefabInstance: - target: {fileID: 726247919949420684, guid: a3922b7c196726f4b83aca2ff3bc8876, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 726247919949420684, guid: a3922b7c196726f4b83aca2ff3bc8876, type: 3} @@ -5881,7 +5881,7 @@ PrefabInstance: - target: {fileID: 5387975123859005735, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5387975123859005735, guid: b2cbdf40039306b4ba74cfaa6c2e8ec7, type: 3} @@ -9312,7 +9312,7 @@ PrefabInstance: - target: {fileID: 4916727827427044840, guid: 242af89aff03c1f469c40e414195181a, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4916727827427044840, guid: 242af89aff03c1f469c40e414195181a, type: 3} @@ -9948,7 +9948,7 @@ PrefabInstance: - target: {fileID: 1771758554860182027, guid: def3169f9eb264940bb689878d06ba51, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1771758554860182027, guid: def3169f9eb264940bb689878d06ba51, type: 3} @@ -10314,12 +10314,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24cbf1d5cc338784299fbeaa98f07110, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &766067087 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - m_PrefabInstance: {fileID: 1581044771} - m_PrefabAsset: {fileID: 0} --- !u!1 &797318941 GameObject: m_ObjectHideFlags: 0 @@ -10988,7 +10982,7 @@ PrefabInstance: - target: {fileID: 5176358584719490080, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5176358584719490080, guid: d11ff9b97e462f7449cd9465617b9167, type: 3} @@ -12481,6 +12475,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1044119371} m_PrefabAsset: {fileID: 0} +--- !u!114 &1080264496 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 726247920309557060, guid: a3922b7c196726f4b83aca2ff3bc8876, + type: 3} + m_PrefabInstance: {fileID: 467958154} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1087756532 GameObject: m_ObjectHideFlags: 0 @@ -12671,6 +12677,31 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 467958154} m_PrefabAsset: {fileID: 0} +--- !u!225 &1123195959 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1123195957} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1123195960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1123195957} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aea84372b4424ef41af384281c3e0e18, type: 3} + m_Name: + m_EditorClassIdentifier: + Text: {fileID: 1080264496} --- !u!1001 &1131211182 PrefabInstance: m_ObjectHideFlags: 0 @@ -13560,7 +13591,7 @@ PrefabInstance: - target: {fileID: 5146173425039803186, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5146173425039803186, guid: 8fd05c51bb00fd04bb880a56a70d3e7c, type: 3} @@ -14467,7 +14498,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 1978408 + value: 2005094.2 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -21338,696 +21369,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 190b06ff4a9418848ae9320a01c38075, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1581044771 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1989194333} - m_Modifications: - - target: {fileID: 122887226282927802, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 122887226282927802, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 122887226282927802, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 122887226282927802, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 122887226282927802, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 438712311961446175, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 512149837042557407, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 861066485340270846, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1701799329011801668, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1701799329011801668, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1701799329011801668, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1701799329011801668, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1911950844800312001, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3493281820808297114, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3493281820808297114, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3493281820808297114, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3493281820808297114, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3958277056520208344, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4039578555180215515, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4372940366835845811, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4520734581576733951, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533090686832416, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533090686832416, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533090686832416, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533090686832416, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533090686832416, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533090686832417, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 750 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 1460 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317817, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091029317818, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091042742220, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091042742220, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091042742220, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091042742220, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091042742220, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091042742221, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091077265516, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091248032981, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 1280 - objectReference: {fileID: 0} - - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091325073266, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091325073267, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091474960856, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091474960856, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091474960856, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091474960856, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091474960856, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117864, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117865, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Name - value: CloseProject - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117865, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117869, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117869, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: UIManagerAsset - value: - objectReference: {fileID: 11400000, guid: 2a619a9609984be49b53b928dd94e61b, - type: 2} - - target: {fileID: 7996533091523117870, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117874, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Alpha - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091523117874, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Interactable - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091604475946, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091604475946, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091604475946, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091604475946, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091604475946, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533091604475947, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091737657638, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091769059168, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091913480288, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 7996533091913480288, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.spaceCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091913480288, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7996533091913480288, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091913480288, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533091913480290, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533091973481057, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092142450376, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092142450376, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092142450376, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092142450376, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092233809081, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092233809087, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7996533092233809087, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092233809087, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092233809087, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092278716923, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722025, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722026, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722030, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 77 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722030, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.spaceCount - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722030, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722030, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7996533092317722030, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092324473302, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092414724859, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092427934253, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7996533092427934253, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092427934253, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092427934253, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7996533092427934255, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092521999142, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092656418002, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092656418002, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092656418002, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092656418002, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092656418003, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7996533092762694785, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.characterCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092762694785, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.wordCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092762694785, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.lineCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7996533092762694785, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_textInfo.pageCount - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9001703517725899362, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, type: 3} --- !u!1 &1581668218 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8970157678064929277, guid: 1c82e97bdfcacad4f9f0d9b0b08551fc, @@ -24201,7 +23542,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 592909418} - - {fileID: 766067087} - {fileID: 2021858237} - {fileID: 1674557285} - {fileID: 1588750084} @@ -24562,18 +23902,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 687106932} m_PrefabAsset: {fileID: 0} ---- !u!114 &2026117733 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6724019273790687101, guid: 74aa6509930ff5f4e8ea9ebb91d5a2ff, - type: 3} - m_PrefabInstance: {fileID: 1581044771} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb814c78182e29f4da1f873c6d0d887f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2074971225 PrefabInstance: m_ObjectHideFlags: 0 @@ -24945,7 +24273,7 @@ PrefabInstance: - target: {fileID: 6339420666757859080, guid: 15db7d064d3db684495e711599b768e3, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6339420666757859080, guid: 15db7d064d3db684495e711599b768e3, type: 3} @@ -25336,7 +24664,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 5963380 + value: 5999156 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -33312,7 +32640,7 @@ PrefabInstance: type: 3} propertyPath: CloseProjectDialog value: - objectReference: {fileID: 2026117733} + objectReference: {fileID: 0} - target: {fileID: 1349415282727003576, guid: 3a508840590a04d4ea5612b3a67a83fb, type: 3} propertyPath: CloseSceneDialog @@ -33353,6 +32681,11 @@ PrefabInstance: propertyPath: inputDialog value: objectReference: {fileID: 760366789} + - target: {fileID: 1349415282727003576, guid: 3a508840590a04d4ea5612b3a67a83fb, + type: 3} + propertyPath: confirmationDialog + value: + objectReference: {fileID: 6897499337601317072} - target: {fileID: 1349983855272903909, guid: 3a508840590a04d4ea5612b3a67a83fb, type: 3} propertyPath: m_Name @@ -34871,7 +34204,7 @@ PrefabInstance: - target: {fileID: 686204649382848861, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 686204649382848861, guid: 831d3305262fd744b9cd0d88cd5e3dbd, type: 3} @@ -38759,7 +38092,7 @@ PrefabInstance: - target: {fileID: 2768830357252732581, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2778343468369029799, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -40438,7 +39771,7 @@ PrefabInstance: - target: {fileID: 4620524145206687212, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4654071109875633369, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -43963,7 +43296,7 @@ PrefabInstance: - target: {fileID: 7295890122284558774, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7295890122284558774, guid: 908ca497e2e4fa54ca468e776ffba003, type: 3} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs new file mode 100644 index 000000000..74a3cb13c --- /dev/null +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(CanvasGroup))] +public class LoadingScreen : MonoBehaviour +{ + public TMPro.TMP_Text Text; + + private bool ForceToHide = false; + + private CanvasGroup CanvasGroup; + + private void Awake() { + CanvasGroup = GetComponent(); + } + + public void Show(string text, bool forceToHide = false) { + Text.text = text; + CanvasGroup.alpha = 1; + CanvasGroup.blocksRaycasts = true; + if (!ForceToHide) + ForceToHide = forceToHide; + } + + public void Hide(bool force = false) { + if (ForceToHide && !force) + return; + CanvasGroup.alpha = 0; + CanvasGroup.blocksRaycasts = false; + ForceToHide = false; + } +} diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs.meta b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs.meta similarity index 83% rename from arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs.meta rename to arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs.meta index d5fc7681a..6706aef0e 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/Dialogs/CloseProjectDialog.cs.meta +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/LoadingScreen.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb814c78182e29f4da1f873c6d0d887f +guid: aea84372b4424ef41af384281c3e0e18 MonoImporter: externalObjects: {} serializedVersion: 2 From 72443c8ea661ef490b516b6267751b88c496ea63 Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 15:49:04 +0200 Subject: [PATCH 09/37] fixed: exception when no robot in scene and clicked on object with model --- .../2D_EDITOR/Scripts/ActionObjectMenu.cs | 43 ++++++++++--------- .../Assets/BASE/Scripts/SceneManager.cs | 8 ++++ .../Assets/TABLET/Scenes/TabletGUI.unity | 4 +- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs index 103ced62e..dba5372a9 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs @@ -94,35 +94,36 @@ public async void RenameObject(string newName) { public void UpdateMenu() { if (currentFocusPoint >= 0) return; - - - RobotsList.gameObject.GetComponent().Init(OnRobotChanged, true); - if (RobotsList.Dropdown.dropdownItems.Count > 0) + if (SceneManager.Instance.RobotInScene()) { + RobotsList.gameObject.GetComponent().Init(OnRobotChanged, true); OnRobotChanged(RobotsList.Dropdown.selectedText.text); - else { - UpdatePositionBlockVO.SetActive(false); - UpdatePositionBlockMesh.SetActive(false); - RobotsListsBlock.SetActive(false); - } - if (CurrentObject.ActionObjectMetadata.ObjectModel?.Type == IO.Swagger.Model.ObjectModel.TypeEnum.Mesh) { - UpdatePositionBlockVO.SetActive(false); - UpdatePositionBlockMesh.SetActive(true); - RobotsListsBlock.SetActive(true); - } else if (CurrentObject.ActionObjectMetadata.ObjectModel != null) { - UpdatePositionBlockVO.SetActive(true); - UpdatePositionBlockMesh.SetActive(false); - RobotsListsBlock.SetActive(true); - ShowModelSwitch.Interactable = SceneManager.Instance.RobotsEEVisible; - if (ShowModelSwitch.Switch.isOn) { - ShowModelOnEE(); + + if (CurrentObject.ActionObjectMetadata.ObjectModel?.Type == IO.Swagger.Model.ObjectModel.TypeEnum.Mesh) { + UpdatePositionBlockVO.SetActive(false); + UpdatePositionBlockMesh.SetActive(true); + RobotsListsBlock.SetActive(true); + } else if (CurrentObject.ActionObjectMetadata.ObjectModel != null) { + UpdatePositionBlockVO.SetActive(true); + UpdatePositionBlockMesh.SetActive(false); + RobotsListsBlock.SetActive(true); + ShowModelSwitch.Interactable = SceneManager.Instance.RobotsEEVisible; + if (ShowModelSwitch.Interactable && ShowModelSwitch.Switch.isOn) { + ShowModelOnEE(); + } + } else { + UpdatePositionBlockVO.SetActive(false); + UpdatePositionBlockMesh.SetActive(false); + RobotsListsBlock.SetActive(false); } + } else { UpdatePositionBlockVO.SetActive(false); UpdatePositionBlockMesh.SetActive(false); RobotsListsBlock.SetActive(false); } + FocusObjectDoneButton.interactable = false; NextButton.interactable = false; PreviousButton.interactable = false; @@ -266,6 +267,8 @@ public void ShowModelOnEE() { if (model != null) HideModelOnEE(); model = CurrentObject.GetModelCopy(); + if (model == null) + return; UpdateModelOnEE(); } diff --git a/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs index 2646902ed..77b0d9c84 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs @@ -286,6 +286,14 @@ private void OnSceneLoaded(object sender, EventArgs e) { } } + /// + /// Return true if there is any robot in scene + /// + /// + public bool RobotInScene() { + return GetRobots().Count > 0; + } + private void CleanRobotEE() { foreach (KeyValuePair ee in EndEffectors) { Destroy(ee.Value.gameObject); diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 090cea7ac..14c501619 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -14498,7 +14498,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 2005094.2 + value: 2009804.2 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -24664,7 +24664,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 5999156 + value: 6005756 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} From b4daa9c799e093145a1abf763ce6b1a8be50b9a0 Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 16:04:41 +0200 Subject: [PATCH 10/37] fixed: robots EE was instantioned outside of scene, thus rendered on wrong position when using tablet --- .../Assets/BASE/Scripts/GameManager.cs | 11 ++++-- .../Assets/BASE/Scripts/SceneManager.cs | 4 +-- .../Assets/TABLET/Scenes/TabletGUI.unity | 36 +++++++++++++++++-- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs index c40cd6cd8..51f4e222a 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs @@ -973,6 +973,7 @@ public async Task FocusObjectDone(string objectId) { } public async Task NewProject(string name, string sceneId, bool hasLogic) { + ShowLoadingScreen("Creating new project..."); Debug.Assert(sceneId != null && sceneId != ""); Debug.Assert(name != null && name != ""); @@ -980,21 +981,25 @@ public async Task NewProject(string name, string sceneId, bool hasLogic) { await WebsocketManager.Instance.CreateProject(name, sceneId, "", hasLogic, false); } catch (RequestFailedException e) { Notifications.Instance.ShowNotification("Failed to create project", e.Message); + HideLoadingScreen(); } finally { - } - + } } public async Task NewScene(string name) { + ShowLoadingScreen("Creating new scene..."); + if (name == "") { - Notifications.Instance.ShowNotification("Failed to create new scene", "Scane name to defined"); + Notifications.Instance.ShowNotification("Failed to create new scene", "Scene name not defined"); + HideLoadingScreen(); return false; } try { await WebsocketManager.Instance.CreateScene(name, ""); } catch (RequestFailedException e) { Notifications.Instance.ShowNotification("Failed to create new scene", e.Message); + HideLoadingScreen(); } return true; } diff --git a/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs index 77b0d9c84..67ee18293 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/SceneManager.cs @@ -52,7 +52,7 @@ public class SceneManager : Singleton { private Dictionary servicesData = new Dictionary(); - public GameObject ActionObjectsSpawn, SceneOrigin; + public GameObject ActionObjectsSpawn, SceneOrigin, EEOrigin; public GameObject RobotPrefab, ActionObjectPrefab; @@ -269,7 +269,7 @@ private void RobotEefUpdated(object sender, RobotEefUpdatedEventArgs args) { } foreach (EefPose eefPose in args.Data.EndEffectors) { if (!EndEffectors.TryGetValue(args.Data.RobotId + "/" + eefPose.EndEffectorId, out RobotEE robotEE)) { - robotEE = Instantiate(RobotEEPrefab, transform).GetComponent(); + robotEE = Instantiate(RobotEEPrefab, EEOrigin.transform).GetComponent(); robotEE.SetEEName(GetRobot(args.Data.RobotId).GetName(), eefPose.EndEffectorId); EndEffectors.Add(args.Data.RobotId + "/" + eefPose.EndEffectorId, robotEE); } diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 14c501619..566033e0c 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -4743,6 +4743,7 @@ MonoBehaviour: m_EditorClassIdentifier: ActionObjectsSpawn: {fileID: 324332329} SceneOrigin: {fileID: 1815563878} + EEOrigin: {fileID: 513205134} RobotPrefab: {fileID: 4117692875275004882, guid: 9da1cf6d795d3174e8f7767951744c70, type: 3} ActionObjectPrefab: {fileID: 4117692875275004882, guid: 522945abebfaa8142ab815d2254efe6b, @@ -5726,6 +5727,36 @@ MonoBehaviour: LayerMask: serializedVersion: 2 m_Bits: 279 +--- !u!1 &513205134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 513205135} + m_Layer: 0 + m_Name: RobotsEE + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &513205135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513205134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1815563879} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &515112849 PrefabInstance: m_ObjectHideFlags: 0 @@ -14498,7 +14529,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 2009804.2 + value: 2013284.2 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -22457,6 +22488,7 @@ Transform: m_Children: - {fileID: 324332330} - {fileID: 72610859} + - {fileID: 513205135} m_Father: {fileID: 311940053} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24664,7 +24696,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 6005756 + value: 6010556 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} From f3720b9c670c6e235d6ff2de0ed04e0b297c97da Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 16:12:29 +0200 Subject: [PATCH 11/37] object on top of EE was rotated wrongly --- arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs | 1 + arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs index dba5372a9..106e85eb0 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs +++ b/arcor2_AREditor/Assets/2D_EDITOR/Scripts/ActionObjectMenu.cs @@ -294,6 +294,7 @@ private void UpdateModelOnEE() { model.transform.localPosition = new Vector3(0, 0, 0); break; } + model.transform.localRotation = new Quaternion(0, 0, 0, 1); } catch (ItemNotFoundException ex) { Debug.LogError(ex); Notifications.Instance.ShowNotification("End-effector position unknown", "Robot did not send position of selected end effector"); diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 566033e0c..1544c2c41 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -14529,7 +14529,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 2013284.2 + value: 2014304.2 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -24696,7 +24696,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 6010556 + value: 6011996 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} From 1e9c09cc30fe2b9c432cd09f315dcf0b8c4f7beb Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 16:16:47 +0200 Subject: [PATCH 12/37] default timeout for requests changed to 15s --- arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs index 4eaaf5d89..7f54cb741 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs @@ -265,7 +265,7 @@ private void HandleReceivedData(byte[] message) { } - private Task WaitForResult(int key, int timeout = 5000) { + private Task WaitForResult(int key, int timeout = 15000) { return Task.Run(() => { if (responses.TryGetValue(key, out string value)) { if (value == null) { @@ -360,11 +360,6 @@ private void HandleCurrentAction(string obj) { Debug.LogError(ex); } - - - - - } private void HandleActionResult(string data) { From c737a86219f193b1341b9e9e1574593ccf31f299 Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 11 Jun 2020 16:31:39 +0200 Subject: [PATCH 13/37] scene name added to project tile --- .../Assets/BASE/Scripts/GameManager.cs | 10 + .../Assets/TABLET/Prefabs/ProjectTile.prefab | 423 ++++++++++++++++++ .../Assets/TABLET/Scenes/TabletGUI.unity | 12 +- .../Assets/TABLET/Scripts/GUI/ProjectTile.cs | 8 +- .../Assets/TABLET/Scripts/MainScreen.cs | 22 +- 5 files changed, 461 insertions(+), 14 deletions(-) diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs index 51f4e222a..a317b110a 100644 --- a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs +++ b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs @@ -1458,6 +1458,14 @@ public string GetProjectName(string projectId) { throw new ItemNotFoundException("Project with id: " + projectId + " not found"); } + public string GetSceneName(string sceneId) { + foreach (IdDesc scene in Scenes) { + if (scene.Id == sceneId) + return scene.Name; + } + throw new ItemNotFoundException("Scene with id: " + sceneId + " not found"); + } + } public struct RequestResult { @@ -1495,5 +1503,7 @@ public static implicit operator RequestResult((bool success, string message) val return new RequestResult(value.success, value.message); } + + } } diff --git a/arcor2_AREditor/Assets/TABLET/Prefabs/ProjectTile.prefab b/arcor2_AREditor/Assets/TABLET/Prefabs/ProjectTile.prefab index 069b5c58c..441df8d5a 100644 --- a/arcor2_AREditor/Assets/TABLET/Prefabs/ProjectTile.prefab +++ b/arcor2_AREditor/Assets/TABLET/Prefabs/ProjectTile.prefab @@ -1,5 +1,315 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2657650063348073996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5210742564686976987} + - component: {fileID: 7679241642692396718} + - component: {fileID: 4304702387471903392} + m_Layer: 5 + m_Name: Timestamp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5210742564686976987 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2657650063348073996} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4567353453841392415} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 11.5, y: -6} + m_SizeDelta: {x: 428.87152, y: 63.949158} + m_Pivot: {x: 0, y: 0} +--- !u!222 &7679241642692396718 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2657650063348073996} + m_CullTransparentMesh: 0 +--- !u!114 &4304702387471903392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2657650063348073996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Last modified: 2020-05-29 14:15' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 25 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 25 + m_fontStyle: 0 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 3 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -1.8900757, w: 0} + m_textInfo: + textComponent: {fileID: 4304702387471903392} + characterCount: 31 + spriteCount: 0 + spaceCount: 3 + wordCount: 5 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5615398150388765278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5331811878905260} + - component: {fileID: 1402016269206821452} + - component: {fileID: 5218387844037545212} + m_Layer: 5 + m_Name: SceneName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5331811878905260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615398150388765278} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4567353453841392415} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 10.5, y: 34} + m_SizeDelta: {x: 417.5, y: 63.949158} + m_Pivot: {x: 0, y: 0} +--- !u!222 &1402016269206821452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615398150388765278} + m_CullTransparentMesh: 0 +--- !u!114 &5218387844037545212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5615398150388765278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Scene: myproject' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 25 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 25 + m_fontStyle: 0 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 3 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -1.8900757, w: 0} + m_textInfo: + textComponent: {fileID: 5218387844037545212} + characterCount: 16 + spriteCount: 0 + spaceCount: 1 + wordCount: 2 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!114 &3761785416100429153 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19,6 +329,8 @@ MonoBehaviour: TopImage: {fileID: 4567353453458366528} ProjectId: SceneId: + sceneName: {fileID: 5218387844037545212} + timestamp: {fileID: 4304702387471903392} --- !u!1001 &8217384714284741153 PrefabInstance: m_ObjectHideFlags: 0 @@ -32,6 +344,106 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_margin.z + value: -1.8900757 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_margin.w + value: -2.1373901 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_firstOverflowCharacterIndex + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_textInfo.characterCount + value: 57 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_textInfo.lineCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_text + value: ToJeMujProjektKterejJeNejlepsiNaSveteAKazdejToMuzeDokazat + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_fontSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_fontSizeMin + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_fontSizeMax + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_fontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173772, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_isTextTruncated + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173773, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 85 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173773, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173773, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_SizeDelta.x + value: 429.37152 + objectReference: {fileID: 0} + - target: {fileID: 5577844582234173773, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_SizeDelta.y + value: 63.949158 + objectReference: {fileID: 0} - target: {fileID: 5577844582604083518, guid: e3a3e61aa1e8c804a9a7034839f1cc61, type: 3} propertyPath: m_LocalPosition.x @@ -122,6 +534,11 @@ PrefabInstance: propertyPath: m_Name value: ProjectTile objectReference: {fileID: 0} + - target: {fileID: 5577844582908990050, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + propertyPath: m_SizeDelta.y + value: 276.1509 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3a3e61aa1e8c804a9a7034839f1cc61, type: 3} --- !u!1 &4567353453841392414 stripped @@ -130,6 +547,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8217384714284741153} m_PrefabAsset: {fileID: 0} +--- !u!224 &4567353453841392415 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5577844582604083518, guid: e3a3e61aa1e8c804a9a7034839f1cc61, + type: 3} + m_PrefabInstance: {fileID: 8217384714284741153} + m_PrefabAsset: {fileID: 0} --- !u!114 &9094245238966222363 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 882490025461468218, guid: e3a3e61aa1e8c804a9a7034839f1cc61, diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 1544c2c41..9c3fd6b2a 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -14529,7 +14529,7 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: 2014304.2 + value: 2040464.2 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -24696,7 +24696,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 6011996 + value: 6047036 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -37231,7 +37231,7 @@ PrefabInstance: - target: {fileID: 728554504835127953, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.00024414062 objectReference: {fileID: 0} - target: {fileID: 870116323103940500, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -38124,7 +38124,7 @@ PrefabInstance: - target: {fileID: 2768830357252732581, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.000045776367 objectReference: {fileID: 0} - target: {fileID: 2778343468369029799, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -38605,7 +38605,7 @@ PrefabInstance: - target: {fileID: 3186733399446457868, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3186733399446457868, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -39803,7 +39803,7 @@ PrefabInstance: - target: {fileID: 4620524145206687212, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.000045776367 objectReference: {fileID: 0} - target: {fileID: 4654071109875633369, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectTile.cs b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectTile.cs index dca896c28..7396f1a1b 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectTile.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/GUI/ProjectTile.cs @@ -9,7 +9,11 @@ public class ProjectTile : Tile public string ProjectId; public string SceneId; - public void InitTile(string userId, UnityAction mainCallback, UnityAction optionCallback, bool starVisible, string projectId, string sceneId) { + [SerializeField] + private TMPro.TMP_Text sceneName, timestamp; + + public void InitTile(string userId, UnityAction mainCallback, UnityAction optionCallback, bool starVisible, string projectId, string sceneId, + string sceneName, string timestamp) { base.InitTile(userId, mainCallback, optionCallback, starVisible); ProjectId = projectId; SceneId = sceneId; @@ -18,5 +22,7 @@ public void InitTile(string userId, UnityAction mainCallback, UnityAction option Sprite sprite = ImageHelper.LoadNewSprite(filename); TopImage.sprite = sprite; } + this.sceneName.text = "Scene: " + sceneName; + this.timestamp.text = "Last modified: " + timestamp; } } diff --git a/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs b/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs index 55e87f86b..f16f34d69 100644 --- a/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs +++ b/arcor2_AREditor/Assets/TABLET/Scripts/MainScreen.cs @@ -212,13 +212,21 @@ public void UpdateProjects(object sender, EventArgs eventArgs) { foreach (IO.Swagger.Model.ListProjectsResponseData project in Base.GameManager.Instance.Projects) { ProjectTile tile = Instantiate(ProjectTilePrefab, ProjectsDynamicContent.transform).GetComponent(); bool starred = PlayerPrefsHelper.LoadBool("project/" + project.Id + "/starred", false); - tile.InitTile(project.Name, - () => Base.GameManager.Instance.OpenProject(project.Id), - () => ProjectOptionMenu.Open(tile), - starred, - project.Id, - project.SceneId); - projectTiles.Add(tile); + try { + string sceneName = GameManager.Instance.GetSceneName(project.SceneId); + tile.InitTile(project.Name, + () => GameManager.Instance.OpenProject(project.Id), + () => ProjectOptionMenu.Open(tile), + starred, + project.Id, + project.SceneId, + sceneName, + ""); + projectTiles.Add(tile); + } catch (ItemNotFoundException ex) { + Debug.LogError(ex); + Notifications.Instance.SaveLogs("Failed to load scene name."); + } } Button button = Instantiate(TileNewPrefab, ProjectsDynamicContent.transform).GetComponent