music

BetterGenshinImpact/GameTask/AutoMusicGame/AutoAlbumTask.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using BetterGenshinImpact.GameTask.AutoMusicGame.Assets;
 using BetterGenshinImpact.GameTask.Common.BgiVision;
 using BetterGenshinImpact.GameTask.Model.Area;
 using Microsoft.Extensions.Logging;
-using Microsoft.VisualBasic.Logging;
 using static BetterGenshinImpact.GameTask.Common.TaskControl;
 
 namespace BetterGenshinImpact.GameTask.AutoMusicGame;

BetterGenshinImpact/GameTask/AutoMusicGame/AutoMusicGameConfig.cs

@@ -13,5 +13,5 @@ public partial class AutoMusicGameConfig : ObservableObject
 {
     [ObservableProperty] private string _modeName = "";
     
-    public static readonly List<string> MusicModelList = ["仅获取乐曲奖励", "所有乐曲达成【大音天籁】"];
+    public static readonly List<string> MusicModelList = ["获取乐曲奖励", "所有乐曲达成【大音天籁】"];
 }

BetterGenshinImpact/GameTask/AutoWood/AutoWoodTask.cs

@@ -327,7 +327,6 @@ public partial class AutoWoodTask : ISoloTask
                 // 分解 OCR 结果中的多个条目
                 var matches = _parseWoodStatisticsRegex().Matches(ocrResult);
                 var isFound = true;
-                var modifiedResult = "";
                 foreach (Match match in matches)
                 {
                     if (!match.Success)
@@ -337,21 +336,13 @@ public partial class AutoWoodTask : ISoloTask
                     }
                     var materialName = match.Groups[1].Value.Trim();
                     Debug.WriteLine($"第一次获取的木材名称：{materialName}");
-                    if (materialName == "般木" | materialName == "极木" | materialName == "殺木")
-                    {
-                        modifiedResult = ocrResult.Replace(materialName, "椴木");
-                        materialName = "椴木";
-                    }
                     if (!ExistWoods.Contains(materialName))
                     {
                         isFound = false;
                     }
                 }
 
-                if (isFound)
-                {
-                    return !string.IsNullOrEmpty(modifiedResult) ? modifiedResult : ocrResult;
-                }
+                if (isFound) return ocrResult;
             }
 
             // 如果没有找到匹配的结果
@@ -551,4 +542,4 @@ public partial class AutoWoodTask : ISoloTask
             throw new RetryException("未检测进入游戏界面");
         }
     }
-}
+}