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

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

This commit is contained in:
Lenheart 2025-12-17 19:17:54 +08:00
parent d9aad4d06a a11458d226
commit a1adcb89b4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,12 @@ class ItemFusionC_ItemSlot extends LenheartNewUI_ItemSlot {
HoverFlag = false; HoverFlag = false;
<<<<<<< HEAD
constructor(X, Y, Index) { constructor(X, Y, Index) {
MyIndex = Index; MyIndex = Index;
=======
constructor(X, Y) {
>>>>>>> a11458d226ec41caa22d30b6d76893362389e3e1
LenheartNewUI_ItemSlot.constructor(X, Y); LenheartNewUI_ItemSlot.constructor(X, Y);
} }
@ -81,7 +85,7 @@ class ItemFusionC extends LenheartNewUI_Windows {
// NoWindow = true; // NoWindow = true;
//是否可见 //是否可见
Visible = false; // Visible = false;
Slot = null; Slot = null;
@ -195,7 +199,11 @@ class ItemFusionC extends LenheartNewUI_Windows {
AddChild(ConfirmButton); AddChild(ConfirmButton);
//创建槽 //创建槽
<<<<<<< HEAD
Slot = [ItemFusionC_ItemSlot(58, 68, 0), ItemFusionC_ItemSlot(159, 68, 1), ItemFusionC_ItemSlot(108, 192, 2)]; 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) { foreach(value in Slot) {
AddChild(value); AddChild(value);
} }