From f3ae8542aee4b5de78fc20d9543bb424b315708f Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 10 九月 2025 14:23:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Tip/ItemsConfirmWin.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Main/System/Tip/ItemsConfirmWin.cs b/Main/System/Tip/ItemsConfirmWin.cs
index d05234e..f4b53d0 100644
--- a/Main/System/Tip/ItemsConfirmWin.cs
+++ b/Main/System/Tip/ItemsConfirmWin.cs
@@ -24,8 +24,8 @@
         m_ConfirmBtn.AddListener(ConfirmBtn);
         m_CancleBtn.AddListener( ()=>
         {
-            ConfirmCancel.OnPopConfirmClickEvent?.Invoke(false);
             CloseWindow();
+            ConfirmCancel.OnPopConfirmClickEvent?.Invoke(false);
         });
     }
 
@@ -68,15 +68,15 @@
 
     private void ConfirmBtn()
     {
-        ConfirmCancel.OnPopConfirmClickEvent?.Invoke(true);
         CloseWindow();
+        ConfirmCancel.OnPopConfirmClickEvent?.Invoke(true);
     }
 
 
     void OnRefreshCell(ScrollerDataType type, CellView cell)
     {
         var _cell = cell as ItemsConfirmCell;
-        _cell?.Display(cell.index);
+        _cell?.Display(cell.index, ConfirmCancel.replaceItemName);
     }
 
     void CreateScroller()

--
Gitblit v1.8.0