diff --git a/MyProject/分级机重写逻辑.nut b/MyProject/分级机重写逻辑.nut index c66899a..1bb9fb8 100644 --- a/MyProject/分级机重写逻辑.nut +++ b/MyProject/分级机重写逻辑.nut @@ -86,8 +86,10 @@ function HandleDisjointRequest(MyUser, EquStol, Inventype, HeadId, ObjUser, Chan needslot.writeInt(0); //初始化装备数据 - Sq_CallFunc(S_Ptr("0x80CB854"), "pointer", ["pointer"], equdata.C_Object); - Sq_CallFunc(S_Ptr("0x81F8BA1"), "int", ["pointer", "int", "int", "pointer", "pointer", "pointer", "int"], MyUser.C_Object, EquStol, InvenTypeFromItemSpace, equdata.C_Object, needslot.C_Object, ObjUser.C_Object, ChannelIdentification); + Sq_CallFunc(S_Ptr("0x80CB854"), "void", ["pointer"], equdata.C_Object); + + print("MyUser.C_Object: " + MyUser.C_Object + "EquStol: " + EquStol + "InvenTypeFromItemSpace: " + InvenTypeFromItemSpace + "equdata.C_Object: " + equdata.C_Object + "needslot.C_Object: " + needslot.C_Object + "ObjUser.C_Object: " + ObjUser.C_Object + "ChannelIdentification: " + ChannelIdentification); + Sq_CallFunc(S_Ptr("0x81F8BA1"), "int", ["pointer", "int", "int", "pointer", "pointer", "pointer", "short"], MyUser.C_Object, EquStol, InvenTypeFromItemSpace, equdata.C_Object, needslot.C_Object, ObjUser.C_Object, ChannelIdentification); local itemid = equdata.add(2).readS32(); //装备代码 local amptype = equdata.add(17).readS8(); //红字类型 diff --git a/_DPS_/_BuiltProject/毁梦定制战力系统/毁梦定制战力系统.nut b/_DPS_/_BuiltProject/毁梦定制战力系统/毁梦定制战力系统.nut index 6a35b04..94cb0a0 100644 --- a/_DPS_/_BuiltProject/毁梦定制战力系统/毁梦定制战力系统.nut +++ b/_DPS_/_BuiltProject/毁梦定制战力系统/毁梦定制战力系统.nut @@ -25,7 +25,7 @@ class DreamDestroyerCustomizedCombatPowerSystemC { local InvenObj = SUser.GetInven(); local Weapon = InvenObj.GetSlot(Inven.INVENTORY_TYPE_BODY, 10); local Upgrade = Weapon.GetUpgrade(); - if (Upgrade >= 15) { + if (Upgrade >= 15 && Upgrade <= 31) { WorldNoti(SUser, -1); } } diff --git a/_DPS_/_Core/New_Hook.nut b/_DPS_/_Core/New_Hook.nut index 0a088f0..21f9b83 100644 --- a/_DPS_/_Core/New_Hook.nut +++ b/_DPS_/_Core/New_Hook.nut @@ -680,7 +680,7 @@ _Hook_Register_Currency_Func_("0x84D6CA4", ["pointer", "pointer", "pointer", "in //分解 Cb_MyDisPatcher_DisJointItem_disjoint_Enter_Func <- {}; Cb_MyDisPatcher_DisJointItem_disjoint_Leave_Func <- {}; -_Hook_Register_Currency_Func_("0x81f92ca", ["pointer", "int", "int", "int", "pointer", "int", "int"], Cb_MyDisPatcher_DisJointItem_disjoint_Enter_Func, Cb_MyDisPatcher_DisJointItem_disjoint_Leave_Func); +_Hook_Register_Currency_Func_("0x81f92ca", ["pointer", "int", "int", "int", "pointer", "int", "short"], Cb_MyDisPatcher_DisJointItem_disjoint_Enter_Func, Cb_MyDisPatcher_DisJointItem_disjoint_Leave_Func); function _Hook_Register_Currency_DelayHook_() {