Lenheart
/
Rindro-Sqr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lenheart:a1adcb89b4a7ed995bb43fb453935f7582e6bc91
Branches Tags
Lenheart:main
Lenheart:Script1.3
Lenheart:Script1.2
Lenheart:Script1.1
Lenheart:backup
..
compare: Lenheart:a11458d226ec41caa22d30b6d76893362389e3e1
Branches Tags
Lenheart:Script1.3
Lenheart:Script1.2
Lenheart:Script1.1
Lenheart:main
Lenheart:backup

No commits in common. "a1adcb89b4a7ed995bb43fb453935f7582e6bc91" and "a11458d226ec41caa22d30b6d76893362389e3e1" have entirely different histories.
a1adcb89b4 ... a11458d226

2 changed files with 28 additions and 24 deletions
Show Stats Expand all files Collapse all files

4
Base/UI/Lenheart_UI_Class.nut
View File

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

48
Project/ItemTool/ItemFusion/ItemFusion.nut
View File

@ -7,7 +7,6 @@
class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
MyIndex = null;
WindowImg = Rindro_Image("interface2/itemtoolwindow/itemfusion/itemfusion.img");
ItemInfo = null;
@ -15,13 +14,10 @@ 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);
}
@ -52,6 +48,12 @@ 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) {
@ -65,16 +67,23 @@ 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 {
@ -199,15 +208,11 @@ 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].NoClick = true;
Slot[2].UseFlag = false;
}
//绘制主界面
@ -373,9 +378,6 @@ class ItemFusionC extends LenheartNewUI_Windows {
}
function InitWindow() {
foreach (obj in Slot) {
obj.RemoveItem();
}
Visible = true;
}
}