更新装备融合

2025-12-18 10:23:53 +08:00
parent a1adcb89b4
commit 4ae8117485
3 changed files with 10 additions and 10 deletions
--- 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);
        }