From b641290ab6bb4a8c2a2fc8e7ecd5aa4813137c2e Mon Sep 17 00:00:00 2001 From: CyberAxe3108 Date: Thu, 30 Apr 2026 14:29:44 -0400 Subject: [PATCH] Delete Feature Fixed --- Assets/Scenes/CategoryButton.unity | 519 +++++++++--------- .../Scripts/ObjectPlacement/BuildingSystem.cs | 9 +- .../Scripts/ObjectPlacement/ClickToDelete.cs | 22 +- .../ObjectPlacement/PlaceableObject.cs | 2 +- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- 6 files changed, 278 insertions(+), 278 deletions(-) diff --git a/Assets/Scenes/CategoryButton.unity b/Assets/Scenes/CategoryButton.unity index b85ad88..915a834 100644 --- a/Assets/Scenes/CategoryButton.unity +++ b/Assets/Scenes/CategoryButton.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -422,6 +421,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &78208933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 78208934} + m_Layer: 0 + m_Name: Decorations + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &78208934 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 78208933} + serializedVersion: 2 + 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: 1716943585} + m_Father: {fileID: 490645483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &91666548 GameObject: m_ObjectHideFlags: 0 @@ -556,38 +587,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 91666548} m_CullTransparentMesh: 1 ---- !u!1 &78208933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 78208934} - m_Layer: 0 - m_Name: Decorations - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &78208934 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 78208933} - serializedVersion: 2 - 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: 1716943585} - m_Father: {fileID: 490645483} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &122002260 GameObject: m_ObjectHideFlags: 0 @@ -775,7 +774,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 430, y: -70} + m_AnchoredPosition: {x: 550, y: -70} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &171183487 @@ -2390,7 +2389,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 337570031} m_CullTransparentMesh: 1 ---- !u!1 &417928530 +--- !u!1 &407969233 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2398,42 +2397,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 417928531} - - component: {fileID: 417928533} - - component: {fileID: 417928532} + - component: {fileID: 407969234} + - component: {fileID: 407969236} + - component: {fileID: 407969235} m_Layer: 5 - m_Name: LoadText3 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &417928531 +--- !u!224 &407969234 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 417928530} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 407969233} + 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_LocalScale: {x: 1.017942, y: 1.0884, z: 1.0884} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1069840691} + m_Father: {fileID: 2079155521} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} 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 &417928532 + m_AnchoredPosition: {x: 2, y: 2.3151} + m_SizeDelta: {x: 0, y: 75} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &407969235 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 417928530} + m_GameObject: {fileID: 407969233} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2447,7 +2446,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Load Map 3 + m_text: 'Shortcuts + + +' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2474,8 +2476,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2510,21 +2512,21 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 74.63775, z: 1.8633423, w: 82.887924} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &417928533 +--- !u!222 &407969236 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 417928530} + m_GameObject: {fileID: 407969233} m_CullTransparentMesh: 1 ---- !u!1 &407969233 +--- !u!1 &417928530 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2532,42 +2534,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 407969234} - - component: {fileID: 407969236} - - component: {fileID: 407969235} + - component: {fileID: 417928531} + - component: {fileID: 417928533} + - component: {fileID: 417928532} m_Layer: 5 - m_Name: Text + m_Name: LoadText3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &407969234 +--- !u!224 &417928531 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 407969233} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 417928530} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.017942, y: 1.0884, z: 1.0884} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2079155521} + m_Father: {fileID: 1069840691} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2, y: 2.3151} - m_SizeDelta: {x: 0, y: 75} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &407969235 + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &417928532 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 407969233} + m_GameObject: {fileID: 417928530} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2581,10 +2583,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Shortcuts - - -' + m_text: Load Map 3 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2611,8 +2610,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2647,19 +2646,19 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 74.63775, z: 1.8633423, w: 82.887924} + 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!222 &407969236 +--- !u!222 &417928533 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 407969233} + m_GameObject: {fileID: 417928530} m_CullTransparentMesh: 1 --- !u!1 &419504669 GameObject: @@ -3025,6 +3024,75 @@ MonoBehaviour: m_Spacing: {x: 20, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!1 &490645480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 490645483} + - component: {fileID: 490645482} + - component: {fileID: 490645481} + m_Layer: 0 + m_Name: Chair(Clone) + m_TagString: PlaceableObject + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &490645481 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 490645480} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.7624668, y: 1.576294, z: 0.9864531} + m_Center: {x: -0.11876659, y: 0.68904006, z: -0.17210427} +--- !u!114 &490645482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 490645480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71aca92abab00420dbe0b9f30de6f682, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabName: Chair +--- !u!4 &490645483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 490645480} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.309937, y: 10.742942, z: 10.760001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1775526008} + - {fileID: 78208934} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &510498846 GameObject: m_ObjectHideFlags: 0 @@ -3170,75 +3238,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 510498846} m_CullTransparentMesh: 1 ---- !u!1 &490645480 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 490645483} - - component: {fileID: 490645482} - - component: {fileID: 490645481} - m_Layer: 0 - m_Name: Chair(Clone) - m_TagString: PlaceableObject - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &490645481 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490645480} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.7624668, y: 1.576294, z: 0.9864531} - m_Center: {x: -0.11876659, y: 0.68904006, z: -0.17210427} ---- !u!114 &490645482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490645480} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 71aca92abab00420dbe0b9f30de6f682, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabName: Chair ---- !u!4 &490645483 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490645480} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.309937, y: 10.742942, z: 10.760001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1775526008} - - {fileID: 78208934} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &518478020 GameObject: m_ObjectHideFlags: 0 @@ -3657,17 +3656,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3c323e21067c4eb4bb47d695799638a2, type: 3} m_Name: m_EditorClassIdentifier: - itemDatabase: {fileID: 11400000, guid: 7d7ec2253a1c87e40b009dc005b0c2cb, type: 2} - iconGenerator: {fileID: 171183488} - categoryButtonContainer: {fileID: 0} - itemButtonContainer: {fileID: 0} - categoryButtonPrefab: {fileID: 0} - itemButtonPrefab: {fileID: 0} - backButton: {fileID: 0} - selectedItemPanel: {fileID: 0} - selectedItemIcon: {fileID: 0} - selectedItemName: {fileID: 0} - selectedItemDescription: {fileID: 0} --- !u!114 &537071961 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3791,7 +3779,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 10} + m_SizeDelta: {x: 620, y: 10} m_Pivot: {x: 0, y: 1} --- !u!114 &548777308 MonoBehaviour: @@ -5772,7 +5760,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4802286096989366845, guid: dafa8e56cf5d98141a7847d25ea6b0b8, type: 3} propertyPath: m_AnchoredPosition.x - value: 430 + value: 550 objectReference: {fileID: 0} - target: {fileID: 4802286096989366845, guid: dafa8e56cf5d98141a7847d25ea6b0b8, type: 3} propertyPath: m_AnchoredPosition.y @@ -8985,7 +8973,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 423550595} m_HandleRect: {fileID: 423550594} m_Direction: 0 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -12932,9 +12920,10 @@ MonoBehaviour: m_GameObject: {fileID: 1533565296} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c30fc5b7a89170a47a899247a3452852, type: 3} + m_Script: {fileID: 11500000, guid: 72792a72afa5c114a8dac0da2fd222d1, type: 3} m_Name: m_EditorClassIdentifier: + deleteTool: {fileID: 528991530} --- !u!4 &1533565298 Transform: m_ObjectHideFlags: 0 @@ -18214,106 +18203,6 @@ MonoBehaviour: m_EditorClassIdentifier: dragRectTransform: {fileID: 2033930212} canvas: {fileID: 1884948396} ---- !u!1 &2065774646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2065774647} - - component: {fileID: 2065774649} - - component: {fileID: 2065774648} - - component: {fileID: 2065774650} - m_Layer: 5 - m_Name: SaveLoadPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2065774647 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065774646} - 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: 1056401626} - - {fileID: 242402428} - - {fileID: 1114696822} - - {fileID: 1069840691} - - {fileID: 23647531} - - {fileID: 841131289} - - {fileID: 1054598449} - - {fileID: 1938243193} - - {fileID: 1467667375} - - {fileID: 510498847} - - {fileID: 1554711767} - m_Father: {fileID: 1884948397} - 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: 500, y: 465} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2065774648 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065774646} - 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, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2065774649 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065774646} - m_CullTransparentMesh: 1 ---- !u!114 &2065774650 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065774646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e816c4448cc2ce94e82fe78254c5d6be, type: 3} - m_Name: - m_EditorClassIdentifier: - saveLoadPanel: {fileID: 2065774646} --- !u!1 &2042900932 GameObject: m_ObjectHideFlags: 0 @@ -18468,6 +18357,106 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2042900932} m_CullTransparentMesh: 1 +--- !u!1 &2065774646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2065774647} + - component: {fileID: 2065774649} + - component: {fileID: 2065774648} + - component: {fileID: 2065774650} + m_Layer: 5 + m_Name: SaveLoadPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2065774647 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065774646} + 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: 1056401626} + - {fileID: 242402428} + - {fileID: 1114696822} + - {fileID: 1069840691} + - {fileID: 23647531} + - {fileID: 841131289} + - {fileID: 1054598449} + - {fileID: 1938243193} + - {fileID: 1467667375} + - {fileID: 510498847} + - {fileID: 1554711767} + m_Father: {fileID: 1884948397} + 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: 500, y: 465} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2065774648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065774646} + 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, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2065774649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065774646} + m_CullTransparentMesh: 1 +--- !u!114 &2065774650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2065774646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e816c4448cc2ce94e82fe78254c5d6be, type: 3} + m_Name: + m_EditorClassIdentifier: + saveLoadPanel: {fileID: 2065774646} --- !u!1 &2079155520 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ObjectPlacement/BuildingSystem.cs b/Assets/Scripts/ObjectPlacement/BuildingSystem.cs index e9f5aa1..dc6adac 100644 --- a/Assets/Scripts/ObjectPlacement/BuildingSystem.cs +++ b/Assets/Scripts/ObjectPlacement/BuildingSystem.cs @@ -165,12 +165,19 @@ public void RotateSelected() if (Selected) objectToPlace.Rotate(); } + public void ClearObjectToPlace() + { + objectToPlace = null; + unhighlightButtons(); + } + public void DestroySelected() { if (Selected) { Destroy(objectToPlace.gameObject); Selected = null; + objectToPlace = null; unhighlightButtons(); } } @@ -268,7 +275,7 @@ private void SelectObject() Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit; - if (Physics.Raycast(ray, out hit) && hit.collider != null && hit.collider.gameObject.CompareTag("Selectable")) + if (Physics.Raycast(ray, out hit) && hit.collider != null && hit.collider.gameObject.CompareTag("PlaceableObject")) { Selected = hit.collider.gameObject; objectToPlace = Selected.GetComponent(); diff --git a/Assets/Scripts/ObjectPlacement/ClickToDelete.cs b/Assets/Scripts/ObjectPlacement/ClickToDelete.cs index d931560..0dac467 100644 --- a/Assets/Scripts/ObjectPlacement/ClickToDelete.cs +++ b/Assets/Scripts/ObjectPlacement/ClickToDelete.cs @@ -12,21 +12,25 @@ void Start() } // Update is called once per frame - void Update() + void Update() +{ + if (Input.GetMouseButtonDown(0)) { - if (Input.GetMouseButtonDown(0)) + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit hit; + if (Physics.Raycast(ray, out hit)) { - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - RaycastHit hit; - if (Physics.Raycast(ray, out hit)) + GameObject objectToDelete = hit.collider.gameObject; + if (deleteTool.activeSelf && objectToDelete.tag == "PlaceableObject") { - if (Input.GetMouseButtonDown(0)) + if (BuildingSystem.current.Selected == objectToDelete) { - GameObject objectToDelete = hit.collider.gameObject; - if (deleteTool.activeSelf && objectToDelete.tag == "Selectable") - Destroy(objectToDelete); + BuildingSystem.current.Selected = null; } + Destroy(objectToDelete); + BuildingSystem.current.ClearObjectToPlace(); } } } } +} diff --git a/Assets/Scripts/ObjectPlacement/PlaceableObject.cs b/Assets/Scripts/ObjectPlacement/PlaceableObject.cs index 297b57d..400b125 100644 --- a/Assets/Scripts/ObjectPlacement/PlaceableObject.cs +++ b/Assets/Scripts/ObjectPlacement/PlaceableObject.cs @@ -131,7 +131,7 @@ public void Place() Destroy(drag); Placed = true; - gameObject.tag = "Selectable"; + gameObject.tag = "PlaceableObject"; // Clear the selected object if this object is selected if (BuildingSystem.current.Selected == gameObject) diff --git a/Packages/manifest.json b/Packages/manifest.json index 185b36f..5aca166 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,7 +11,7 @@ "com.unity.render-pipelines.universal": "14.0.11", "com.unity.shadergraph": "14.0.11", "com.unity.textmeshpro": "3.0.7", - "com.unity.timeline": "1.7.6", + "com.unity.timeline": "1.7.7", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.4", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 682601f..9e8b67b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -342,7 +342,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.7.7", "depth": 0, "source": "registry", "dependencies": {