负重偏移错误修复

qiuapeng921 · Sep 17, 2023 · ff044d3 · ff044d3
1 parent c4bebbc
commit ff044d3
Show file tree

Hide file tree

Showing 2 changed files with 134 additions and 131 deletions.
diff --git a/game/address.py b/game/address.py
@@ -6,134 +6,134 @@
 GtKbAddr = 0  # 过图Call
 CoolDownKbAddr = 0  # 冷却判断call
 
-RwAddr = 0x14A9F1D48 # 新人物基址
-RwAddr1 = 0x14A9F1D38 # 人物基址
-RwAddr2 = 0x14A0F3390 # 人物基址B
-RWCallAddr = 0x1443B2FA0 # 人物CALL
-JSDjAddr = 0x14A1603E0 # 角色等级
-PFAddr = 0x14A178FD0 # 评分基址
-GGCsAddr = 0x14A9F2A68 # 公告参数
-GGCallAddr = 0x144473DF0 # 公告CALL
-BbJzAddr = 0x14A17A188 # 背包基址
-JSPtrAddr = 0x14A179F30 # 角色指针
-CzDqyAddr = 0x14A13CECC # 城镇大区域
-CzXqyAddr = 0x14A13CED0 # 城镇小区域
-YXZTAddr = 0x149E5FCB0 # 游戏状态
-SNBBAddr = 0x14A17A1E0 # 司南背包
-YrBbAddr = 0x14A17A1D8 # 玉荣背包
-BxrBbAddr = 0x14A17A1D8 # 辟邪玉背包
-SnAddCallAddr = 0x1415DA6B0 # 司南添加CALL
-SnJtRcxAddr = 0x14A12F958 # 司南进图_Rcx
-SnJtCallAddr = 0x1415BEA20 # 司南进图CALL
-SnAddRcxAddr = 0x144BCCAF0 # 取司南添加RCX
-YrlPyAddr = 0x600 # 玉荣力偏移
-JsYrlAddr = 0x4FF0 # 角色玉荣力
-HBCallAddr = 0x13FDC0000 # 汇编CALL
-TranslateMessage = 0x146A6CCC0 # TranslateMessage
-GameTimeGetTime = 0x146A6D0A8 # GameTimeGetTime
-JNCallAddr = 0x143F3F120 # 技能CALL
-JwCallAddr = 0x1441C6410 # 聚物CALL
-JwXyAddr = 0xF8D4 # 聚物校验
-TaskAddr = 0x14A17A270 # 任务基址
-JsCallAddr = 0x14385A010 # 接受CALL
-WcCallAddr = 0x14385A4D0 # 完成CALL
-TjCallAddr = 0x14385A100 # 提交CALL
-TgCallAddr = 0x1436039A0 # 跳过CALL
-AjAddr = 0x14AEE6F40 # 按键基址
-DHAddr = 0x14AA40CC8 # 对话基址
-DHAddrB = 0x14A17AFBC # 对话基址B
-EscDHAddr = 0x14A17B01C # Esc对话基址
-FpAddr = 0x14A1771C4 # 翻牌基址
-FbBhAddr = 0x14A160370 # 副本编号
-SJAddr = 0x20A050 # 时间基址
-FJBHAddr = 0x14A17A170 # 房间编号
-MaxPlAddr = 0x14A9F1C7C # 最大疲劳
-CutPlAddr = 0x14A9F1CEC # 当前疲劳
-QyParamAddr = 0x14AA48D78 # 区域参数
-QyCallAddr = 0x145221D70 # 区域CALL
-QyPyAddr = 0x8DF10 # 区域偏移
-XTuCallAddr = 0x14525F910 # 选图CALL
-JTuCallAddr = 0x14529C880 # 进图CALL
-HChengCallAddr = 0x144FD2670 # 回城CALL
-GtCallAddr = 0x1433A7790 # 过图CALL
-PyCall1Addr = 0x143211ED0 # 漂移CALL
-PyCall2Addr = 0x14537B660 # 漂移CALL2
-BpCallAddr = 0x14379DE30 # 奔跑CALL
-XrNcCallAddr = 0x1443ED1C0 # 写入内存
-BpPyAddr1 = 0x1160 # 奔跑偏移_1
-BpPyAddr2 = 0x1148 # 奔跑偏移_2
-CzSyRdxAddr = 0x14A14E6C8 # 城镇瞬移_Rdx
-CzSyCallAddr = 0x145265210 # 城镇瞬移CALL
-XzJsCallAddr = 0x141533FD0 # 选择角色CALL
-FhJsCallAddr = 0x143C526F0 # 返回角色CALL
-LqCallJudgeAddr = 0x14439F990 # 冷却判断CALL
-CdResetCallAddr = 0x144215B00 # CD重置CALL
-FjCallAddr = 0x14401B280 # 分解CALL
-ZlCallAddr = 0x144011280 # 整理CALL
-DqFzAddr = 0x14AA42388 # 当前负重
-ZdFzAddr = 0x2A50 # 最大负重
-FbAddr = 0x14AA49850 # 发包基址
-HcCallAddr = 0x1452C69E0 # 缓冲CALL
-FbCallAddr = 0x1452C75E0 # 发包CALL
-JmB1CallAddr = 0x1452C7730 # 加密包CALL
-JmB2CallAddr = 0x1452C7A70 # 加密包CALL2
-JmB3CallAddr = 0x1452C7750 # 加密包CALL4
-JmB4CallAddr = 0x1452C7770 # 加密包CALL8
-SqNcCallAddr = 0x1431E6C00 # 申请内存
-BUffMemRcxAddr = 0x14A17A0C8 # BUFF内存_RCX
-BUffMemCallAddr = 0x1452D3E70 # BUFF内存CALL
-DyBuffCall = 0x1443E9860 # 调用BUFFCALL
-TakeEffectCallAddr = 0x144148D30 # 生效Call
-PutOnCallAddr = 0x1441D8FA0 # 穿上CALL
-TmCallAddr = 0x1452DBA80 # 透明CALL
-CreateCallAddr = 0x1444BD6C0 # 创建CALL
-WpYdCallAddr = 0x144007940 # 物品移动CALL
-JnSwAddr = 0x144183814 # 技能三无
-RwMwAddr = 0x11804 # 人物名望
-WpMcAddr = 0x40 # 物品名称
-WpJyLxAddr = 0xA8 # 物品交易类型
-DzIDAddr = 0x3F5C # 动作ID
-DtKs2 = 0x148 # 地图开始2
-DtJs2 = 0x150 # 地图结束2
-DtPyAddr = 0x158 # 地图偏移
-LxPyAddr = 0x12C # 类型偏移
-FxPyAddr = 0x140 # 方向偏移
-CEPfAddr = 0x88 # 评分偏移
-FbSqAddr = 0x134 # 发包拾取
-GwXlAddr = 0x4B68 # 怪物血量
-ZyPyAddr = 0xD40 # 阵营偏移
-DmWpAddr = 0x2770 # 地面物品
-JxWpAddr = 0xF408 # 脚下物品
-DmPyAddr = 0x7C0 # 代码偏移
-McPyAddr = 0x7C8 # 名称偏移
-ZbPjAddr = 0x2B8 # 装备品级
-DtCtAddr = 0x7D0 # 地图穿透
-JzCtAddr = 0x7D4 # 建筑穿透
-DqZbAddr = 0x320 # 读取坐标
-YjRwStartAddr = 0x10 # 已接任务首地址
-YjRwEndAddr = 0x18 # 已接任务尾地址
-QbRwStartAddr = 0xA8 # 全部任务首地址
-QbRwEndAddr = 0xB0 # 全部任务尾地址
-RwLxAddr = 0x218 # 任务类型
-RwDxAddr = 0x28 # 任务大小
-RwTjAddr = 0x4B0 # 任务条件
-RwDjAddr = 0x328 # 任务等级
-RwFbAddr = 0x468 # 任务副本
-SfKmAddr = 0x20C # 是否开门
-CutRoomXAddr = 0x1B38 # 当前房间X
-CutRoomYAddr = 0x1B3C # 当前房间Y
-BOSSRoomXAddr = 0x1C38 # BOSS房间X
-BOSSRoomYAddr = 0x1C3C # BOSS房间Y
-GouHuoAddr = 0x1CC8 # 篝火判断
-SyPyAddr = 0x1C2C # 索引偏移
-MxPyAddr = 0x128 # 门型偏移
-KgPyAddr = 0x7B0 # 宽高偏移
-SzPyAddr = 0x7D0 # 数组偏移
-DtMcAddr = 0x338 # 地图名称
-StPyAddr = 0xC0 # 顺图偏移
-ZbStPyAddr = 0x3328 # 坐标顺图
-FxIdAddr = 0xE0 # 方向ID
-WplAddr = 0xF848 # 物品栏
-WplPyAddr = 0xA8 # 物品栏偏移
-JnlAddr = 0xF7C0 # 技能栏
-JnlPyAddr = 0x90 # 技能栏偏移
+RwAddr = 0x14A9F1D48  # 新人物基址
+RwAddr1 = 0x14A9F1D38  # 人物基址
+RwAddr2 = 0x14A0F3390  # 人物基址B
+RWCallAddr = 0x1443B2FA0  # 人物CALL
+JSDjAddr = 0x14A1603E0  # 角色等级
+PFAddr = 0x14A178FD0  # 评分基址
+GGCsAddr = 0x14A9F2A68  # 公告参数
+GGCallAddr = 0x144473DF0  # 公告CALL
+BbJzAddr = 0x14A17A188  # 背包基址
+JSPtrAddr = 0x14A179F30  # 角色指针
+CzDqyAddr = 0x14A13CECC  # 城镇大区域
+CzXqyAddr = 0x14A13CED0  # 城镇小区域
+YXZTAddr = 0x149E5FCB0  # 游戏状态
+SNBBAddr = 0x14A17A1E0  # 司南背包
+YrBbAddr = 0x14A17A1D8  # 玉荣背包
+BxrBbAddr = 0x14A17A1D8  # 辟邪玉背包
+SnAddCallAddr = 0x1415DA6B0  # 司南添加CALL
+SnJtRcxAddr = 0x14A12F958  # 司南进图_Rcx
+SnJtCallAddr = 0x1415BEA20  # 司南进图CALL
+SnAddRcxAddr = 0x144BCCAF0  # 取司南添加RCX
+YrlPyAddr = 0x600  # 玉荣力偏移
+JsYrlAddr = 0x4FF0  # 角色玉荣力
+HBCallAddr = 0x13FDC0000  # 汇编CALL
+TranslateMessage = 0x146A6CCC0  # TranslateMessage
+GameTimeGetTime = 0x146A6D0A8  # GameTimeGetTime
+JNCallAddr = 0x143F3F120  # 技能CALL
+JwCallAddr = 0x1441C6410  # 聚物CALL
+JwXyAddr = 0xF8D4  # 聚物校验
+TaskAddr = 0x14A17A270  # 任务基址
+JsCallAddr = 0x14385A010  # 接受CALL
+WcCallAddr = 0x14385A4D0  # 完成CALL
+TjCallAddr = 0x14385A100  # 提交CALL
+TgCallAddr = 0x1436039A0  # 跳过CALL
+AjAddr = 0x14AEE6F40  # 按键基址
+DHAddr = 0x14AA40CC8  # 对话基址
+DHAddrB = 0x14A17AFBC  # 对话基址B
+EscDHAddr = 0x14A17B01C  # Esc对话基址
+FpAddr = 0x14A1771C4  # 翻牌基址
+FbBhAddr = 0x14A160370  # 副本编号
+SJAddr = 0x20A050  # 时间基址
+FJBHAddr = 0x14A17A170  # 房间编号
+MaxPlAddr = 0x14A9F1C7C  # 最大疲劳
+CutPlAddr = 0x14A9F1CEC  # 当前疲劳
+QyParamAddr = 0x14AA48D78  # 区域参数
+QyCallAddr = 0x145221D70  # 区域CALL
+QyPyAddr = 0x8DF10  # 区域偏移
+XTuCallAddr = 0x14525F910  # 选图CALL
+JTuCallAddr = 0x14529C880  # 进图CALL
+HChengCallAddr = 0x144FD2670  # 回城CALL
+GtCallAddr = 0x1433A7790  # 过图CALL
+PyCall1Addr = 0x143211ED0  # 漂移CALL
+PyCall2Addr = 0x14537B660  # 漂移CALL2
+BpCallAddr = 0x14379DE30  # 奔跑CALL
+XrNcCallAddr = 0x1443ED1C0  # 写入内存
+BpPyAddr1 = 0x1160  # 奔跑偏移_1
+BpPyAddr2 = 0x1148  # 奔跑偏移_2
+CzSyRdxAddr = 0x14A14E6C8  # 城镇瞬移_Rdx
+CzSyCallAddr = 0x145265210  # 城镇瞬移CALL
+XzJsCallAddr = 0x141533FD0  # 选择角色CALL
+FhJsCallAddr = 0x143C526F0  # 返回角色CALL
+LqCallJudgeAddr = 0x14439F990  # 冷却判断CALL
+CdResetCallAddr = 0x144215B00  # CD重置CALL
+FjCallAddr = 0x14401B280  # 分解CALL
+ZlCallAddr = 0x144011280  # 整理CALL
+DqFzAddr = 0x58  # 当前负重
+ZdFzAddr = 0x2A50  # 最大负重
+FbAddr = 0x14AA49850  # 发包基址
+HcCallAddr = 0x1452C69E0  # 缓冲CALL
+FbCallAddr = 0x1452C75E0  # 发包CALL
+JmB1CallAddr = 0x1452C7730  # 加密包CALL
+JmB2CallAddr = 0x1452C7A70  # 加密包CALL2
+JmB3CallAddr = 0x1452C7750  # 加密包CALL4
+JmB4CallAddr = 0x1452C7770  # 加密包CALL8
+SqNcCallAddr = 0x1431E6C00  # 申请内存
+BUffMemRcxAddr = 0x14A17A0C8  # BUFF内存_RCX
+BUffMemCallAddr = 0x1452D3E70  # BUFF内存CALL
+DyBuffCall = 0x1443E9860  # 调用BUFFCALL
+TakeEffectCallAddr = 0x144148D30  # 生效Call
+PutOnCallAddr = 0x1441D8FA0  # 穿上CALL
+TmCallAddr = 0x1452DBA80  # 透明CALL
+CreateCallAddr = 0x1444BD6C0  # 创建CALL
+WpYdCallAddr = 0x144007940  # 物品移动CALL
+JnSwAddr = 0x144183814  # 技能三无
+RwMwAddr = 0x11804  # 人物名望
+WpMcAddr = 0x40  # 物品名称
+WpJyLxAddr = 0xA8  # 物品交易类型
+DzIDAddr = 0x3F5C  # 动作ID
+DtKs2 = 0x148  # 地图开始2
+DtJs2 = 0x150  # 地图结束2
+DtPyAddr = 0x158  # 地图偏移
+LxPyAddr = 0x12C  # 类型偏移
+FxPyAddr = 0x140  # 方向偏移
+CEPfAddr = 0x88  # 评分偏移
+FbSqAddr = 0x134  # 发包拾取
+GwXlAddr = 0x4B68  # 怪物血量
+ZyPyAddr = 0xD40  # 阵营偏移
+DmWpAddr = 0x2770  # 地面物品
+JxWpAddr = 0xF408  # 脚下物品
+DmPyAddr = 0x7C0  # 代码偏移
+McPyAddr = 0x7C8  # 名称偏移
+ZbPjAddr = 0x2B8  # 装备品级
+DtCtAddr = 0x7D0  # 地图穿透
+JzCtAddr = 0x7D4  # 建筑穿透
+DqZbAddr = 0x320  # 读取坐标
+YjRwStartAddr = 0x10  # 已接任务首地址
+YjRwEndAddr = 0x18  # 已接任务尾地址
+QbRwStartAddr = 0xA8  # 全部任务首地址
+QbRwEndAddr = 0xB0  # 全部任务尾地址
+RwLxAddr = 0x218  # 任务类型
+RwDxAddr = 0x28  # 任务大小
+RwTjAddr = 0x4B0  # 任务条件
+RwDjAddr = 0x328  # 任务等级
+RwFbAddr = 0x468  # 任务副本
+SfKmAddr = 0x20C  # 是否开门
+CutRoomXAddr = 0x1B38  # 当前房间X
+CutRoomYAddr = 0x1B3C  # 当前房间Y
+BOSSRoomXAddr = 0x1C38  # BOSS房间X
+BOSSRoomYAddr = 0x1C3C  # BOSS房间Y
+GouHuoAddr = 0x1CC8  # 篝火判断
+SyPyAddr = 0x1C2C  # 索引偏移
+MxPyAddr = 0x128  # 门型偏移
+KgPyAddr = 0x7B0  # 宽高偏移
+SzPyAddr = 0x7D0  # 数组偏移
+DtMcAddr = 0x338  # 地图名称
+StPyAddr = 0xC0  # 顺图偏移
+ZbStPyAddr = 0x3328  # 坐标顺图
+FxIdAddr = 0xE0  # 方向ID
+WplAddr = 0xF848  # 物品栏
+WplPyAddr = 0xA8  # 物品栏偏移
+JnlAddr = 0xF7C0  # 技能栏
+JnlPyAddr = 0x90  # 技能栏偏移
diff --git a/game/other.py b/game/other.py
@@ -59,6 +59,9 @@ def handle_equip(self):
         if handle_type == 0:
             return
 
+        if self.map_data.back_pack_weight() < 60:
+            return
+
         self.pack.tidy_backpack(1, 0)
         num = 0
         mem = self.mem