Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-03-29 10:09:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve robustness (#2019)

Browse Source
This commit is contained in:
Jamis
2025-08-07 23:18:19 +08:00
committed by GitHub
parent 7b3ec7e6c3
commit edb5db238c
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BetterGenshinImpact/GameTask/Common/Job/ClaimBattlePassRewardsTask.cs
View File

@@ -25,13 +25,13 @@ public class ClaimBattlePassRewardsTask
{
private readonly ReturnMainUiTask _returnMainUiTask = new();
private readonly string claimAllLocalizedString;
private readonly string[] claimAllLocalizedStrings;
public ClaimBattlePassRewardsTask()
{
IStringLocalizer<ClaimBattlePassRewardsTask> stringLocalizer = App.GetService<IStringLocalizer<ClaimBattlePassRewardsTask>>() ?? throw new NullReferenceException();
CultureInfo cultureInfo = new CultureInfo(TaskContext.Instance().Config.OtherConfig.GameCultureInfoName);
this.claimAllLocalizedString = stringLocalizer.WithCultureGet(cultureInfo, "一键");
this.claimAllLocalizedStrings = ((string[])["一键", "领取"]).Select(i => stringLocalizer.WithCultureGet(cultureInfo, i)).ToArray();
}
public async Task Start(CancellationToken ct)
@@ -88,8 +88,8 @@ public class ClaimBattlePassRewardsTask
{
using var ra = CaptureToRectArea();
var ocrList = ra.FindMulti(RecognitionObject.Ocr(ra.ToRect().CutRightBottom(0.3, 0.2)));
var wt = ocrList.FirstOrDefault(txt => Regex.IsMatch(txt.Text, this.claimAllLocalizedString));
Debug.WriteLine(this.claimAllLocalizedString);
var wt = ocrList.FirstOrDefault(txt => this.claimAllLocalizedStrings.Any(i => Regex.IsMatch(txt.Text, i)));
Debug.WriteLine(this.claimAllLocalizedStrings);
if (wt != null)
{
wt.Click();

3
BetterGenshinImpact/GameTask/Common/Job/ClaimBattlePassRewardsTask.en.resx
View File

@@ -120,4 +120,7 @@
<data name="一键" xml:space="preserve">
<value>All</value>
</data>
<data name="领取" xml:space="preserve">
<value>Claim</value>
</data>
</root>

3
BetterGenshinImpact/GameTask/Common/Job/ClaimBattlePassRewardsTask.fr.resx
View File

@@ -120,4 +120,7 @@
<data name="一键" xml:space="preserve">
<value>Tout</value>
</data>
<data name="领取" xml:space="preserve">
<value>récupérer</value>
</data>
</root>

3
BetterGenshinImpact/GameTask/Common/Job/ClaimBattlePassRewardsTask.zh-Hans.resx
View File

@@ -120,4 +120,7 @@
<data name="一键" xml:space="preserve">
<value>一键</value>
</data>
<data name="领取" xml:space="preserve">
<value>领取</value>
</data>
</root>

3
BetterGenshinImpact/GameTask/Common/Job/ClaimBattlePassRewardsTask.zh-Hant.resx
View File

@@ -120,4 +120,7 @@
<data name="一键" xml:space="preserve">
<value>一鍵</value>
</data>
<data name="领取" xml:space="preserve">
<value>領取</value>
</data>
</root>