更新装备融合

Base/UI/Lenheart_UI_Class.nut

@@ -214,7 +214,7 @@ class LenheartNewUI_Windows extends LenheartNewUI_BaseWindow {
         //调用原生方法
         LenheartNewUI_BaseWindow.constructor();
     }
-    
+
 
     //切换到最上层窗口 即得到焦点时
     function ResetFocus() {
@@ -225,7 +225,7 @@ class LenheartNewUI_Windows extends LenheartNewUI_BaseWindow {
         for (local i = L_Windows_List.len() - 1; i >= 0; i--) {
             if (L_Windows_List[i].ObjectId == this.ObjectId) {
                 L_Windows_List.remove(i);
-            }else{
+            } else {
                 L_Windows_List[i].IsFocus = false;
             }
         }
@@ -304,6 +304,8 @@ class LenheartNewUI_Windows extends LenheartNewUI_BaseWindow {
     ItemInfoDrawS = null;
     //绘制道具相信信息
     ItemObject = null;
+    //临时绘制道具地址
+    TemporaryDrawItemAddress = null;
 
     //获取道具信息并生成缓存
     function GetItemInfo(Id) {
@@ -327,7 +329,7 @@ class LenheartNewUI_Windows extends LenheartNewUI_BaseWindow {
         if (sq_IsIntersectRect(IMouse.GetXPos(), IMouse.GetYPos(), 1, 1, X, Y, 24, 24)) {
             //打开道具信息窗口
             if (!ItemInfoDrawS) {
-                ItemInfoDrawS = L_Sq_CallFunc(0xE6E070, "int", FFI_THISCALL, ["int", "int", "int", "int"], L_sq_RA(0x1A5FB20), 275, Rindro_ItemInfoObject[Id], 41);
+                ItemInfoDrawS = L_Sq_CallFunc(0xE6E070, "int", FFI_THISCALL, ["int", "int", "int", "int"], L_sq_RA(0x1A5FB20), 275, TemporaryDrawItemAddress ? TemporaryDrawItemAddress : Rindro_ItemInfoObject[Id], 41);
                 //校准道具信息窗口位置
                 L_Sq_CallFunc(0xF3B3B0, "int", FFI_THISCALL, ["int", "int", "int", "int", "int"], ItemInfoDrawS, IMouse.GetXPos(), IMouse.GetYPos(), 28, 28);
                 //我自己UI打开的道具信息窗口需要把渲染队列改为下层 以显示我打开的道具
@@ -347,11 +349,11 @@ class LenheartNewUI_Windows extends LenheartNewUI_BaseWindow {
         DrawTriptych(X - 1, Y, Width, "interface/lenheartwindowcommon.img", 9);
         if (IsFocus) {
             L_sq_SetDrawImgModel(2, 0);
-            DrawTriptychDetail(X - 1, Y , Width, "interface/lenheartwindowcommon.img", 109, 114, 115);
+            DrawTriptychDetail(X - 1, Y, Width, "interface/lenheartwindowcommon.img", 109, 114, 115);
             L_sq_ReleaseDrawImgModel();
         }
     }
-    
+
     //生成DT
     function GenerateDt() {
         try {

Base/_Tool/Hacker_Class.nut

@@ -7,8 +7,11 @@
 class _Rindro_Hacker {
     HookTable = null;
 
+    HookData = null;
+
     constructor() {
         HookTable = {};
+        HookData = {};
     }
 
     function UnLoadHook(AddressStr) {

Base/_Tool/Hacker_RegApi.nut

@@ -194,8 +194,9 @@ class R_Utils {
 //         return null;
 //     });
 
-// //绘制字符
-// getroottable().DrawCodeCallBackFunc <- {};
+//绘制字符
+getroottable().DrawCodeCallBackFunc <- {};
+getroottable().DrawCodeChangeMap <- {};
 // Rindro_Haker.LoadHook(0x1206BD0, ["int", "int", "int", "pointer", "int", "void"],
 //     function(args) {
 //         // print("nut:" + format("%02x", args[3]));