Merge pull request #1045 from FishmanTheMurloc/main

使用行为树对自动钓鱼进行了改写，以利往后的优化

BetterGenshinImpact/BetterGenshinImpact.csproj

@@ -41,6 +41,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
+		<PackageReference Include="BehaviourTree" Version="1.0.73" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />

BetterGenshinImpact/GameTask/AutoFishing/Model/BaitType.cs

@@ -12,6 +12,8 @@ public class BaitType
     public static readonly BaitType SugardewBait = new("sugardew bait", "甘露饵");
     public static readonly BaitType SourBait = new("sour bait", "酸桔饵");
     public static readonly BaitType FlashingMaintenanceMekBait = new("flashing maintenance mek bait", "维护机关频闪诱饵");
+    public static readonly BaitType SpinelgrainBait = new("spinelgrain bait", "澄晶果粒饵");
+    public static readonly BaitType EmberglowBait = new("emberglow bait", "温火饵");
 
     public static IEnumerable<BaitType> Values
     {
@@ -24,6 +26,8 @@ public class BaitType
             yield return SugardewBait;
             yield return SourBait;
             yield return FlashingMaintenanceMekBait;
+            yield return SpinelgrainBait;
+            yield return EmberglowBait;
         }
     }
     public string Name { get; private set; }

BetterGenshinImpact/GameTask/AutoFishing/Model/BigFishType.cs

@@ -15,12 +15,18 @@ public class BigFishType
     public static readonly BigFishType Koi = new("koi", "fake fly bait", "假龙");
     public static readonly BigFishType Butterflyfish = new("butterflyfish", "false worm bait", "蝶鱼");
     public static readonly BigFishType Pufferfish = new("pufferfish", "fake fly bait", "炮鲀");
-    public static readonly BigFishType FormaloRay = new("formalo ray", "fake fly bait", "佛玛洛鳐");
+    public static readonly BigFishType Ray = new("ray", "fake fly bait", "鳐");
+    public static readonly BigFishType FormaloRay = new("formalo ray", "fake fly bait", "佛玛洛鳐");    // todo 等模型更新后去掉两种细分的formalo ray和divda ray，仅保留ray
     public static readonly BigFishType DivdaRay = new("divda ray", "fake fly bait", "迪芙妲鳐");
     public static readonly BigFishType Angler = new("angler", "sugardew bait", "角鲀");
     public static readonly BigFishType AxeMarlin = new("axe marlin", "sugardew bait", "斧枪鱼");
     public static readonly BigFishType HeartfeatherBass = new("heartfeather bass", "sour bait", "心羽鲈");
     public static readonly BigFishType MaintenanceMek = new("maintenance mek", "flashing maintenance mek bait", "维护机关");
+    public static readonly BigFishType Unihornfish = new("unihornfish", "spinelgrain bait", "独角鱼");
+    public static readonly BigFishType Sunfish = new("sunfish", "spinelgrain bait", "翻车鲀");
+    public static readonly BigFishType Rapidfish = new("rapidfish", "spinelgrain bait", "斗士急流鱼");
+    public static readonly BigFishType PhonyUnihornfish = new("phony unihornfish", "emberglow bait", "燃素独角鱼");
+    public static readonly BigFishType MagmaRapidfish = new("magma rapidfish", "emberglow bait", "炽岩斗士急流鱼");
 
 
     public static IEnumerable<BigFishType> Values
@@ -33,12 +39,18 @@ public class BigFishType
             yield return Koi;
             yield return Butterflyfish;
             yield return Pufferfish;
+            yield return Ray;
             yield return FormaloRay;
             yield return DivdaRay;
             yield return Angler;
             yield return AxeMarlin;
             yield return HeartfeatherBass;
             yield return MaintenanceMek;
+            yield return Unihornfish;
+            yield return Sunfish;
+            yield return Rapidfish;
+            yield return PhonyUnihornfish;
+            yield return MagmaRapidfish;
         }
     }