diff --git a/BetterGenshinImpact/Assets/Model/Fish/bgi_fish.onnx b/BetterGenshinImpact/Assets/Model/Fish/bgi_fish.onnx index 14a517a2..cd170cdd 100644 Binary files a/BetterGenshinImpact/Assets/Model/Fish/bgi_fish.onnx and b/BetterGenshinImpact/Assets/Model/Fish/bgi_fish.onnx differ diff --git a/BetterGenshinImpact/GameTask/AutoFishing/Model/BigFishType.cs b/BetterGenshinImpact/GameTask/AutoFishing/Model/BigFishType.cs index 98ff1469..09697b7b 100644 --- a/BetterGenshinImpact/GameTask/AutoFishing/Model/BigFishType.cs +++ b/BetterGenshinImpact/GameTask/AutoFishing/Model/BigFishType.cs @@ -9,24 +9,26 @@ namespace BetterGenshinImpact.GameTask.AutoFishing.Model; /// public class BigFishType { - public static readonly BigFishType Medaka = new("medaka", "fruit paste bait", "花鳉"); - public static readonly BigFishType LargeMedaka = new("large medaka", "fruit paste bait", "大花鳉"); - public static readonly BigFishType Stickleback = new("stickleback", "redrot bait", "棘鱼"); - 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 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 readonly BigFishType Medaka = new("medaka", "fruit paste bait", "花鳉", 0); + public static readonly BigFishType LargeMedaka = new("large medaka", "fruit paste bait", "大花鳉", 1); + public static readonly BigFishType Stickleback = new("stickleback", "redrot bait", "棘鱼", 2); + public static readonly BigFishType Koi = new("koi", "fake fly bait", "假龙", 3); + public static readonly BigFishType Butterflyfish = new("butterflyfish", "false worm bait", "蝶鱼", 4); + public static readonly BigFishType Pufferfish = new("pufferfish", "fake fly bait", "炮鲀", 5); + + public static readonly BigFishType Ray = new("ray", "fake fly bait", "鳐", 6); + + // public static readonly BigFishType FormaloRay = new("formalo ray", "fake fly bait", "佛玛洛鳐"); + // public static readonly BigFishType DivdaRay = new("divda ray", "fake fly bait", "迪芙妲鳐"); + public static readonly BigFishType Angler = new("angler", "sugardew bait", "角鲀", 8); + public static readonly BigFishType AxeMarlin = new("axe marlin", "sugardew bait", "斧枪鱼", 9); + public static readonly BigFishType HeartfeatherBass = new("heartfeather bass", "sour bait", "心羽鲈", 10); + public static readonly BigFishType MaintenanceMek = new("maintenance mek", "flashing maintenance mek bait", "维护机关", 11); + public static readonly BigFishType Unihornfish = new("unihornfish", "spinelgrain bait", "独角鱼", 11); + public static readonly BigFishType Sunfish = new("sunfish", "spinelgrain bait", "翻车鲀", 8); + public static readonly BigFishType Rapidfish = new("rapidfish", "spinelgrain bait", "斗士急流鱼", 10); + public static readonly BigFishType PhonyUnihornfish = new("phony unihornfish", "emberglow bait", "燃素独角鱼", 11); + public static readonly BigFishType MagmaRapidfish = new("magma rapidfish", "emberglow bait", "炽岩斗士急流鱼", 10); public static IEnumerable Values @@ -40,8 +42,8 @@ public class BigFishType yield return Butterflyfish; yield return Pufferfish; yield return Ray; - yield return FormaloRay; - yield return DivdaRay; + // yield return FormaloRay; + // yield return DivdaRay; yield return Angler; yield return AxeMarlin; yield return HeartfeatherBass; @@ -58,11 +60,14 @@ public class BigFishType public string BaitName { get; private set; } public string ChineseName { get; private set; } - private BigFishType(string name, string baitName, string chineseName) + public int NetIndex { get; private set; } + + private BigFishType(string name, string baitName, string chineseName, int netIndex) { Name = name; BaitName = baitName; ChineseName = chineseName; + NetIndex = netIndex; } public static BigFishType FromName(string name) @@ -80,13 +85,6 @@ public class BigFishType public static int GetIndex(BigFishType e) { - for (int i = 0; i < Values.Count(); i++) - { - if (Values.ElementAt(i).Name == e.Name) - { - return i; - } - } - throw new KeyNotFoundException($"BigFishType {e.Name} not found index"); + return e.NetIndex; } } \ No newline at end of file