From e307c989aa38852a04ca30b840d336e9b84f2a8b Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Sun, 1 Sep 2024 19:17:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B7=B2?= =?UTF-8?q?=E7=BB=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI_DisassemblyAssemblyNoticePanel.prefab | 136 +++++++++++++++++- .../Resources/UI/UI_Panel/UI_MenuBar.prefab | 6 +- .../UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs | 3 + .../UI_DisassemblyAssemblyNoticePanel.cs | 3 + .../UI/UI_Panel/UI_ToolAndMaterialPanel.cs | 5 +- 5 files changed, 141 insertions(+), 12 deletions(-) diff --git a/Assets/Resources/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.prefab b/Assets/Resources/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.prefab index c6eb042..b6e595a 100644 --- a/Assets/Resources/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.prefab @@ -23335,8 +23335,8 @@ RectTransform: 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: 20, y: 0} - m_SizeDelta: {x: 10, y: 498} + m_AnchoredPosition: {x: 20, y: 12.85} + m_SizeDelta: {x: 10, y: 472.3} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5092569753790709664 CanvasRenderer: @@ -23419,8 +23419,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 5092569754049507612} m_HandleRect: {fileID: 5092569754049507613} m_Direction: 2 - m_Value: 0.99999726 - m_Size: 0.8483816 + m_Value: 0.9999983 + m_Size: 0.7608177 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -23925,7 +23925,7 @@ RectTransform: m_Father: {fileID: 5092569753551272701} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.151618} + m_AnchorMin: {x: 0, y: 0.23918186} m_AnchorMax: {x: 1, y: 0.9999996} m_AnchoredPosition: {x: -0.000061035156, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -24420,6 +24420,7 @@ RectTransform: - {fileID: 5092569754776004780} - {fileID: 5092569753437325304} - {fileID: 5092569754751786988} + - {fileID: 6564643450308061874} m_Father: {fileID: 5092569753975713875} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -25503,7 +25504,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 44, y: -34} - m_SizeDelta: {x: 956, y: 498} + m_SizeDelta: {x: 956, y: 446.6} m_Pivot: {x: 0, y: 1} --- !u!222 &5092569754740333868 CanvasRenderer: @@ -25608,7 +25609,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -78} - m_SizeDelta: {x: 1050, y: 566} + m_SizeDelta: {x: 1050, y: 480.6} m_Pivot: {x: 0.5, y: 1} --- !u!1 &5092569754765617205 GameObject: @@ -29303,6 +29304,127 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -437} m_SizeDelta: {x: 640, y: 36} m_Pivot: {x: 0, y: 1} +--- !u!1 &5668854416804418898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6564643450308061874} + - component: {fileID: 8396808170902670796} + - component: {fileID: 1778924804981824113} + - component: {fileID: 1512821023043686346} + m_Layer: 5 + m_Name: Button_Define + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6564643450308061874 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5668854416804418898} + 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: 5092569754227765712} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -50, y: 34} + m_SizeDelta: {x: 100, y: 36} + m_Pivot: {x: 1, y: 0} +--- !u!222 &8396808170902670796 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5668854416804418898} + m_CullTransparentMesh: 1 +--- !u!114 &1778924804981824113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5668854416804418898} + 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: c66d378100e736845bffdba29879a107, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1512821023043686346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5668854416804418898} + 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: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 1483ee00845bf5c4da7e48a6bc5a4078, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 1483ee00845bf5c4da7e48a6bc5a4078, type: 3} + 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: 1778924804981824113} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5671890897992754515 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index f21d7c5..8f16440 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -1601,7 +1601,7 @@ RectTransform: m_Children: - {fileID: 1916403605} m_Father: {fileID: 4389028462961679179} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2044,7 +2044,7 @@ RectTransform: m_Children: - {fileID: 63636321} m_Father: {fileID: 4389028462961679179} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2350,8 +2350,8 @@ RectTransform: - {fileID: 1852792902} - {fileID: 1825054918} - {fileID: 36376097680128} - - {fileID: 7360033525132275473} - {fileID: 693336442933373083} + - {fileID: 7360033525132275473} m_Father: {fileID: 6616835143412438853} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index 273add8..844583f 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs @@ -7,6 +7,7 @@ using UnityEngine.UI; public class UI_ToolOrMaterialsOrDeviceItem : BaseItem { + private HashSet validToolNames = new HashSet { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" }; public List itemInfoList; public Button itemCloseBtn; private ItemInfo currentItem; @@ -20,6 +21,8 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem } else { + if (validToolNames.Contains(currentItem.toolName)) + GetControl("iconBtn").GetComponent