From 0a2f65670d00d4a7f4b9839e38936fe622f4f75b Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Wed, 17 Jun 2026 03:59:14 +0100 Subject: [PATCH] Delete dead popup menu shell --- Aetheria.State.Verify/Program.cs | 95 ++ Assets/Prefabs/UI/Context Menu Option.prefab | 406 --------- .../UI/Context Menu Option.prefab.meta | 7 - Assets/Prefabs/UI/Context Menu.prefab | 279 ------ Assets/Prefabs/UI/Context Menu.prefab.meta | 7 - Assets/Prefabs/UI/Inventory.prefab | 1 - Assets/Scenes/ARPG.unity | 848 ------------------ Assets/Scripts/Gameplay/ActionGameManager.cs | 2 - Assets/Scripts/UI/ContextMenu.cs | 142 --- Assets/Scripts/UI/ContextMenu.cs.meta | 11 - Assets/Scripts/UI/ContextMenuOption.cs | 17 - Assets/Scripts/UI/ContextMenuOption.cs.meta | 11 - Assets/Scripts/UI/Menu/InventoryPanel.cs | 1 - Assets/Scripts/UI/Menu/SectorRenderer.cs | 4 - docs/aetheria-perfect-machine-map.md | 4 + 15 files changed, 99 insertions(+), 1736 deletions(-) delete mode 100644 Assets/Prefabs/UI/Context Menu Option.prefab delete mode 100644 Assets/Prefabs/UI/Context Menu Option.prefab.meta delete mode 100644 Assets/Prefabs/UI/Context Menu.prefab delete mode 100644 Assets/Prefabs/UI/Context Menu.prefab.meta delete mode 100644 Assets/Scripts/UI/ContextMenu.cs delete mode 100644 Assets/Scripts/UI/ContextMenu.cs.meta delete mode 100644 Assets/Scripts/UI/ContextMenuOption.cs delete mode 100644 Assets/Scripts/UI/ContextMenuOption.cs.meta diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 99f7d6b74..023cf051e 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -42,6 +42,7 @@ RequireTradeCargoSelectorUseEveSurface(root); RequireTradeFilterAndRowActionsUseEveSurface(root); RequireTradeItemDetailsUseEveSurface(root); RequireInventoryDropdownUseEveSurface(root); +RequireNoDeadPopupShells(root); RequirePlayerSettingsEveSurface(root); RequireMainMenuContinueRunState(root); RequirePropertiesPanelReadOnlyInspector(root); @@ -3015,6 +3016,100 @@ static void RequireInventoryDropdownUseEveSurface(string root) } } +static void RequireNoDeadPopupShells(string root) +{ + var deletedShellPaths = new[] + { + Path.Combine(root, "Assets", "Scripts", "UI", "ContextMenu.cs"), + Path.Combine(root, "Assets", "Scripts", "UI", "ContextMenu.cs.meta"), + Path.Combine(root, "Assets", "Scripts", "UI", "ContextMenuOption.cs"), + Path.Combine(root, "Assets", "Scripts", "UI", "ContextMenuOption.cs.meta"), + Path.Combine(root, "Assets", "Prefabs", "UI", "Context Menu.prefab"), + Path.Combine(root, "Assets", "Prefabs", "UI", "Context Menu.prefab.meta"), + Path.Combine(root, "Assets", "Prefabs", "UI", "Context Menu Option.prefab"), + Path.Combine(root, "Assets", "Prefabs", "UI", "Context Menu Option.prefab.meta") + }; + + var survivingShells = deletedShellPaths + .Where(File.Exists) + .Select(path => Path.GetRelativePath(root, path)) + .ToArray(); + + if (survivingShells.Length > 0) + { + throw new InvalidOperationException( + "The dead ContextMenu popup shell still survives in source or prefab assets: " + + string.Join(", ", survivingShells)); + } + + var sourceChecks = new Dictionary + { + [Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "InventoryPanel.cs")] = new[] + { + "public ContextMenu ContextMenu;" + }, + [Path.Combine(root, "Assets", "Scripts", "Gameplay", "ActionGameManager.cs")] = new[] + { + "public ContextMenu Context;", + "public DropdownMenu Dropdown;" + }, + [Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "SectorRenderer.cs")] = new[] + { + "public PropertiesPanel Properties;", + "Properties.gameObject.SetActive(false);" + } + }; + + var survivingSymbols = sourceChecks + .SelectMany(entry => + { + var text = File.Exists(entry.Key) ? File.ReadAllText(entry.Key) : ""; + return entry.Value + .Where(symbol => text.Contains(symbol, StringComparison.Ordinal)) + .Select(symbol => $"{Path.GetRelativePath(root, entry.Key)}: {symbol}"); + }) + .ToArray(); + + if (survivingSymbols.Length > 0) + { + throw new InvalidOperationException( + "Renderer-local popup shell authority still survives in live source: " + + string.Join("; ", survivingSymbols)); + } + + var serializedChecks = new Dictionary + { + [Path.Combine(root, "Assets", "Scenes", "ARPG.unity")] = new[] + { + "ContextMenu: {", + "propertyPath: ContextMenu", + "Context: {fileID:", + "Properties: {fileID:" + }, + [Path.Combine(root, "Assets", "Prefabs", "UI", "Inventory.prefab")] = new[] + { + "ContextMenu: {" + } + }; + + var survivingSerializedShells = serializedChecks + .SelectMany(entry => + { + var text = File.Exists(entry.Key) ? File.ReadAllText(entry.Key) : ""; + return entry.Value + .Where(symbol => text.Contains(symbol, StringComparison.Ordinal)) + .Select(symbol => $"{Path.GetRelativePath(root, entry.Key)}: {symbol}"); + }) + .ToArray(); + + if (survivingSerializedShells.Length > 0) + { + throw new InvalidOperationException( + "Scene or prefab YAML still serializes the deleted popup shell or orphan PropertiesPanel links: " + + string.Join("; ", survivingSerializedShells)); + } +} + static void RequirePlayerSettingsEveSurface(string root) { var projectorPath = Path.Combine(root, "Aetheria.State", "AetheriaPlayerSettingsSurfaceProjector.cs"); diff --git a/Assets/Prefabs/UI/Context Menu Option.prefab b/Assets/Prefabs/UI/Context Menu Option.prefab deleted file mode 100644 index 77cbd95e0..000000000 --- a/Assets/Prefabs/UI/Context Menu Option.prefab +++ /dev/null @@ -1,406 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2147126713262799487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2147126713262799480} - - component: {fileID: 2147126713262799476} - - component: {fileID: 2147126713262799483} - - component: {fileID: 2147126713262799482} - - component: {fileID: 2147126713262799481} - - component: {fileID: 3523328438153607920} - - component: {fileID: 1963641399357161325} - m_Layer: 5 - m_Name: Context Menu Option - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2147126713262799480 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - 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: 2147126713793274338} - - {fileID: 1944744018361081348} - m_Father: {fileID: 0} - 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_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2147126713262799476 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - m_CullTransparentMesh: 0 ---- !u!114 &2147126713262799483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - 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.7529412, g: 0.7529412, b: 1, a: 0.14901961} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7ed12bf887e951949bd02894a21fb3ff, 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 &2147126713262799482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.75, g: 0.75, b: 0.75, a: 1} - m_HighlightedColor: {r: 0.85, g: 0.85, b: 0.85, a: 1} - m_PressedColor: {r: 1, g: 1, b: 1, a: 1} - m_SelectedColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} - m_DisabledColor: {r: 0.3, g: 0.3, b: 0.3, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2147126713262799483} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &2147126713262799481 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - 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: 16 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &3523328438153607920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 741dca7ca8716dd438516c4f8bafd441, type: 3} - m_Name: - m_EditorClassIdentifier: - Label: {fileID: 2147126713793274364} - Arrow: {fileID: 1628239746935905733} - Button: {fileID: 2147126713262799482} - Hover: {fileID: 1963641399357161325} ---- !u!114 &1963641399357161325 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713262799487} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6435d6126b6f8694292cb94466cf1df4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &2147126713793274337 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2147126713793274338} - - component: {fileID: 2147126713793274365} - - component: {fileID: 2147126713793274364} - - component: {fileID: 2147126713793274339} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2147126713793274338 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713793274337} - 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: 2147126713262799480} - 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: -8, y: 0} - m_SizeDelta: {x: -32, y: -8} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2147126713793274365 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713793274337} - m_CullTransparentMesh: 0 ---- !u!114 &2147126713793274364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713793274337} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Context Option - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} - m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, - 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_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 9 - m_fontSizeBase: 9 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 12 - m_fontSizeMax: 22 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - 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_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &2147126713793274339 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2147126713793274337} - 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 &7016173882347324599 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1944744018361081348} - - component: {fileID: 1986380382041583511} - - component: {fileID: 1628239746935905733} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1944744018361081348 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016173882347324599} - 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: 2147126713262799480} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -4, y: 0} - m_SizeDelta: {x: 10, y: 16} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &1986380382041583511 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016173882347324599} - m_CullTransparentMesh: 0 ---- !u!114 &1628239746935905733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016173882347324599} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef87bbaa6e6f6824fa1b758cc93393d5, 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 diff --git a/Assets/Prefabs/UI/Context Menu Option.prefab.meta b/Assets/Prefabs/UI/Context Menu Option.prefab.meta deleted file mode 100644 index 870f1e536..000000000 --- a/Assets/Prefabs/UI/Context Menu Option.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8cabdd9c2f8e4be45b917debb4762707 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Context Menu.prefab b/Assets/Prefabs/UI/Context Menu.prefab deleted file mode 100644 index 80ec53ea1..000000000 --- a/Assets/Prefabs/UI/Context Menu.prefab +++ /dev/null @@ -1,279 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3452408986865468161 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3452408986865468174} - - component: {fileID: 3452408986865468172} - - component: {fileID: 3452408986865468175} - - component: {fileID: 3452408986865468173} - m_Layer: 5 - m_Name: Context Menu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3452408986865468174 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986865468161} - 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: 3452408988660256314} - - {fileID: 3452408986885472817} - m_Father: {fileID: 0} - 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: -35.87} - m_SizeDelta: {x: 250, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3452408986865468172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986865468161} - 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!114 &3452408986865468175 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986865468161} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 2 - m_Right: 2 - m_Top: 2 - m_Bottom: 2 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &3452408986865468173 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986865468161} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f50aaf220f9a82a4a817fa3164bcd62b, type: 3} - m_Name: - m_EditorClassIdentifier: - Canvas: {fileID: 0} - Root: {fileID: 0} - CancelClickCatcher: {fileID: 0} - OptionPrefab: {fileID: 3523328438153607920, guid: 8cabdd9c2f8e4be45b917debb4762707, - type: 3} - DropMenuPrefab: {fileID: 3452408986865468173} - Parent: {fileID: 0} - ForceDirectionRight: 0 - ForcePosition: {x: 0, y: 0, z: 0} - ContentRoot: {fileID: 3452408986885472817} - OptionHeight: 17 - PaddingHeight: 10 ---- !u!1 &3452408986885472816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3452408986885472817} - - component: {fileID: 3452408986885472831} - - component: {fileID: 3452408986885472830} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3452408986885472817 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986885472816} - 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: 3452408986865468174} - 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!114 &3452408986885472831 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986885472816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 3 - m_Right: 3 - m_Top: 3 - m_Bottom: 3 - m_ChildAlignment: 0 - m_Spacing: 1 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &3452408986885472830 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408986885472816} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 ---- !u!1 &3452408988660256317 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3452408988660256314} - - component: {fileID: 3452408988660256313} - - component: {fileID: 3452408988660256312} - - component: {fileID: 3452408988660256315} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3452408988660256314 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408988660256317} - 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: 3452408986865468174} - 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 &3452408988660256313 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408988660256317} - m_CullTransparentMesh: 0 ---- !u!114 &3452408988660256312 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408988660256317} - 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, g: 0.041666675, b: 0.1, a: 0.79607844} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d43f9691259ed984fa09c853c5cda7f0, 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 &3452408988660256315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452408988660256317} - 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 diff --git a/Assets/Prefabs/UI/Context Menu.prefab.meta b/Assets/Prefabs/UI/Context Menu.prefab.meta deleted file mode 100644 index b2b17ad34..000000000 --- a/Assets/Prefabs/UI/Context Menu.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 75d78a753ab7e4e41995db4f59fd74b7 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Inventory.prefab b/Assets/Prefabs/UI/Inventory.prefab index 0addea4f8..4e0dac034 100644 --- a/Assets/Prefabs/UI/Inventory.prefab +++ b/Assets/Prefabs/UI/Inventory.prefab @@ -1496,7 +1496,6 @@ MonoBehaviour: Flip: 0 Settings: {fileID: 0} GameManager: {fileID: 0} - ContextMenu: {fileID: 0} Title: {fileID: 2279630453679143108} MinTempLabel: {fileID: 5147778229255501832} MaxTempLabel: {fileID: 5621828991514048865} diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 294e22584..49c77dd51 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -6024,7 +6024,6 @@ MonoBehaviour: Flip: 1 Settings: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, type: 2} GameManager: {fileID: 1009503729} - ContextMenu: {fileID: 1157981993} Title: {fileID: 0} MinTempLabel: {fileID: 0} MaxTempLabel: {fileID: 0} @@ -8488,7 +8487,6 @@ RectTransform: m_Children: - {fileID: 5496444666756201243} - {fileID: 1914914798} - - {fileID: 655315360} m_Father: {fileID: 1726632265} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8509,13 +8507,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GameManager: {fileID: 1009503729} - ContextMenu: {fileID: 1157981993} Dialog: {fileID: 620555924} NewFilterButton: {fileID: 114477922027825946} FilterPrototype: {fileID: 2505679758530842354} MinimumSizeFilter: {fileID: 1714353021} MaximumSizeFilter: {fileID: 236872711} - Properties: {fileID: 655315361} Spreadsheet: {fileID: 234374935} TargetCargoLabel: {fileID: 125165636} FoldoutButton: {fileID: 425104909} @@ -10217,386 +10213,6 @@ MonoBehaviour: x: 0 y: 0 IconSize: 32 ---- !u!1001 &642590526 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1997243493} - m_Modifications: - - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630452592903581, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630452912159027, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630452912159027, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 2279630452951644481, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 2279630453233804081, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630453233804081, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: 107.76 - objectReference: {fileID: 0} - - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: 24 - objectReference: {fileID: 0} - - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 210.12 - objectReference: {fileID: 0} - - target: {fileID: 2279630453679143107, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -8 - objectReference: {fileID: 0} - - target: {fileID: 2279630453710142155, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: -396 - objectReference: {fileID: 0} - - target: {fileID: 2279630453710142155, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: -545 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260052, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_Name - value: Cargo 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: 550 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: Dialog - value: - objectReference: {fileID: 620555924} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: Settings - value: - objectReference: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, - type: 2} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: DragParent - value: - objectReference: {fileID: 245842385} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: ContextMenu - value: - objectReference: {fileID: 1157981993} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: GameManager - value: - objectReference: {fileID: 1009503729} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: MaxTemperature - value: 1000 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: TemperatureAlphaCurve.Exponent - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: TemperatureColorCurve.Exponent - value: 1.4 - objectReference: {fileID: 0} - - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 72 - objectReference: {fileID: 0} - - target: {fileID: 2279630454000268454, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -24 - objectReference: {fileID: 0} - - target: {fileID: 2279630454002795611, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2279630454002795611, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: 24 - objectReference: {fileID: 0} - - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 336.88 - objectReference: {fileID: 0} - - target: {fileID: 3031152863755518086, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4075091371340814903, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -49.19995 - objectReference: {fileID: 0} - - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.x - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 194.12 - objectReference: {fileID: 0} - - target: {fileID: 4397116930423727094, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 6451840322166179141, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.07519531 - objectReference: {fileID: 0} - - target: {fileID: 8871154407653395989, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: m_SizeDelta.y - value: -2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aac073da6df367d499834c926930dd84, type: 3} ---- !u!224 &642590527 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2279630453886260053, guid: aac073da6df367d499834c926930dd84, - type: 3} - m_PrefabInstance: {fileID: 642590526} - m_PrefabAsset: {fileID: 0} --- !u!1 &642867940 GameObject: m_ObjectHideFlags: 0 @@ -10669,182 +10285,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1281fe44325f9b548aa42dc331b17266, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &655315359 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 522642868} - m_Modifications: - - target: {fileID: 257019179550429270, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 257019179550429270, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 257019179596293679, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_SizeDelta.y - value: -583 - objectReference: {fileID: 0} - - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 257019180101986795, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_SizeDelta.x - value: -7 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215475, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: Dropdown - value: - objectReference: {fileID: 178733681} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_SizeDelta.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7131821417165215485, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - propertyPath: m_Name - value: Properties - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 426f9dcb510530d4dbfa678c9f727ec1, type: 3} ---- !u!224 &655315360 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7131821417165215484, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - m_PrefabInstance: {fileID: 655315359} - m_PrefabAsset: {fileID: 0} ---- !u!114 &655315361 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7131821417165215475, guid: 426f9dcb510530d4dbfa678c9f727ec1, - type: 3} - m_PrefabInstance: {fileID: 655315359} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8c2bf4a7080061d42a87046c37bf0c60, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &661332567 GameObject: m_ObjectHideFlags: 0 @@ -16539,8 +15979,6 @@ MonoBehaviour: ShipPanel: {fileID: 7628189704109037582} TargetShipPanel: {fileID: 410701133} Dialog: {fileID: 620555924} - Context: {fileID: 1157981993} - Dropdown: {fileID: 178733681} GameplayUI: {fileID: 346000248} EventLog: {fileID: 1396909588} HostileTargetIndicator: {fileID: 1787772783} @@ -18825,111 +18263,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156729697} m_CullTransparentMesh: 0 ---- !u!1 &1157981991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1157981992} - - component: {fileID: 1157981995} - - component: {fileID: 1157981994} - - component: {fileID: 1157981993} - m_Layer: 5 - m_Name: Context Menu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1157981992 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157981991} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1505831357} - - {fileID: 1741914910} - m_Father: {fileID: 761574181} - 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: 109, y: -33} - m_SizeDelta: {x: 250, y: 10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1157981993 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157981991} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f50aaf220f9a82a4a817fa3164bcd62b, type: 3} - m_Name: - m_EditorClassIdentifier: - Canvas: {fileID: 761574180} - Root: {fileID: 761574181} - CancelClickCatcher: {fileID: 1420548305} - OptionPrefab: {fileID: 3523328438153607920, guid: 8cabdd9c2f8e4be45b917debb4762707, - type: 3} - DropMenuPrefab: {fileID: 3452408986865468173, guid: 75d78a753ab7e4e41995db4f59fd74b7, - type: 3} - Parent: {fileID: 0} - ForceDirectionRight: 0 - ForcePosition: {x: 0, y: 0, z: 0} - ContentRoot: {fileID: 1741914910} - OptionHeight: 17 - PaddingHeight: 10 ---- !u!114 &1157981994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157981991} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 2 - m_Right: 2 - m_Top: 2 - m_Bottom: 2 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &1157981995 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157981991} - 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 &1163671425 GameObject: m_ObjectHideFlags: 0 @@ -23452,102 +22785,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1486694123} m_CullTransparentMesh: 0 ---- !u!1 &1505831356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1505831357} - - component: {fileID: 1505831360} - - component: {fileID: 1505831359} - - component: {fileID: 1505831358} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1505831357 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505831356} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1157981992} - 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!114 &1505831358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505831356} - 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!114 &1505831359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505831356} - 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, g: 0.041666675, b: 0.1, a: 0.79607844} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d43f9691259ed984fa09c853c5cda7f0, 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!222 &1505831360 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505831356} - m_CullTransparentMesh: 0 --- !u!1 &1511875451 GameObject: m_ObjectHideFlags: 0 @@ -27605,83 +26842,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &1741914909 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1741914910} - - component: {fileID: 1741914912} - - component: {fileID: 1741914911} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1741914910 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741914909} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1157981992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 125, y: -5} - m_SizeDelta: {x: 246, y: 6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1741914911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741914909} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 ---- !u!114 &1741914912 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741914909} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 3 - m_Right: 3 - m_Top: 3 - m_Bottom: 3 - m_ChildAlignment: 0 - m_Spacing: 1 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &1742364861 GameObject: m_ObjectHideFlags: 0 @@ -30179,7 +29339,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Raycaster: {fileID: 1998350933} - Properties: {fileID: 625292027} Canvas: {fileID: 761574180} Map: {fileID: 2132980328} GameManager: {fileID: 1009503729} @@ -30578,7 +29737,6 @@ RectTransform: m_Children: - {fileID: 1998350929} - {fileID: 1005841432} - - {fileID: 625292026} m_Father: {fileID: 1726632265} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -32846,11 +32004,6 @@ PrefabInstance: propertyPath: DragParent value: objectReference: {fileID: 245842385} - - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, - type: 3} - propertyPath: ContextMenu - value: - objectReference: {fileID: 1157981993} - target: {fileID: 2279630453886260054, guid: aac073da6df367d499834c926930dd84, type: 3} propertyPath: GameManager @@ -38080,7 +37233,6 @@ MonoBehaviour: Flip: 0 Settings: {fileID: 11400000, guid: cd2344e2001a37544aab0960c164d4ff, type: 2} GameManager: {fileID: 1009503729} - ContextMenu: {fileID: 1157981993} Title: {fileID: 0} MinTempLabel: {fileID: 906882335} MaxTempLabel: {fileID: 1012981709} diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index ba12b14bc..8e04bb6aa 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -441,8 +441,6 @@ public class ActionGameManager : MonoBehaviour public InventoryPanel ShipPanel; public InventoryPanel TargetShipPanel; public ConfirmationDialog Dialog; - public ContextMenu Context; - public DropdownMenu Dropdown; [Header("Gameplay UI")] public CanvasGroup GameplayUI; diff --git a/Assets/Scripts/UI/ContextMenu.cs b/Assets/Scripts/UI/ContextMenu.cs deleted file mode 100644 index 8cef7329a..000000000 --- a/Assets/Scripts/UI/ContextMenu.cs +++ /dev/null @@ -1,142 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using TMPro; -using UnityEngine; -using UnityEngine.InputSystem; -using UnityEngine.UI; -using UniRx; - -public class ContextMenu : MonoBehaviour -{ - public Canvas Canvas; - public RectTransform Root; - public ClickCatcher CancelClickCatcher; - public ContextMenuOption OptionPrefab; - public ContextMenu DropMenuPrefab; - public ContextMenu Parent; - public bool ForceDirectionRight; - public Vector3 ForcePosition; - - public RectTransform ContentRoot; - - public float OptionHeight; - public float PaddingHeight; - - private List _options = new List(); - private bool _hasDropdown; - private bool _dropdownRight; - private GameObject _dropdown; - private ContextMenuOption _currentDropdown; - private IDisposable _backgroundClickSubscription; - - private void OnEnable() - { - if (CancelClickCatcher != null) - _backgroundClickSubscription = CancelClickCatcher.OnClick.Subscribe(data => - { - End(); - }); - } - - private void OnDisable() - { - _backgroundClickSubscription?.Dispose(); - _backgroundClickSubscription = null; - } - - private void End() - { - if (_dropdown != null) - Destroy(_dropdown); - CancelClickCatcher.gameObject.SetActive(false); - gameObject.SetActive(false); - ActionGameManager.Instance?.Input.Global.Enable(); - } - - public void Clear() - { - // Destroy previous options - foreach(var option in _options) - Destroy(option); - _options.Clear(); - _hasDropdown = false; - } - - public void AddOption(string text, Action action, bool enabled = true) - { - var optionButton = Instantiate(OptionPrefab, ContentRoot); - optionButton.Label.text = text; - optionButton.Button.onClick.AddListener(() => - { - if(Parent!=null) - Parent.End(); - else - End(); - action(); - }); - optionButton.Hover.OnEnter += data => - { - if (_dropdown != null) - Destroy(_dropdown); - }; - optionButton.Arrow.gameObject.SetActive(false); - optionButton.Button.interactable = enabled; - _options.Add(optionButton.gameObject); - } - - public void AddDropdown(string text, IEnumerable<(string text, Action action, bool enabled)> options) - { - _hasDropdown = true; - var optionButton = Instantiate(OptionPrefab, ContentRoot); - optionButton.Label.text = text; - optionButton.Hover.OnEnter += data => - { - if (_currentDropdown != optionButton) - { - if(_dropdown!=null) - Destroy(_dropdown); - var drop = Instantiate(DropMenuPrefab, Root); - _dropdown = drop.gameObject; - foreach (var option in options) - drop.AddOption(option.text, option.action, option.enabled); - drop.Parent = this; - drop.ForceDirectionRight = _dropdownRight; - Vector3[] corners = new Vector3[4]; - ((RectTransform) optionButton.transform).GetWorldCorners(corners); - drop.ForcePosition = corners[_dropdownRight ? 2 : 1]; - drop.Show(); - } - }; - _options.Add(optionButton.gameObject); - } - - public void Show() - { - gameObject.SetActive(true); - var rect = transform as RectTransform; - var pivot = rect.pivot; - var canvas = Parent != null ? Parent.Canvas : Canvas; - var mousePosition = Mouse.current.position.ReadValue(); - if (Parent!=null) - pivot.x = ForceDirectionRight ? 0 : 1; - else - pivot.x = mousePosition.x > Screen.width - rect.sizeDelta.x * canvas.scaleFactor ? 1 : 0; - var scaleFactor = canvas.scaleFactor; - _dropdownRight = mousePosition.x < Screen.width - rect.sizeDelta.x * scaleFactor * 2; - var pos = Parent==null ? mousePosition.y : ForcePosition.y; - var space = (PaddingHeight + _options.Count * OptionHeight) * scaleFactor; - var deltaY = pos < space ? space - pos : PaddingHeight / 2 * scaleFactor; - pivot.y = 1;//pivotTop ? 1 : 0; - rect.pivot = pivot; - rect.position = (Parent != null ? ForcePosition : (Vector3) mousePosition) + Vector3.up * deltaY; - if (Parent==null) - CancelClickCatcher.gameObject.SetActive(true); - ActionGameManager.Instance?.Input.Global.Disable(); - } -} diff --git a/Assets/Scripts/UI/ContextMenu.cs.meta b/Assets/Scripts/UI/ContextMenu.cs.meta deleted file mode 100644 index f70159c42..000000000 --- a/Assets/Scripts/UI/ContextMenu.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f50aaf220f9a82a4a817fa3164bcd62b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/ContextMenuOption.cs b/Assets/Scripts/UI/ContextMenuOption.cs deleted file mode 100644 index f26075379..000000000 --- a/Assets/Scripts/UI/ContextMenuOption.cs +++ /dev/null @@ -1,17 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public class ContextMenuOption : MonoBehaviour -{ - public TextMeshProUGUI Label; - public Image Arrow; - public Button Button; - public MouseHover Hover; -} diff --git a/Assets/Scripts/UI/ContextMenuOption.cs.meta b/Assets/Scripts/UI/ContextMenuOption.cs.meta deleted file mode 100644 index 15974e78d..000000000 --- a/Assets/Scripts/UI/ContextMenuOption.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 741dca7ca8716dd438516c4f8bafd441 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs index 8b5a3c04c..832997f28 100644 --- a/Assets/Scripts/UI/Menu/InventoryPanel.cs +++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs @@ -37,7 +37,6 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler public bool Flip; public GameSettings Settings; public ActionGameManager GameManager; - public ContextMenu ContextMenu; public TextMeshProUGUI Title; public TextMeshProUGUI MinTempLabel; public TextMeshProUGUI MaxTempLabel; diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index 4afcb6aad..b769c03ad 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -23,7 +23,6 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS private const string CloseZoneDetailsCommand = "aetheria.sector_map.zone_details.close"; public ClickRaycaster Raycaster; - public PropertiesPanel Properties; public Canvas Canvas; public SectorMap Map; public ActionGameManager GameManager; @@ -87,8 +86,6 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS private void RenderZoneDetailsSurface(GalaxyZone zone) { - Properties.gameObject.SetActive(false); - var document = ResolveZoneDetailsSurfaceDocument(); document.gameObject.SetActive(true); @@ -146,7 +143,6 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS private void HideZoneDetailsSurface() { - Properties.gameObject.SetActive(false); if (_zoneDetailsSurfaceDocument == null) return; diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 3e58b0645..cba26aef9 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1980,6 +1980,10 @@ First Aetheria surfaces to publish: UI Toolkit `UIDocument` host and a local Eve surface document instead of rebuilding nested `ContextMenu.AddDropdown(...)` and `ContextMenu.AddOption(...)` menus. +- The dead `ContextMenu` popup shell, its prefab assets, and orphan + scene/prefab references are deleted outright; `InventoryPanel`, + `ActionGameManager`, `TradeMenu`, and `SectorRenderer` no longer keep + serialized hooks into dead popup or properties-panel shells. - Trade filter selection and simple-commodity buy-quantity entry now lower through shared UI Toolkit `UIDocument` hosts and local Eve surface documents instead of rebuilding `ContextMenu.AddDropdown(...)`, `ContextMenu.AddOption(...)`,