From 1fe0753b7fd96c8ad6f134bd77cb51057cde17ae Mon Sep 17 00:00:00 2001
From: Lenheart <947330670@qq.com>
Date: Fri, 2 Jan 2026 19:32:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=AF=81=E6=A2=A6=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=AD=98=E4=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit dfd46dc127a0b57af7b7b4f37e5c18be7ebcdc46)
---
 Base/CallBack/DrawMain.nut              | 40 -----------------------
 Project/HM_CombatRank/HM_CombatRank.nut | 42 ++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/Base/CallBack/DrawMain.nut b/Base/CallBack/DrawMain.nut
index 101e512..c90eb6a 100644
--- a/Base/CallBack/DrawMain.nut
+++ b/Base/CallBack/DrawMain.nut
@@ -148,46 +148,6 @@ function L_drawMainCustomUI_All() {
 
 // L_sq_GoDungeon(1504);
 
-// CargoType <- 0;
-// Sq_GetExeStr_Map[21910] <- function(Index) {
-//     CargoType = 0;
-//     return 21910;
-// }
-// Sq_GetExeStr_Map[21911] <- function(Index) {
-//     CargoType = 1;
-//     return 21911;
-// }
-// Rindro_Haker.LoadHook(0xE67800, ["int", "int"],
-//     function(args) {
-//         //点击了仓库转移物品
-//         if (args[0] == 0x2B) {
-//             if (CargoType == 0) {
-//                 printf("点击个人仓库转移物品");
-//                 local T = {
-//                     op = 21091001,
-//                     type = 0,
-//                 }
-//                 Rindro_BaseToolClass.SendPackEx(T);
-//                 return [0];
-//             }
-//             if (CargoType == 1) {
-//                 printf("点击账号仓库转移物品");
-//                 local T = {
-//                     op = 21091001,
-//                     type = 1,
-//                 }
-//                 Rindro_BaseToolClass.SendPackEx(T);
-//                 return [0];
-//             }
-//         }
-//         return null;
-//     },
-//     function(args) {
-//         // print(666);
-//         // print(format("%02x", args.pop()));
-//         // TTTAni <- args.pop();
-//         return null;
-//     });
 
 
 
diff --git a/Project/HM_CombatRank/HM_CombatRank.nut b/Project/HM_CombatRank/HM_CombatRank.nut
index e7eca6e..327e43a 100644
--- a/Project/HM_CombatRank/HM_CombatRank.nut
+++ b/Project/HM_CombatRank/HM_CombatRank.nut
@@ -696,4 +696,44 @@ class TH_CombatRankC_Item {
             }
         }
     }
-}
\ No newline at end of file
+}
+
+
+CargoType <- 0;
+Sq_GetExeStr_Map[21910] <- function(Index) {
+    CargoType = 0;
+    return 21910;
+}
+Sq_GetExeStr_Map[21911] <- function(Index) {
+    CargoType = 1;
+    return 21911;
+}
+
+Rindro_Haker.LoadHook(0xE67800, ["int", "int"],
+    function(args) {
+        //点击了仓库转移物品
+        if (args[0] == 0x2B) {
+            if (CargoType == 0) {
+                // printf("点击个人仓库转移物品");
+                local T = {
+                    op = 21091001,
+                    type = 0,
+                }
+                Rindro_BaseToolClass.SendPackEx(T);
+                return [0];
+            }
+            if (CargoType == 1) {
+                // printf("点击账号仓库转移物品");
+                local T = {
+                    op = 21091001,
+                    type = 1,
+                }
+                Rindro_BaseToolClass.SendPackEx(T);
+                return [0];
+            }
+        }
+        return null;
+    },
+    function(args) {
+        return null;
+    });
\ No newline at end of file