From 2e699b6143500b3f62b71eda9290ccbaa4a37065 Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Thu, 22 May 2025 16:13:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab | 4 ++-- .../Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs | 8 +++++++- Assets/Scripts/RawImageScript.cs | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab index 4b34f78..457b727 100644 --- a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab @@ -6149,8 +6149,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rawImage: {fileID: 0} - ToptextMeshProUGUI: {fileID: 7422747128085603084} - ContentTextMeshProUGUI: {fileID: 3961857557312585488} + ToptextMeshProUGUI: {fileID: 3537614223452388336} + ContentTextMeshProUGUI: {fileID: 7313303096279430194} --- !u!1 &3236435773730427489 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs b/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs index a0453b6..a810af7 100644 --- a/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs +++ b/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs @@ -51,8 +51,14 @@ public class NPC_Attach10002_2002 : NPC_Attach_Base //与客户沟通 GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { - panel.Init(custom.triggerName, "拿取工具。", "客户", 0, (intTemp) => + panel.Init(custom.triggerName, "拿取工具。", "指导老师", 0, (intTemp) => { + List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "剥线钳", "绝缘螺丝刀" }); + items2.ForEach(item => + { + PacksackBagMgr.Instance.AddOneToolOrMater(item); + }); + ProcessManager.Instance.IsRightSubProcessStepsTriggerID(custom.triggerName, true); custom.StopAnimator(); customIndex++; diff --git a/Assets/Scripts/RawImageScript.cs b/Assets/Scripts/RawImageScript.cs index 3610aba..794f569 100644 --- a/Assets/Scripts/RawImageScript.cs +++ b/Assets/Scripts/RawImageScript.cs @@ -33,14 +33,14 @@ public class RawImageScript : MonoBehaviour, IPointerEnterHandler, IPointerExitH Camera renderCamera = null; int layerMask = 0; - if (hoveredObject.name == "正常高粱") + if (hoveredObject.name == "正常高粱RawImage") { Debug.Log("我进正常高粱了"); renderCamera = GameObject.Find("Camera_Normal").GetComponent(); layerMask = 1 << LayerMask.NameToLayer("Split_Normal"); // 步骤3:生成射线 } - else if (hoveredObject.name == "病株") + else if (hoveredObject.name == "病株RawImage") { Debug.Log("我进病株了"); renderCamera = GameObject.Find("Camera_Disease").GetComponent();