mirror of
https://github.com/huiyadanli/RevokeMsgPatcher.git
synced 2025-05-25 15:26:08 +08:00
[+] 支持单个特征的多点替换
This commit is contained in:
parent
3f7a5714c0
commit
3cdc1edee3
File diff suppressed because one or more lines are too long
|
@ -17,7 +17,7 @@ namespace RevokeMsgPatcher
|
||||||
{
|
{
|
||||||
Apps = AppConfig(),
|
Apps = AppConfig(),
|
||||||
LatestVersion = "1.3",
|
LatestVersion = "1.3",
|
||||||
PatchVersion = 20220430,
|
PatchVersion = 202204301,
|
||||||
Notice = ""
|
Notice = ""
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -76,8 +76,8 @@ namespace RevokeMsgPatcher
|
||||||
{
|
{
|
||||||
new ReplacePattern
|
new ReplacePattern
|
||||||
{
|
{
|
||||||
Search = ByteUtil.HexStringToByteArray("F0 00 85 C0 74 32 B9 3F 3F 3F 11 8A"),
|
Search = ByteUtil.HexStringToByteArray("00 85 C0 74 32 B9 3F 3F 3F 11 8A"),
|
||||||
Replace = ByteUtil.HexStringToByteArray("F0 00 85 C0 EB 32 B9 3F 3F 3F 11 8A"),
|
Replace = ByteUtil.HexStringToByteArray("00 85 C0 EB 32 B9 3F 3F 3F 11 8A"),
|
||||||
Category = "防撤回"
|
Category = "防撤回"
|
||||||
},
|
},
|
||||||
new ReplacePattern
|
new ReplacePattern
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace RevokeMsgPatcher.Matcher
|
namespace RevokeMsgPatcher.Matcher
|
||||||
{
|
{
|
||||||
|
@ -21,19 +22,22 @@ namespace RevokeMsgPatcher.Matcher
|
||||||
{
|
{
|
||||||
// 所有的匹配点位
|
// 所有的匹配点位
|
||||||
int[] matchIndexs = FuzzyMatcher.MatchAll(fileByteArray, pattern.Search);
|
int[] matchIndexs = FuzzyMatcher.MatchAll(fileByteArray, pattern.Search);
|
||||||
if (matchIndexs.Length == 1)
|
if (matchIndexs.Length >= 1)
|
||||||
{
|
{
|
||||||
matchNum++;
|
for (int i = 0; i < matchIndexs.Length; i++)
|
||||||
// 与要替换的串不一样才需要替换(当前的特征肯定不一样)
|
|
||||||
if (!FuzzyMatcher.IsEqual(fileByteArray, matchIndexs[0], pattern.Replace))
|
|
||||||
{
|
{
|
||||||
changes.Add(new Change(matchIndexs[0], pattern.Replace));
|
matchNum++;
|
||||||
|
// 与要替换的串不一样才需要替换(当前的特征肯定不一样)
|
||||||
|
if (!FuzzyMatcher.IsEqual(fileByteArray, matchIndexs[i], pattern.Replace))
|
||||||
|
{
|
||||||
|
changes.Add(new Change(matchIndexs[i], pattern.Replace));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 匹配数和期望的匹配数不一致时报错(当前一个特征只会出现一次)
|
// 匹配数和期望的匹配数不一致时报错(当前一个特征会出现多次)
|
||||||
if (matchNum != replacePatterns.Count)
|
if (matchNum < replacePatterns.Count)
|
||||||
{
|
{
|
||||||
Tuple<bool, SortedSet<string>> res = IsAllReplaced(fileByteArray, replacePatterns);
|
Tuple<bool, SortedSet<string>> res = IsAllReplaced(fileByteArray, replacePatterns);
|
||||||
if (res.Item1)
|
if (res.Item1)
|
||||||
|
@ -92,15 +96,15 @@ namespace RevokeMsgPatcher.Matcher
|
||||||
SortedSet<string> alreadyReplaced = new SortedSet<string>(); // 已经被替换特征的功能
|
SortedSet<string> alreadyReplaced = new SortedSet<string>(); // 已经被替换特征的功能
|
||||||
foreach (ReplacePattern pattern in replacePatterns)
|
foreach (ReplacePattern pattern in replacePatterns)
|
||||||
{
|
{
|
||||||
// 所有的匹配点位
|
int[] searchMatchIndexs = FuzzyMatcher.MatchAll(fileByteArray, pattern.Search);
|
||||||
int[] matchIndexs = FuzzyMatcher.MatchAll(fileByteArray, pattern.Replace);
|
int[] replaceMatchIndexs = FuzzyMatcher.MatchAll(fileByteArray, pattern.Replace);
|
||||||
if (matchIndexs.Length == 1)
|
// 查找串没有,但是替换串存在,也就是说明这个功能已经完全完成替换
|
||||||
|
if (searchMatchIndexs.Length == 0 && replaceMatchIndexs.Length > 0)
|
||||||
{
|
{
|
||||||
matchNum++;
|
|
||||||
alreadyReplaced.Add(pattern.Category);
|
alreadyReplaced.Add(pattern.Category);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return new Tuple<bool, SortedSet<string>>(matchNum == replacePatterns.Count, alreadyReplaced);
|
return new Tuple<bool, SortedSet<string>>(matchNum >= replacePatterns.Count, alreadyReplaced);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user