From 4ae81174858295d22efb1e4b3d50d9a022fc8408 Mon Sep 17 00:00:00 2001
From: Lenheart <947330670@qq.com>
Date: Thu, 18 Dec 2025 10:23:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A3=85=E5=A4=87=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/CallBack/DrawMain.nut                       |  6 +++++-
 Project/ItemTool/ItemCrossover/ItemCrossover.nut | 10 +++++-----
 Project/ItemTool/ItemFusion/ItemFusion.nut       |  4 ----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Base/CallBack/DrawMain.nut b/Base/CallBack/DrawMain.nut
index fd84599..101e512 100644
--- a/Base/CallBack/DrawMain.nut
+++ b/Base/CallBack/DrawMain.nut
@@ -99,7 +99,11 @@ function L_drawMainCustomUI_All() {
 // MemoryTool.EncodeMemoryData(0x304bdc00+0x1054,7);
 // TTTAAA <- null;
 
-// L_NewWindows("Lenheart", 56, 0x1);
+
+
+// L_NewWindows("Lenheart", 412, 0x1);
+
+
 // L_Sq_CallFunc(0xE6E070, "int", FFI_THISCALL, ["int", "int", "int", "int"], 0x01ADE090, 56, 0, 0);
 // getroottable().Lsnzz <- Clock();
 
diff --git a/Project/ItemTool/ItemCrossover/ItemCrossover.nut b/Project/ItemTool/ItemCrossover/ItemCrossover.nut
index e1b84b3..8b0ec73 100644
--- a/Project/ItemTool/ItemCrossover/ItemCrossover.nut
+++ b/Project/ItemTool/ItemCrossover/ItemCrossover.nut
@@ -288,11 +288,11 @@ class ItemCrossoverC extends LenheartNewUI_Windows {
 }
 
 
-L_Windows_List <- [];
-getroottable().rawdelete("LenheartPluginsInitFlag");
-getroottable().rawdelete("EventList_Obj")
-getroottable().rawdelete("ItemCrossover_Obj");
-getroottable().rawdelete("L_Each_Obj");
+// L_Windows_List <- [];
+// getroottable().rawdelete("LenheartPluginsInitFlag");
+// getroottable().rawdelete("EventList_Obj")
+// getroottable().rawdelete("ItemCrossover_Obj");
+// getroottable().rawdelete("L_Each_Obj");
 
 function Lenheart_ItemCrossover_Fun(obj) {
     local RootTab = getroottable();
diff --git a/Project/ItemTool/ItemFusion/ItemFusion.nut b/Project/ItemTool/ItemFusion/ItemFusion.nut
index ec24e9b..2d47510 100644
--- a/Project/ItemTool/ItemFusion/ItemFusion.nut
+++ b/Project/ItemTool/ItemFusion/ItemFusion.nut
@@ -199,11 +199,7 @@ class ItemFusionC extends LenheartNewUI_Windows {
         AddChild(ConfirmButton);
 
         //创建槽
-<<<<<<< HEAD
         Slot = [ItemFusionC_ItemSlot(58, 68, 0), ItemFusionC_ItemSlot(159, 68, 1), ItemFusionC_ItemSlot(108, 192, 2)];
-=======
-        Slot = [ItemFusionC_ItemSlot(58, 68), ItemFusionC_ItemSlot(159, 68), ItemFusionC_ItemSlot(108, 192)];
->>>>>>> a11458d226ec41caa22d30b6d76893362389e3e1
         foreach(value in Slot) {
             AddChild(value);
         }