From 75d4995f31786218e2f14eb646d2f6fd478aac51 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Mon, 10 Apr 2023 16:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E5=80=BC=EF=BC=8C=E5=92=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LoadToSaveTemplate.cs | 31 +++++++++ Log.cs | 5 ++ MHHelper.cs | 6 ++ ModifyQuest.cs | 155 ++++++++++++++++++++++++------------------ Program.cs | 22 +++++- 5 files changed, 150 insertions(+), 69 deletions(-) diff --git a/LoadToSaveTemplate.cs b/LoadToSaveTemplate.cs index 4bfa687..aa373f1 100644 --- a/LoadToSaveTemplate.cs +++ b/LoadToSaveTemplate.cs @@ -34,6 +34,8 @@ namespace MHFQuestToMH2Dos public static Dictionary DictMapAreaData = new Dictionary(); public static Dictionary DictMapIDFileName = new Dictionary(); public static Dictionary DictMapIDFullFileName = new Dictionary(); + public static Dictionary DictGutiName = new Dictionary(); + public static Dictionary DictStarName = new Dictionary(); public static bool LoadMapTemplateAreaData(byte[] src,string FileName,string FullFileName) { byte[] target; @@ -133,6 +135,35 @@ namespace MHFQuestToMH2Dos return true; } + public static bool LoadMaxGuti(byte[] src) + { + try + { + byte[] target = HexHelper.CopyByteArr(src);//加载数据 + + //从前4字节取出指针 定位任务信息位置 + int _QuestInfoPtr = HexHelper.bytesToInt(target, 4, 0x00); + //从前4字节取出指针 定位任务信息位置 + int _QuestContentPtr = HexHelper.bytesToInt(target, 4, _QuestInfoPtr + 36); + int _QuestNametPtr = HexHelper.bytesToInt(target, 4, _QuestContentPtr); + string QuestName = HexHelper.ReadBytesToString(src, _QuestNametPtr); + + //固体值 + int _GuTiValue = HexHelper.bytesToInt(target, 4, 0x48); + DictGutiName[_GuTiValue] = QuestName; + + + //任务星 尝试处理方案 + int _QuestStart = HexHelper.bytesToInt(target, 1, _QuestInfoPtr + ModifyQuest.cQuestInfo_Star_Offset); + DictStarName[_QuestStart] = QuestName; + return true; + } + catch (Exception ex) + { + Console.WriteLine(ex); + return false; + } + } public static Dictionary DictTimeTypeCount = new Dictionary(); public static void GetModeType(byte[] src,string FileName) diff --git a/Log.cs b/Log.cs index e3165d7..cb908c5 100644 --- a/Log.cs +++ b/Log.cs @@ -8,8 +8,10 @@ namespace MHFQuestToMH2Dos { public static class Log { + static bool bShowHex = true; public static void HexInfo(long HexPos,string log, params long[] arr) { + if(!bShowHex) return; log = "0x" + HexPos.ToString("X") + ":" +log; if(arr != null) { @@ -26,6 +28,7 @@ namespace MHFQuestToMH2Dos public static void HexTips(long HexPos, string log, params long[] arr) { + if (!bShowHex) return; ConsoleColor src_color = Console.ForegroundColor; Console.ForegroundColor = ConsoleColor.Yellow; HexInfo(HexPos, log, arr); @@ -34,6 +37,7 @@ namespace MHFQuestToMH2Dos public static void HexWar(long HexPos, string log, params long[] arr) { + if (!bShowHex) return; ConsoleColor src_color = Console.ForegroundColor; Console.ForegroundColor = ConsoleColor.Red; HexInfo(HexPos, log, arr); @@ -42,6 +46,7 @@ namespace MHFQuestToMH2Dos public static void HexColor(ConsoleColor color,long HexPos, string log, params long[] arr) { + if (!bShowHex) return; ConsoleColor src_color = Console.ForegroundColor; Console.ForegroundColor = color; HexInfo(HexPos, log, arr); diff --git a/MHHelper.cs b/MHHelper.cs index 5d624f7..b54344b 100644 --- a/MHHelper.cs +++ b/MHHelper.cs @@ -22,11 +22,17 @@ namespace MHFQuestToMH2Dos public static bool CheckEnd(byte[] data, int Ptr) { + if (Ptr < 0) + return true; + if (data.Length <= Ptr + 1) + return true; return HexHelper.bytesToUInt(data, 2, Ptr) == 0xFFFF; } public static bool CheckEndWith1Byte(byte[] data, int Ptr) { + if (data.Length <= Ptr) + return true; return HexHelper.bytesToUInt(data, 1, Ptr) == 0xFF; } diff --git a/ModifyQuest.cs b/ModifyQuest.cs index 49ad849..09a5d9d 100644 --- a/ModifyQuest.cs +++ b/ModifyQuest.cs @@ -14,7 +14,7 @@ namespace MHFQuestToMH2Dos public const int cMax_ItemID = 0x031D; public const int cMax_FishID = 0x0017; - public const int cMax_GuTi = 0xA; + public const int cMax_GuTi = 0x16; public const int cMax_QuestStar = 8; public const int cModify_QuestID = 0xEA74; @@ -91,13 +91,11 @@ namespace MHFQuestToMH2Dos /// public const int cQuestInfo_Star_Lenght = 2; - /// /// 任务_类型 偏移 /// public const int cQuestInfo_TargetMap_Offset = 32; - /// /// 任务_类型 长度 /// @@ -118,30 +116,39 @@ namespace MHFQuestToMH2Dos if (ModifyFileOffset(target, out byte[] out_ModifyFileOffset)) target = out_ModifyFileOffset; + else { return false; } if (ModifyTextOffset(target, out byte[] out_ModifyTextOffset)) target = out_ModifyTextOffset; + else { return false; } if (ModifyQuestMap(target, out byte[] out_ModifyQuestMap)) target = out_ModifyQuestMap; + else { return false; } if (ModifyQuestBOSS(target, out byte[] out_ModifyQuestBOSS)) target = out_ModifyQuestBOSS; + else { return false; } if (FixMapAreaData(target, out byte[] out_FixMapAreaData)) target = out_FixMapAreaData; + else { return false; } if (ModifyQuestRewardItem(target, out byte[] out_ModifyQuestRewardItem)) target = out_ModifyQuestRewardItem; + else { return false; } if (FixSuppliesItem(target, out byte[] out_FixSuppliesItem)) target = out_FixSuppliesItem; + else { return false; } if (FixItemPoint(target, out byte[] out_FixItemPoint)) target = out_FixItemPoint; + else { return false; } if (FixFishGroupPoint(target, out byte[] out_FixFishGroupPoint)) target = out_FixFishGroupPoint; + else { return false; } return true; } @@ -312,7 +319,15 @@ namespace MHFQuestToMH2Dos temp[i] = target[_QuestNametPtr + i]; string QuestName = HexHelper.ReadBytesToString(temp); + try + { + Log.HexColor(ConsoleColor.Green, _QuestNametPtr, "任务文本:" + QuestName); ; + } + catch(Exception ex) + { + + } Log.HexInfo(cQuestTextAllMsgMoveToStarPos, "清理数据旧位置【任务文本】"); @@ -618,89 +633,97 @@ namespace MHFQuestToMH2Dos _QuestTargetMapID = HexHelper.bytesToInt(target, ModifyQuest.cQuestInfo_TargetMapID_Lenght, _QuestInfoPtr + ModifyQuest.cQuestInfo_TargetMap_Offset); Log.HexColor(ConsoleColor.Green, _QuestInfoPtr + ModifyQuest.cQuestInfo_TargetMap_Offset, "目的地地图,指针->{0} 【" + MHHelper.Get2MapName(_QuestTargetMapID) + "】", _QuestTargetMapID); - //区域数量 - int _AreaCount = MHHelper.GetMapAreaCount(_QuestTargetMapID); - Log.Info(MHHelper.Get2MapName(_QuestTargetMapID) + "的地图数量" + _AreaCount); - MapAreaData srcData2Dos = LoadToSaveTemplate.DictMapAreaData[_QuestTargetMapID]; - #region 换区设置 - - //换区设置指针 - int _CAreaSetTopPtr = HexHelper.bytesToInt(target, 4, 0x1C); - Log.HexInfo(0x1C, "换区设置指针->{0}", _CAreaSetTopPtr); - - //读取换区单个区域游标 - int _CAreaSetTop_CurrPtr = _CAreaSetTopPtr; - - for (int i = 0; i < _AreaCount; i++) + if (LoadToSaveTemplate.DictMapAreaData.ContainsKey(_QuestTargetMapID)) { - int _One_CurrPtr = HexHelper.bytesToInt(target, 4, _CAreaSetTop_CurrPtr); + //区域数量 + int _AreaCount = MHHelper.GetMapAreaCount(_QuestTargetMapID); + Log.Info(MHHelper.Get2MapName(_QuestTargetMapID) + "的地图数量" + _AreaCount); - if (_One_CurrPtr == 0x0) + MapAreaData srcData2Dos = LoadToSaveTemplate.DictMapAreaData[_QuestTargetMapID]; + #region 换区设置 + + //换区设置指针 + int _CAreaSetTopPtr = HexHelper.bytesToInt(target, 4, 0x1C); + Log.HexInfo(0x1C, "换区设置指针->{0}", _CAreaSetTopPtr); + + //读取换区单个区域游标 + int _CAreaSetTop_CurrPtr = _CAreaSetTopPtr; + + for (int i = 0; i < _AreaCount; i++) { - Log.HexInfo(_CAreaSetTop_CurrPtr, "区域设置" + i + "指针为0，跳过"); - break; - } + int _One_CurrPtr = HexHelper.bytesToInt(target, 4, _CAreaSetTop_CurrPtr); - if (srcData2Dos.targetDatas.Length <= i) - { - Log.HexWar(_One_CurrPtr, "第" + i + "区 区域设置,比2Dos区数超限。"); - break; - } - - - int Set_TargetIndex = 0; - while (true) - { - if (MHHelper.CheckEnd(target, _One_CurrPtr) - || - HexHelper.bytesToInt(target, 1, _One_CurrPtr) == 0) + if (_One_CurrPtr == 0x0) { - Log.HexInfo(_One_CurrPtr, "区域设置结束符"); + Log.HexInfo(_CAreaSetTop_CurrPtr, "区域设置" + i + "指针为0，跳过"); break; } - if (srcData2Dos.targetDatas[i].targetData.Count <= Set_TargetIndex) + if (srcData2Dos.targetDatas.Length <= i) { - Log.HexWar(_One_CurrPtr, "第" + i + "区,第" + Set_TargetIndex + "个目标,比2Dos目标数超限。"); + Log.HexWar(_One_CurrPtr, "第" + i + "区 区域设置,比2Dos区数超限。"); break; } - byte[] srcOneData = srcData2Dos.targetDatas[i].targetData[Set_TargetIndex]; - HexHelper.ModifyDataToBytes(target, srcOneData, _One_CurrPtr); - Log.HexTips(_One_CurrPtr, "第" + i + "区，第" + Set_TargetIndex + "个目标，更换为2Dos数据，长度{0}", srcOneData.Length); + int Set_TargetIndex = 0; + while (true) + { + if (MHHelper.CheckEnd(target, _One_CurrPtr) + || + HexHelper.bytesToInt(target, 1, _One_CurrPtr) == 0) + { + Log.HexInfo(_One_CurrPtr, "区域设置结束符"); + break; + } - Set_TargetIndex++; - _One_CurrPtr += 0x34; + if (srcData2Dos.targetDatas[i].targetData.Count <= Set_TargetIndex) + { + Log.HexWar(_One_CurrPtr, "第" + i + "区,第" + Set_TargetIndex + "个目标,比2Dos目标数超限。"); + break; + } + + byte[] srcOneData = srcData2Dos.targetDatas[i].targetData[Set_TargetIndex]; + + HexHelper.ModifyDataToBytes(target, srcOneData, _One_CurrPtr); + Log.HexTips(_One_CurrPtr, "第" + i + "区，第" + Set_TargetIndex + "个目标，更换为2Dos数据，长度{0}", srcOneData.Length); + + Set_TargetIndex++; + _One_CurrPtr += 0x34; + } + + _CAreaSetTop_CurrPtr += 0x4; } + #endregion - _CAreaSetTop_CurrPtr += 0x4; - } - #endregion - - #region 区域映射 - //区域映射指针 - int _CAreaPosTopPtr = HexHelper.bytesToInt(target, 4, 0x20); - Log.HexInfo(0x20, "换区映射指针->{0}", _CAreaPosTopPtr); - //读取单个区域映射游标 - int _CAreaPosTop_CurrPtr = _CAreaPosTopPtr; - for (int i = 0; i < _AreaCount; i++) - { - if (srcData2Dos.targetDatas.Length <= i) + #region 区域映射 + //区域映射指针 + int _CAreaPosTopPtr = HexHelper.bytesToInt(target, 4, 0x20); + Log.HexInfo(0x20, "换区映射指针->{0}", _CAreaPosTopPtr); + //读取单个区域映射游标 + int _CAreaPosTop_CurrPtr = _CAreaPosTopPtr; + for (int i = 0; i < _AreaCount; i++) { - Log.HexWar(_CAreaPosTop_CurrPtr, "第" + i + "区 换区映射,比2Dos区数超限。"); - break; + if (srcData2Dos.targetDatas.Length <= i) + { + Log.HexWar(_CAreaPosTop_CurrPtr, "第" + i + "区 换区映射,比2Dos区数超限。"); + break; + } + byte[] srcOneData = srcData2Dos.areaPosDatas[i]; + + HexHelper.ModifyDataToBytes(target, srcOneData, _CAreaPosTop_CurrPtr); + Log.HexTips(_CAreaPosTop_CurrPtr, "第" + i + "区的区域映射，更换为2Dos数据，读取数据,长度{0}", srcOneData.Length); + _CAreaPosTop_CurrPtr += 0x20; } - byte[] srcOneData = srcData2Dos.areaPosDatas[i]; + #endregion - HexHelper.ModifyDataToBytes(target, srcOneData, _CAreaPosTop_CurrPtr); - Log.HexTips(_CAreaPosTop_CurrPtr, "第" + i + "区的区域映射，更换为2Dos数据，读取数据,长度{0}", srcOneData.Length); - _CAreaPosTop_CurrPtr += 0x20; } - #endregion - + else + { + Log.HexColor(ConsoleColor.Green, _QuestInfoPtr + ModifyQuest.cQuestInfo_TargetMap_Offset, "目的地地图,在源数据之外"); + } } catch (Exception ex) { @@ -889,10 +912,6 @@ namespace MHFQuestToMH2Dos for (int i = 0; i < 90; i++) { - if (i == 44) - { - - } //若遇到结束符或无数据 if (MHHelper.CheckEnd(target, _ItemPoint_CurrPtr) //|| diff --git a/Program.cs b/Program.cs index 148b1ae..ac467b2 100644 --- a/Program.cs +++ b/Program.cs @@ -1,4 +1,5 @@ using System.Text; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace MHFQuestToMH2Dos { @@ -65,8 +66,27 @@ namespace MHFQuestToMH2Dos errcount_temp++; //Console.WriteLine($">>>>>>>>>>>>>>成功失败 第{index_temp}个"); } + + + //LoadToSaveTemplate.LoadMaxGuti(data); + } + //int[] gutikeys = LoadToSaveTemplate.DictGutiName.Keys.ToArray(); + //gutikeys = gutikeys.OrderBy(w => w).ToArray(); + //foreach (var k in gutikeys) + //{ + // Log.HexInfo(k, "任务" + LoadToSaveTemplate.DictGutiName[k] + ",固体值{0}", k); + //} + + //int[] gutikeys = LoadToSaveTemplate.DictStarName.Keys.ToArray(); + //gutikeys = gutikeys.OrderBy(w => w).ToArray(); + //foreach (var k in gutikeys) + //{ + // Log.HexInfo(k, "任务" + LoadToSaveTemplate.DictStarName[k] + ",星{0}", k); + //} + + Console.WriteLine($"-----------原数据读取完毕-----------"); string[] files = FileHelper.GetDirFile(loc + InDir); @@ -103,7 +123,7 @@ namespace MHFQuestToMH2Dos else { errcount++; - Console.WriteLine($">>>>>>>>>>>>>>处理失败 第{index}个: 输出到{files[i]}"); + Console.WriteLine($">>>>>>>>>>>>>>处理失败 第{index}个"); } }