diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab b/Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab index 7806366d9691e981d855d2c59988cedbb5bd8d19..cdd860312344e2319fe08a78b4fb3655f11b5182 100644 --- a/Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab +++ b/Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab @@ -336,6 +336,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1961016420929613563, guid: 31ed0703f3e0ffe45ba1ecb37f3d3733, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961016420929613563, guid: 31ed0703f3e0ffe45ba1ecb37f3d3733, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1961016420929613563, guid: 31ed0703f3e0ffe45ba1ecb37f3d3733, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8502556052740004320, guid: 31ed0703f3e0ffe45ba1ecb37f3d3733, type: 3} propertyPath: m_Pivot.x @@ -446,6 +461,11 @@ PrefabInstance: propertyPath: m_Name value: DrpEntry (0) objectReference: {fileID: 0} + - target: {fileID: 8502556052740004326, guid: 31ed0703f3e0ffe45ba1ecb37f3d3733, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31ed0703f3e0ffe45ba1ecb37f3d3733, type: 3} --- !u!224 &1230079412655696707 stripped diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab b/Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab index 4e35cdca80702583a1a1af24475290a051d76ad4..7db364103a6c672ca070107fd898da097ab72eb8 100644 --- a/Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab +++ b/Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab @@ -186,6 +186,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8564880338397613253, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_Padding.m_Left + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8564880338397613253, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_Padding.m_Right + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8564880338510986776, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8564880338510986776, guid: ca864e351f4f13b4b96cf16ebb9abef0, type: 3} propertyPath: m_AnchorMax.y @@ -216,6 +231,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8564880339549714230, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, + type: 2} + - target: {fileID: 8564880339549714230, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, + type: 2} - target: {fileID: 8564880339947944206, guid: ca864e351f4f13b4b96cf16ebb9abef0, type: 3} propertyPath: m_Pivot.x @@ -326,6 +353,17 @@ PrefabInstance: propertyPath: m_Name value: InpEntry (0) objectReference: {fileID: 0} + - target: {fileID: 8564880340424609185, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, + type: 2} + - target: {fileID: 8564880340424609185, guid: ca864e351f4f13b4b96cf16ebb9abef0, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca864e351f4f13b4b96cf16ebb9abef0, type: 3} --- !u!224 &7400911231393554950 stripped diff --git a/Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab index d4582318b66df8ee15a5e138008f2971f52e7a89..687c2534486552d00dafba34969448a944abafbe 100644 --- a/Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab +++ b/Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab @@ -137,6 +137,7 @@ GameObject: - component: {fileID: 8803042889665911746} - component: {fileID: 8803042889665911747} - component: {fileID: 7957265830929356318} + - component: {fileID: 4102700775153416373} m_Layer: 5 m_Name: StageEntry (0) m_TagString: Untagged @@ -224,7 +225,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 1 m_ChildScaleWidth: 0 @@ -274,6 +275,20 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4102700775153416373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8803042889665911745} + 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 &8803042889869061507 GameObject: m_ObjectHideFlags: 0 @@ -651,7 +666,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 m_ChildControlHeight: 1 m_ChildScaleWidth: 0 diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab index d1a7779676ab49c44dd9f13bc41e0ae0eec69759..897d5b3cd415d534a9208cb10785fd205f1784e8 100644 --- a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab +++ b/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 1961016420929613561} - component: {fileID: 1961016420929613560} - component: {fileID: 1961016420929613563} + - component: {fileID: 4390147929824452626} m_Layer: 5 m_Name: Dropdown m_TagString: Untagged @@ -139,6 +140,26 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_AlphaFadeSpeed: 0.15 +--- !u!114 &4390147929824452626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961016420929613557} + 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: 22.5 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1961016420970012130 GameObject: m_ObjectHideFlags: 0 @@ -296,9 +317,8 @@ MonoBehaviour: m_Calls: [] m_text: Option A m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} - m_sharedMaterial: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -938,7 +958,7 @@ MonoBehaviour: m_Calls: [] m_text: Option A m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} m_fontSharedMaterials: [] @@ -1003,7 +1023,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1961016422668408464 diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab index 154b266883d2d7516626bc9ed633908a2d3e273b..05dfb3353f71f207d9581ae7d4e527a6002f66a2 100644 --- a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab +++ b/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab @@ -100,7 +100,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 m_ChildControlHeight: 1 m_ChildScaleWidth: 0 @@ -205,9 +205,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3bce71b32a876f54e96869a29b46e150, type: 2} - m_sharedMaterial: {fileID: 5290021301827705759, guid: 3bce71b32a876f54e96869a29b46e150, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -267,7 +266,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 5, z: 0, w: 0} + m_margin: {x: 0, y: 3, z: 0, w: 2} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -579,7 +578,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 + m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 m_ChildControlHeight: 1 m_ChildScaleWidth: 0 diff --git a/Assets/Scenes/Menues/MainMenue.unity b/Assets/Scenes/Menues/MainMenue.unity index 9f72dd4c6bcf232569e2155a47ef3b4aee6fbec3..f54d0f866459ad47a62144c006b5484d66726f4d 100644 --- a/Assets/Scenes/Menues/MainMenue.unity +++ b/Assets/Scenes/Menues/MainMenue.unity @@ -133,32 +133,32 @@ PrefabInstance: - target: {fileID: 2959976467324928172, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2959976467324928172, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2959976467324928172, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 26.47 objectReference: {fileID: 0} - target: {fileID: 2959976467324928172, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.13 objectReference: {fileID: 0} - target: {fileID: 2959976467324928172, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 13.235 objectReference: {fileID: 0} - target: {fileID: 2959976467324928172, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -18.5 objectReference: {fileID: 0} - target: {fileID: 2959976467324928174, guid: a8581491a96862248bb756703446e627, type: 3} @@ -283,32 +283,32 @@ PrefabInstance: - target: {fileID: 2959976468630027989, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2959976468630027989, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2959976468630027989, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 26.47 objectReference: {fileID: 0} - target: {fileID: 2959976468630027989, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.13 objectReference: {fileID: 0} - target: {fileID: 2959976468630027989, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 13.235 objectReference: {fileID: 0} - target: {fileID: 2959976468630027989, guid: a8581491a96862248bb756703446e627, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.065 objectReference: {fileID: 0} - target: {fileID: 4419334332453236392, guid: a8581491a96862248bb756703446e627, type: 3} @@ -362,27 +362,27 @@ PrefabInstance: - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 17.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -407,7 +407,7 @@ PrefabInstance: - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -417,7 +417,7 @@ PrefabInstance: - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -427,7 +427,7 @@ PrefabInstance: - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 30.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -497,147 +497,147 @@ PrefabInstance: - target: {fileID: 8803042889665911745, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.x - value: 57.33 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 38.665 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 378 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.x - value: 22.68 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 15.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.x - value: 48.78 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -878,7 +878,7 @@ PrefabInstance: - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 30.13 + value: 39.35 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -963,7 +963,7 @@ PrefabInstance: - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 35.35 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -973,7 +973,7 @@ PrefabInstance: - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: -17.675 objectReference: {fileID: 0} - target: {fileID: 8803042889869061516, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -995,6 +995,16 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 8803042890475378986, guid: e3c6f9259eca30d41b52eac75be03324, + type: 3} + propertyPath: m_MinHeight + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 8803042890475378986, guid: e3c6f9259eca30d41b52eac75be03324, + type: 3} + propertyPath: m_PreferredHeight + value: 26.13 + objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y @@ -1008,7 +1018,7 @@ PrefabInstance: - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 35.35 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -1018,7 +1028,7 @@ PrefabInstance: - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: -19.675 objectReference: {fileID: 0} - target: {fileID: 8803042890475379029, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -1179,10 +1189,10 @@ RectTransform: m_Father: {fileID: 1921890391} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63.574997, y: -18.5} + m_SizeDelta: {x: 70.21, y: 26.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &668208504 MonoBehaviour: @@ -1566,6 +1576,7 @@ GameObject: - component: {fileID: 727080895} - component: {fileID: 727080894} - component: {fileID: 727080898} + - component: {fileID: 727080897} m_Layer: 5 m_Name: StageList m_TagString: Untagged @@ -1585,7 +1596,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1574266696} - - {fileID: 1394753134} m_Father: {fileID: 321148490} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1658,6 +1668,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727080892} m_CullTransparentMesh: 1 +--- !u!114 &727080897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 727080892} + 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: 270 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!114 &727080898 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1686,6 +1716,7 @@ GameObject: - component: {fileID: 746765889} - component: {fileID: 746765888} - component: {fileID: 746765887} + - component: {fileID: 746765892} m_Layer: 5 m_Name: PageList m_TagString: Untagged @@ -1708,14 +1739,13 @@ RectTransform: - {fileID: 797633831} - {fileID: 1400502351} - {fileID: 1761706042} - - {fileID: 1452129007} m_Father: {fileID: 1464630722} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 526, y: 0} + m_SizeDelta: {x: 526, y: 305} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &746765887 MonoBehaviour: @@ -1809,6 +1839,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 746765885} m_CullTransparentMesh: 1 +--- !u!114 &746765892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746765885} + 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: 305 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1001 &748410840 PrefabInstance: m_ObjectHideFlags: 0 @@ -1859,7 +1909,7 @@ PrefabInstance: - target: {fileID: 1230079411388899228, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30.5 objectReference: {fileID: 0} - target: {fileID: 1230079411388899228, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} @@ -1899,12 +1949,12 @@ PrefabInstance: - target: {fileID: 1230079411388899228, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 263 objectReference: {fileID: 0} - target: {fileID: 1230079411388899228, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -91.5 objectReference: {fileID: 0} - target: {fileID: 1230079411388899228, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} @@ -1929,27 +1979,27 @@ PrefabInstance: - target: {fileID: 1230079412655696707, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1230079412655696707, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1230079412655696707, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.5 objectReference: {fileID: 0} - target: {fileID: 1230079412655696707, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 338 objectReference: {fileID: 0} - target: {fileID: 1230079412655696707, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.25 objectReference: {fileID: 0} - target: {fileID: 9009360744820970794, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} @@ -1959,52 +2009,52 @@ PrefabInstance: - target: {fileID: 9009360744820970804, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9009360744820970804, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9009360744820970804, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 60.6 objectReference: {fileID: 0} - target: {fileID: 9009360744820970804, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 75.5 objectReference: {fileID: 0} - target: {fileID: 9009360744820970804, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.065 objectReference: {fileID: 0} - target: {fileID: 9009360746146568564, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9009360746146568564, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9009360746146568564, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.13 objectReference: {fileID: 0} - target: {fileID: 9009360746146568564, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 77.5 objectReference: {fileID: 0} - target: {fileID: 9009360746146568564, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.065 objectReference: {fileID: 0} - target: {fileID: 9213191729870593112, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} @@ -2019,32 +2069,32 @@ PrefabInstance: - target: {fileID: 9213191729870593113, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9213191729870593113, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9213191729870593113, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 366 objectReference: {fileID: 0} - target: {fileID: 9213191729870593113, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 22.5 objectReference: {fileID: 0} - target: {fileID: 9213191729870593113, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 185 objectReference: {fileID: 0} - target: {fileID: 9213191729870593113, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.25 objectReference: {fileID: 0} - target: {fileID: 9213191730000256545, guid: 7f5b797c3287f0e46aa1b590c2ee9c4c, type: 3} @@ -2343,27 +2393,27 @@ PrefabInstance: - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.5 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 338 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.25 objectReference: {fileID: 0} - target: {fileID: 7400911231823471649, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2373,27 +2423,27 @@ PrefabInstance: - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 32.33 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 75.5 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.065 objectReference: {fileID: 0} - target: {fileID: 7400911232212503830, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2403,57 +2453,57 @@ PrefabInstance: - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.13 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 77.5 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.065 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 346 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 20.65 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 183 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10.325 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2478,7 +2528,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2488,7 +2538,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2498,7 +2548,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30.5 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2538,7 +2588,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 263 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2563,32 +2613,32 @@ PrefabInstance: - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 366 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 22.5 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 185 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.25 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2598,166 +2648,37 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 798378895} m_PrefabAsset: {fileID: 0} ---- !u!1001 &841908919 +--- !u!1001 &859647341 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 746765886} m_Modifications: - - target: {fileID: 6157414922619838332, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_MinHeight - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, + - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, + - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} - propertyPath: m_Pivot.y + propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, + - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} - propertyPath: m_RootOrder - value: 4 + propertyPath: m_SizeDelta.y + value: 26.5 objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, + - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 + propertyPath: m_AnchoredPosition.x + value: 338 objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_SizeDelta.x - value: 526 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Name - value: Entry_Dummy - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc2f3e0825f2de949b2415981eb86cc2, type: 3} ---- !u!1001 &859647341 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 746765886} - m_Modifications: - - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, + - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.25 objectReference: {fileID: 0} - target: {fileID: 7400911231823471649, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2769,27 +2690,27 @@ PrefabInstance: - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 63.96 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 75.5 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.065 objectReference: {fileID: 0} - target: {fileID: 7400911232212503830, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2799,57 +2720,57 @@ PrefabInstance: - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.13 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 77.5 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.065 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 346 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 20.65 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 183 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10.325 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2874,7 +2795,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2884,7 +2805,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2894,7 +2815,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30.5 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2934,12 +2855,12 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 263 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -30.5 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -2959,32 +2880,32 @@ PrefabInstance: - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 366 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 22.5 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 185 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.25 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -3112,8 +3033,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1823219497} m_HandleRect: {fileID: 1823219496} m_Direction: 2 - m_Value: 0.5 - m_Size: 0.91402197 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 1 m_OnValueChanged: m_PersistentCalls: @@ -3282,10 +3203,10 @@ RectTransform: m_Father: {fileID: 668208503} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 35.105, y: -13.065} + m_SizeDelta: {x: 70.21, y: 26.13} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1141686215 MonoBehaviour: @@ -3404,136 +3325,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1141686213} m_CullTransparentMesh: 1 ---- !u!1001 &1394753133 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 727080893} - m_Modifications: - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_SizeDelta.x - value: 526 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_SizeDelta.y - value: 219 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 263 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Name - value: Entry_Dummy - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc2f3e0825f2de949b2415981eb86cc2, type: 3} ---- !u!224 &1394753134 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - m_PrefabInstance: {fileID: 1394753133} - m_PrefabAsset: {fileID: 0} --- !u!224 &1400502351 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, @@ -3578,12 +3369,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &1452129007 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - m_PrefabInstance: {fileID: 841908919} - m_PrefabAsset: {fileID: 0} --- !u!1 &1452585382 GameObject: m_ObjectHideFlags: 0 @@ -3597,6 +3382,7 @@ GameObject: - component: {fileID: 1452585386} - component: {fileID: 1452585385} - component: {fileID: 1452585384} + - component: {fileID: 1452585388} m_Layer: 5 m_Name: StageList m_TagString: Untagged @@ -3616,14 +3402,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1791396430} - - {fileID: 1751715648} m_Father: {fileID: 1896318237} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 526, y: 0} + m_SizeDelta: {x: 526, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1452585384 MonoBehaviour: @@ -3703,6 +3488,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452585382} m_CullTransparentMesh: 1 +--- !u!114 &1452585388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452585382} + 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: 270 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1464630721 GameObject: m_ObjectHideFlags: 0 @@ -3716,6 +3521,7 @@ GameObject: - component: {fileID: 1464630725} - component: {fileID: 1464630724} - component: {fileID: 1464630723} + - component: {fileID: 1464630727} m_Layer: 5 m_Name: PageContainer m_TagString: Untagged @@ -3824,6 +3630,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1464630721} m_CullTransparentMesh: 1 +--- !u!114 &1464630727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464630721} + 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!1 &1509924334 GameObject: m_ObjectHideFlags: 0 @@ -3906,52 +3732,52 @@ PrefabInstance: - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.5 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 338 objectReference: {fileID: 0} - target: {fileID: 7400911231393554950, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.25 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 112.22 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 75.5 objectReference: {fileID: 0} - target: {fileID: 7400911231823471679, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.065 objectReference: {fileID: 0} - target: {fileID: 7400911232212503830, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -3961,57 +3787,57 @@ PrefabInstance: - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 26.13 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 77.5 objectReference: {fileID: 0} - target: {fileID: 7400911232779446399, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -15.065 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 346 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 20.65 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 183 objectReference: {fileID: 0} - target: {fileID: 7400911232839394576, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10.325 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -4036,7 +3862,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -4046,7 +3872,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -4056,7 +3882,7 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 30.5 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -4096,12 +3922,12 @@ PrefabInstance: - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 263 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -61 objectReference: {fileID: 0} - target: {fileID: 7400911232872862834, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -4121,32 +3947,32 @@ PrefabInstance: - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 366 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 22.5 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 185 objectReference: {fileID: 0} - target: {fileID: 7400911232960649160, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.25 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 258998b710c2c974697205dfca1e6d9b, type: 3} @@ -4249,7 +4075,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1739070009 RectTransform: m_ObjectHideFlags: 0 @@ -4288,138 +4114,6 @@ MonoBehaviour: Pages: {fileID: 1409078450} StageList: {fileID: 727080892} Entry: {fileID: 8803042889665911745, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} - EntryBuffer: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} ---- !u!1001 &1751715647 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1452585383} - m_Modifications: - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_SizeDelta.x - value: 526 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_SizeDelta.y - value: 219 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 263 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -26.13 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_Name - value: Entry_Dummy - objectReference: {fileID: 0} - - target: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bc2f3e0825f2de949b2415981eb86cc2, type: 3} ---- !u!224 &1751715648 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8803042889665911744, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} - m_PrefabInstance: {fileID: 1751715647} - m_PrefabAsset: {fileID: 0} --- !u!224 &1760706876 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2959976467408446326, guid: a8581491a96862248bb756703446e627, @@ -4577,7 +4271,7 @@ PrefabInstance: - target: {fileID: 8803042889665911745, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -5197,7 +4891,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2094533650 RectTransform: m_ObjectHideFlags: 0 @@ -5293,8 +4987,6 @@ MonoBehaviour: Pages: {fileID: 1409078450} StageList: {fileID: 1452585382} Entry: {fileID: 8803042889665911745, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} - EntryBuffer: {fileID: 8803042889665911745, guid: bc2f3e0825f2de949b2415981eb86cc2, - type: 3} --- !u!1001 &1491172436663537618 PrefabInstance: m_ObjectHideFlags: 0 @@ -5608,27 +5300,27 @@ PrefabInstance: - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 17.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889448749082, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -5673,7 +5365,7 @@ PrefabInstance: - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 30.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889665911744, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -5743,32 +5435,32 @@ PrefabInstance: - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.x - value: 117.56 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 145 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061506, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042889869061516, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -5790,30 +5482,35 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 8803042890475378986, guid: e3c6f9259eca30d41b52eac75be03324, + type: 3} + propertyPath: m_PreferredHeight + value: 26.13 + objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 378 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475378987, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890475379029, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -5833,57 +5530,57 @@ PrefabInstance: - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890798788383, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.x - value: 31 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 15.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696291, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042890826696301, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} @@ -5903,32 +5600,32 @@ PrefabInstance: - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.x - value: 70.18 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_SizeDelta.y - value: 26.13 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.x - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8803042891022398677, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.065 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3c6f9259eca30d41b52eac75be03324, type: 3} diff --git a/Assets/Scripts/GenerateDemoFiles.cs b/Assets/Scripts/GenerateDemoFiles.cs index a4473728b3ccbac20b1420b9fbfe3fefd22576ee..f88591d239062096046bc12803200b2c27308689 100644 --- a/Assets/Scripts/GenerateDemoFiles.cs +++ b/Assets/Scripts/GenerateDemoFiles.cs @@ -43,7 +43,6 @@ public static void GenerateDemoA() LineFact target = new LineFact(buttom.Id, top.Id, StageStatic.stage.solution); var target_Id = StageStatic.stage.solution.Add(target, out _, true); - Fact.Clear(); // Set Solution StageStatic.stage.solution.ValidationSet = diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs index 57d9a4c6da723b6ffc62972fee84722c8d8a3827..7f9782078c25c8c907c81e9c6093c8dca700987f 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs @@ -100,34 +100,32 @@ public string Label { set { rename(value); } } public bool hasCustomLabel { - get; - private set; + get { return LabelId < 0; } } protected string _CustomLabel = null; - private int LabelId = 0; - protected FactOrganizer _Facts; + // property for JSON to set AFTER label + public int LabelId { get; set; } - private static int MaxLabelId = 0; - private static SortedSet<int> UnusedLabelIds = new SortedSet<int>(); + protected FactOrganizer _Facts; protected Fact() // 0 parameter constructor for Json { this._Facts = new FactOrganizer(); - hasCustomLabel = false; + LabelId = 0; } protected Fact(FactOrganizer organizer) { this._Facts = organizer; - hasCustomLabel = false; + LabelId = 0; } protected Fact(Fact fact, FactOrganizer organizer) { this._Facts = organizer; - hasCustomLabel = fact.hasCustomLabel; + LabelId = fact.LabelId; if (hasCustomLabel) _CustomLabel = fact.Label; @@ -143,7 +141,6 @@ public bool rename(string newLabel) { generateLabel(); _CustomLabel = null; - hasCustomLabel = false; return true; } else @@ -154,7 +151,6 @@ public bool rename(string newLabel) freeAutoLabel(); _CustomLabel = newLabel; - hasCustomLabel = true; return true; } @@ -167,12 +163,6 @@ public bool rename(string newLabel) public abstract GameObject instantiateDisplay(GameObject prefab, Transform transform); - public static void Clear() - { - MaxLabelId = 0; - UnusedLabelIds.Clear(); - } - public virtual void delete(bool keep_clean = true) { //TODO: MMT: delete over there @@ -192,19 +182,19 @@ public virtual void delete(bool keep_clean = true) protected virtual string generateLabel() { + if (LabelId < 0) + // reload Label if possible + LabelId = _Facts.UnusedLabelIds.Remove(-LabelId) ? -LabelId : 0; + if (LabelId == 0) - if (UnusedLabelIds.Count == 0) - LabelId = ++MaxLabelId; + if (_Facts.UnusedLabelIds.Count == 0) + LabelId = ++_Facts.MaxLabelId; else { - LabelId = UnusedLabelIds.Min; - UnusedLabelIds.Remove(LabelId); + LabelId = _Facts.UnusedLabelIds.Min; + _Facts.UnusedLabelIds.Remove(LabelId); } - else if (LabelId < 0) - // reload Label if possible - LabelId = UnusedLabelIds.Remove(-LabelId) ? -LabelId : 0; - return ((char)(64 + LabelId)).ToString(); } @@ -213,7 +203,7 @@ protected virtual string generateLabel() { if (LabelId > 0) { - UnusedLabelIds.Add(LabelId); + _Facts.UnusedLabelIds.Add(LabelId); // store Label for name-persistance LabelId = -LabelId; } diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs index 3f33643373f3478384e6465bfe720b30ecebe8d9..753c1c6840fc9b971c347b820a8c5992106f31d7 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs @@ -26,6 +26,11 @@ public class FactOrganizer protected internal bool soft_resetted = false; // InvokeEvents? public bool invoke; + // TODO? SE: better seperation + // Label Managment; Communicates with Facts + protected internal int MaxLabelId = 0; + protected internal SortedSet<int> UnusedLabelIds = new SortedSet<int>(); + private static List<Directories> hierState = new List<Directories> { Directories.FactStateMachines }; @@ -110,6 +115,8 @@ private static void FactOrganizerFromPublic(ref FactOrganizer set, PublicFactOrg // initiate set.invoke = invoke; + set.MaxLabelId = exposed.MaxLabelId; + set.UnusedLabelIds = exposed.UnusedLabelIds; set.FactDict = new Dictionary<string, Fact>(); // work Workflow @@ -125,7 +132,6 @@ private static void FactOrganizerFromPublic(ref FactOrganizer set, PublicFactOrg { Fact old_Fact = old_FactDict[sn.Id]; - // TODO! false customLabel add = old_Fact.GetType() .GetConstructor(new Type[] { old_Fact.GetType(), old_to_new.GetType(), typeof(FactOrganizer) }) .Invoke(new object[] { old_Fact, old_to_new, set }) @@ -480,7 +486,7 @@ public void store(string name, List<Directories> hierarchie = null, bool use_ins JSONManager.WriteToJsonFile(path, new PublicFactOrganizer(this), 0); } - public static bool load(ref FactOrganizer set, bool draw, string name, List<Directories> hierarchie = null, bool use_install_folder = false, bool reset_Fact = false) + public static bool load(ref FactOrganizer set, bool draw, string name, List<Directories> hierarchie = null, bool use_install_folder = false) { hierarchie ??= new List<Directories>(); hierarchie.AddRange(hierState.AsEnumerable()); @@ -493,13 +499,10 @@ public static bool load(ref FactOrganizer set, bool draw, string name, List<Dire PublicFactOrganizer de_json = JSONManager.ReadFromJsonFile<PublicFactOrganizer>(path); FactOrganizerFromPublic(ref set, de_json, draw); - if (reset_Fact) - Fact.Clear(); - return true; } - public void Draw(bool draw_all = true) + public void Draw(bool draw_all = false) // call this after assigning a stored instance in an empty world, that was not drawn { // TODO: see issue #58 @@ -517,12 +520,11 @@ public void Draw(bool draw_all = true) } marker = 0; - var stop = backlog; + var stop = draw_all ? worksteps : backlog; backlog = worksteps; - if(draw_all) - while(backlog > stop) - redo(); + while(backlog > stop) + redo(); } public void Undraw(bool force_invoke = false) @@ -637,6 +639,10 @@ public class PublicFactOrganizer : FactOrganizer public new bool soft_resetted = false; // InvokeEvents? public new bool invoke; + // TODO? SE: better seperation + // Label Managment; Communicates with Facts + public new int MaxLabelId = 0; + public new SortedSet<int> UnusedLabelIds = new SortedSet<int>(); public new struct stepnote { @@ -707,6 +713,8 @@ protected internal PublicFactOrganizer(FactOrganizer expose) backlog = expose.backlog; soft_resetted = expose.soft_resetted; invoke = expose.invoke; + MaxLabelId = expose.MaxLabelId; + UnusedLabelIds = expose.UnusedLabelIds; foreach (var sn in expose.Workflow) Workflow.Add(new stepnote(sn.Id, sn.samestep, sn.steplink, sn.creation)); diff --git a/Assets/Scripts/InteractionEngine/FactHandling/SolutionOrganizer.cs b/Assets/Scripts/InteractionEngine/FactHandling/SolutionOrganizer.cs index da69541f538f6766d5243f56f852c86478461e30..ac1200f71c20e8548c1e32dedeba6d7cbd7acc92 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/SolutionOrganizer.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/SolutionOrganizer.cs @@ -40,7 +40,7 @@ public List<Fact> getMasterFactsByIndex (int i) hierarchie.RemoveRange(hierarchie.Count - hierVal.Count, hierVal.Count); } - public static bool load(ref SolutionOrganizer set, bool draw, string name, List<Directories> hierarchie = null, bool use_install_folder = false, bool reset_Fact = false) + public static bool load(ref SolutionOrganizer set, bool draw, string name, List<Directories> hierarchie = null, bool use_install_folder = false) { hierarchie ??= new List<Directories>(); hierarchie.AddRange(hierVal.AsEnumerable()); @@ -56,7 +56,7 @@ public static bool load(ref SolutionOrganizer set, bool draw, string name, List< FactOrganizer save = StageStatic.stage.factState; StageStatic.stage.factState = new SolutionOrganizer(false) as FactOrganizer; - loadable = FactOrganizer.load(ref StageStatic.stage.factState, draw, name + endingSol, hierarchie, use_install_folder, reset_Fact); + loadable = FactOrganizer.load(ref StageStatic.stage.factState, draw, name + endingSol, hierarchie, use_install_folder); if (loadable) set = (SolutionOrganizer) StageStatic.stage.factState; diff --git a/Assets/Scripts/Loading/Loader.cs b/Assets/Scripts/Loading/Loader.cs index 6c98110e7aaee4b911dbee258bcaf06469ab347a..1704ccc0262d07a985477a594f5b655ad3927539 100644 --- a/Assets/Scripts/Loading/Loader.cs +++ b/Assets/Scripts/Loading/Loader.cs @@ -24,15 +24,7 @@ public static bool isDone { } } - public static void UnloadStage() - { - StageStatic.stage.factState.hardreset(false); - StageStatic.stage.solution.hardreset(false); - StageStatic.devel = false; - Fact.Clear(); - } - - public static bool LoadStage(string name, bool local, bool restore_session = true) + public static bool LoadStage(string name, bool local, bool restore_session) { if (!StageStatic.LoadInitStage(name, local, restore_session)) return false; diff --git a/Assets/Scripts/Loading/Stage.cs b/Assets/Scripts/Loading/Stage.cs index d0015993f88ad9f03aac2b1a369a176edaf335e2..ae1ad99bb7ec90dd7c6401f1697a8b43e117612c 100644 --- a/Assets/Scripts/Loading/Stage.cs +++ b/Assets/Scripts/Loading/Stage.cs @@ -58,13 +58,13 @@ public void SetMode(bool create) factState = solution as FactOrganizer; factState.invoke = true; - factState.Draw(true); + factState.Draw(); } else { solution = factState as SolutionOrganizer; solution.invoke = false; - factState.Undraw(true); + factState.Undraw(); factState = hiddenState; factState.Draw(); @@ -152,13 +152,13 @@ public bool DeepLoad() bool loadable; solution ??= new SolutionOrganizer(false); - loadable = SolutionOrganizer.load(ref solution, false, name, hierarchie, use_install_folder, true); + loadable = SolutionOrganizer.load(ref solution, false, name, hierarchie, use_install_folder); if (!loadable) return false; factState ??= new FactOrganizer(false); - loadable = FactOrganizer.load(ref factState, false, name, hierarchie, false, false); + loadable = FactOrganizer.load(ref factState, false, name, hierarchie, false); hierarchie.RemoveRange(hierarchie.Count - hierStage.Count, hierStage.Count); return true; diff --git a/Assets/Scripts/Restart.cs b/Assets/Scripts/Restart.cs index 43883b6b9863326387e7606a92de2159dfc371e5..0ac047e890bf149630b37722cb2d6267a1090051 100644 --- a/Assets/Scripts/Restart.cs +++ b/Assets/Scripts/Restart.cs @@ -5,7 +5,6 @@ public class Restart : MonoBehaviour { public void LevelReset() { - Loader.UnloadStage(); Loader.LoadStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder, false); } diff --git a/Assets/Scripts/StageBehaviour.cs b/Assets/Scripts/StageBehaviour.cs index 14a3897b3eacb663937ded3a9ff416dc9f1768d3..d0ba9eb604e25817c8e3ec797baf6ff43f172409 100644 --- a/Assets/Scripts/StageBehaviour.cs +++ b/Assets/Scripts/StageBehaviour.cs @@ -5,7 +5,7 @@ public class StageBehaviour : MonoBehaviour { - void Awake() + void Start() { StageStatic.LoadInitStage(true, gameObject); } diff --git a/Assets/Scripts/StageStatic.cs b/Assets/Scripts/StageStatic.cs index acbae67d8b7f7e8e84631c2f616b926883c08ab6..68981f978dc3e884fb811a0855a031d391ca866f 100644 --- a/Assets/Scripts/StageStatic.cs +++ b/Assets/Scripts/StageStatic.cs @@ -135,7 +135,7 @@ public static bool LoadInitStage(string name, bool local = false, bool restore_s return true; } - public static bool LoadInitStage(bool restore_session = true, GameObject gameObject = null) + public static bool LoadInitStage(bool restore_session, GameObject gameObject = null) { if (current_name == null || current_name.Length == 0 || !stage.DeepLoad()) return false; diff --git a/Assets/Scripts/UI/MainMenue/CreateLoader.cs b/Assets/Scripts/UI/MainMenue/CreateLoader.cs index d5b26bdbfdcdc7f18c51207e736f7d0bcbf20386..2a82e09cd3592878b7b6a85e14a15ea0c1dd15fa 100644 --- a/Assets/Scripts/UI/MainMenue/CreateLoader.cs +++ b/Assets/Scripts/UI/MainMenue/CreateLoader.cs @@ -43,7 +43,7 @@ public void Init() if (0 == string.Compare(name, name.Length - world.Length, world, 0, world.Length)) { - Scenes.Add(scene.path); + Scenes.Add(name); Worlds.Add(new TMPro.TMP_Dropdown.OptionData(name)); } } diff --git a/Assets/Scripts/UI/MainMenue/StageLoader.cs b/Assets/Scripts/UI/MainMenue/StageLoader.cs index f4728d3b0745ffde30830f4059c0d5568e028805..9262feaca717b70f404e2c16aa34cfc40f39cf7c 100644 --- a/Assets/Scripts/UI/MainMenue/StageLoader.cs +++ b/Assets/Scripts/UI/MainMenue/StageLoader.cs @@ -8,7 +8,6 @@ public class StageLoader : MenueLoader { public GameObject StageList; public GameObject Entry; - public GameObject EntryBuffer; protected bool local = false; @@ -54,9 +53,7 @@ private void Clear() private void Default() { var def = Instantiate(Entry); - var buf = Instantiate(EntryBuffer); def.transform.SetParent(StageList.transform, false); - buf.transform.SetParent(StageList.transform, false); string message = local ? NoLocal : NoOfficial; WriteInChildText(def.transform.GetChild(2).gameObject, message); @@ -70,8 +67,6 @@ private void ListStageButtons(Dictionary<string, Stage> dict) return; } - Instantiate(EntryBuffer).transform.SetParent(StageList.transform, false); - var list = local ? dict.Values.OrderBy((v) => v.number) : dict.Values.OrderByDescending((v) => v.number); @@ -88,7 +83,7 @@ private void ListStageButtons(Dictionary<string, Stage> dict) WriteInChildText(prefab.transform.GetChild(2).gameObject, stage.description); // TODO: handle unable to load - prefab.GetComponent<UnityEngine.UI.Button>().onClick.AddListener(delegate { Loader.LoadStage(stage.name, mode == 1); }); + prefab.GetComponent<UnityEngine.UI.Button>().onClick.AddListener(delegate { Loader.LoadStage(stage.name, mode == 1, true); }); } }