Merge branch 'main' of http://192.168.200.25:3000/Lenheart/Rindro-Sqr

Base/UI/Lenheart_UI_Class.nut

@@ -1559,9 +1559,7 @@ class LenheartNewUI_ItemSlot extends LenheartNewUI_CommonUi {
         if(NoClick)return;
         if (isInRect) {
             if(ItemObject){
-                ItemObject = null;
-                ItemId = null;
-                ItemCount = null;
+                RemoveItem();
             }
             if (ItemInfoWindow) {
                 L_Sq_CallFunc(0xE6B2B0, "int", FFI_THISCALL, ["int", "int", "int", "char"], 0x1ADE090, 0x113, 0xFFFFFFFF, 0x0);

Project/ItemTool/ItemFusion/ItemFusion.nut

@@ -7,6 +7,7 @@
 
 class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
 
+    MyIndex = null;
     WindowImg = Rindro_Image("interface2/itemtoolwindow/itemfusion/itemfusion.img");
 
     ItemInfo = null;
@@ -14,10 +15,13 @@ class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
     //覆写悬停Flag
     HoverFlag = false;
 
-    //UseFlag
-    UseFlag = true;
 
+<<<<<<< HEAD
+    constructor(X, Y, Index) {
+        MyIndex = Index;
+=======
     constructor(X, Y) {
+>>>>>>> a11458d226ec41caa22d30b6d76893362389e3e1
         LenheartNewUI_ItemSlot.constructor(X, Y);
     }
 
@@ -48,12 +52,6 @@ class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
         } else HoverFlag = false;
     }
 
-    //override
-    function OnMouseProc(Flag, MousePos_X, MousePos_Y) {
-        if (!Visible) return;
-        //调用原生方法
-        LenheartNewUI_CommonUi.OnMouseProc(Flag, MousePos_X, MousePos_Y);
-    }
 
     function DiscardItem(info) {
         if (HoverFlag) {
@@ -67,23 +65,16 @@ class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
         }
     }
 
+    function RemoveItem() {
+        LenheartNewUI_ItemSlot.RemoveItem();
+        ItemInfo = null;
+
+        if (MyIndex != 2) {
+            Parent.Slot[2].ItemInfo = null;
+            Parent.Slot[2].RemoveItem();
+        }
+    }
 
-    // //鼠标右键按下回调
-    // function OnMouseRbDown(MousePos_X, MousePos_Y) {
-    //     if (!UseFlag) return;
-    //     if (sq_IsIntersectRect(MousePos_X, MousePos_Y, 1, 1, X + 9, Y + 10, 24, 24)) {
-    //         Item = null;
-    //         if (Parent.ItemInfoDrawS) {
-    //             L_Sq_CallFunc(0xE6B2B0, "int", FFI_THISCALL, ["int", "int", "int", "char"], 0x1ADE090, 0x113, 0xFFFFFFFF, 0x0);
-    //             Parent.ItemInfoDrawS = null;
-    //             Parent.ResetFocus();
-    //         }
-    //         if (Parent.Slot[2].Item != null) {
-    //             Parent.Msg = 0;
-    //             Parent.Slot[2].Item = null;
-    //         }
-    //     }
-    // }
 }
 
 class ItemFusionC extends LenheartNewUI_Windows {
@@ -208,11 +199,15 @@ 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);
         }
-        Slot[2].UseFlag = false;
+        Slot[2].NoClick = true;
     }
 
     //绘制主界面
@@ -378,6 +373,9 @@ class ItemFusionC extends LenheartNewUI_Windows {
     }
 
     function InitWindow() {
+        foreach (obj in Slot) {
+            obj.RemoveItem();
+        }
         Visible = true;
     }
 }