From 33dc5dc7b35402ce7c676dabdf282e30cadf909d Mon Sep 17 00:00:00 2001
From: NguyenVanDat <drimdar.game@gmail.com>
Date: Sat, 7 Mar 2026 14:38:50 +0700
Subject: [PATCH] fix bug: can not end service when buy or create item in NPC
 shop

---
 Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs | 2 +-
 Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
index 7f1b78e6df..99d247c385 100644
--- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
+++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgProduce.cs
@@ -565,6 +565,7 @@ namespace BrewMonster
 
         public void CloseProduce()
         {
+            EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().EndNPCService();
             isProducing = false;
             produceRemainCount = 0;
 
@@ -578,7 +579,6 @@ namespace BrewMonster
             ResetItemInfoPanel();
             HideItemInfo();
             currentQuantity = 1;
-            Debug.Log("[DlgProduce] Produce dialog closed");
         }
 
         // Called when production starts (NOTIFY_PRODUCE_START)
diff --git a/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs b/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
index d12ff02f9b..00a7b173ae 100644
--- a/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
+++ b/Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
@@ -8,6 +8,7 @@ using UnityEngine.UI;
 using TMPro;
 using PerfectWorld.Scripts.Shop;
 using BrewMonster;
+using BrewMonster.Network;
 using static CSNetwork.Common.ExpTypes;
 using ModelRenderer.Scripts.Common;
 
@@ -448,6 +449,7 @@ public class NPCShopUIManager : MonoBehaviour
     
     public void CloseShop()
     {
+        EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().EndNPCService();
         if (npcShopMainPanel != null)
             npcShopMainPanel.SetActive(false);