Merge branch 'develop' into feature/ui-system-update

# Conflicts: # Assets/PerfectWorld/Scripts/UI/NPCShopUIManager.cs
2026-03-07 14:40:59 +07:00
parent 1e17b4108c 33dc5dc7b3
commit 13eabb99ed
2 changed files with 3 additions and 1 deletions
@@ -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)
@@ -9,6 +9,7 @@ using TMPro;
 using PerfectWorld.Scripts.Shop;
 using BrewMonster;
 using BrewMonster.UI;
+using BrewMonster.Network;
 using static CSNetwork.Common.ExpTypes;
 using ModelRenderer.Scripts.Common;

@@ -458,6 +459,7 @@ public class NPCShopUIManager : AUIDialog
    
    public void CloseShop()
    {
+        EC_Game.GetGameRun().GetUIManager().GetInGameUIMan().EndNPCService();
        CloseDialogue();
        if (npcShopMainPanel != null)
            npcShopMainPanel.SetActive(false);