From 3e9ad94bfd7a935fd9a30da4358d7c4af101386f Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Sat, 16 Nov 2024 04:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=9D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prototype/佩佩/Scripts/MemoryProcess.cs | 1 + Assets/Scripts/Clue/ClueSlotBase.cs | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 68a52f0b4..5cfe44582 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -310,6 +310,7 @@ public IEnumerator PlayMemory(bool useYarn=false,string memName="") [YarnCommand("search_memory")] public IEnumerator SearchMemory(PunchTape punchTape, bool isSkipDialogue=false) { + FavoritesManager.Instance.CloseFavorites(); //FavoritesManager.Instance.CloseFavorites(); if(punchTape==null) { diff --git a/Assets/Scripts/Clue/ClueSlotBase.cs b/Assets/Scripts/Clue/ClueSlotBase.cs index 7d330c58c..6c5ff225e 100644 --- a/Assets/Scripts/Clue/ClueSlotBase.cs +++ b/Assets/Scripts/Clue/ClueSlotBase.cs @@ -45,14 +45,9 @@ public void OnDrop(PointerEventData eventData) Clue clue = clueItem.GetClueData(); interaction = clueItem.GetComponent(); - if (clue != null && interaction != null) + if (clue != null && interaction != null&&!isOccupied) { - // // 如果插槽已被占用,先将当前 ClueItem 返回到集合 - if (isOccupied) - { - ReturnClueToCollection(currentClueItem); - currentClueItem = null; // 清除旧的 currentClueItem - } + // 更新当前的 ClueItem currentClueItem = clueItem; isOccupied = true;