Feat/multi lan (#1364)

* 多语言下拉框挪到其他设置下

* 使用正经的Fixture写法,杜绝并行测试时paddle崩溃的问题

* 适配不同主城的合成台的不同法语名

* 修正语言资源的正则表达式,好久没用了写错了好多;为AutoDomainTask新增的“地脉异常”、“点击任意位置关闭”添加多语言适配
This commit is contained in:
FishmanTheMurloc
2025-03-29 12:54:27 +08:00
committed by GitHub
parent 8240748c95
commit 40cd76fbdc
16 changed files with 131 additions and 71 deletions

View File

@@ -59,6 +59,8 @@ public class AutoDomainTask : ISoloTask
private readonly string challengeCompletedLocalizedString;
private readonly string autoLeavingLocalizedString;
private readonly string skipLocalizedString;
private readonly string leyLineDisorderLocalizedString;
private readonly string clickanywheretocloseLocalizedString;
public AutoDomainTask(AutoDomainParam taskParam)
{
@@ -78,6 +80,8 @@ public class AutoDomainTask : ISoloTask
this.challengeCompletedLocalizedString = stringLocalizer.WithCultureGet(cultureInfo, "挑战达成");
this.autoLeavingLocalizedString = stringLocalizer.WithCultureGet(cultureInfo, "自动退出");
this.skipLocalizedString = stringLocalizer.WithCultureGet(cultureInfo, "跳过");
this.leyLineDisorderLocalizedString = stringLocalizer.WithCultureGet(cultureInfo, "地脉异常");
this.clickanywheretocloseLocalizedString = stringLocalizer.WithCultureGet(cultureInfo, "点击任意位置关闭");
}
public async Task Start(CancellationToken ct)
@@ -382,7 +386,7 @@ public class AutoDomainTask : ISoloTask
// }
var ocrList = ra.FindMulti(RecognitionObject.Ocr(0, ra.Height * 0.2, ra.Width, ra.Height * 0.6));
var done = ocrList.FirstOrDefault(txt => txt.Text.Contains("地脉异常") || txt.Text.Contains("点击任意") || txt.Text.Contains("位置关闭"));
var done = ocrList.FirstOrDefault(t => Regex.IsMatch(t.Text, this.leyLineDisorderLocalizedString) || Regex.IsMatch(t.Text, this.clickanywheretocloseLocalizedString));
if (done != null)
{
await Delay(1000, _ct);