diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 714a919e..4c78ec93 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -40,10 +40,11 @@ + - + diff --git a/BetterGenshinImpact/GameTask/AutoFight/Assets/combat_avatar.json b/BetterGenshinImpact/GameTask/AutoFight/Assets/combat_avatar.json index 28278b5f..a59391f7 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/Assets/combat_avatar.json +++ b/BetterGenshinImpact/GameTask/AutoFight/Assets/combat_avatar.json @@ -47,6 +47,26 @@ "nameEn": "PlayerBoy", "weapon": "1" }, + { + "alias": [ + "奇偶(男)", + "MannequinBoy" + ], + "id": "20000001", + "name": "奇偶(男)", + "nameEn": "MannequinBoy", + "weapon": "1" + }, + { + "alias": [ + "奇偶(女)", + "MannequinGirl" + ], + "id": "20000002", + "name": "奇偶(女)", + "nameEn": "MannequinGirl", + "weapon": "1" + }, { "alias": [ "神里绫华", @@ -1949,5 +1969,17 @@ "nameEn": "Aino", "skillCD": 10, "weapon": "11" + }, + { + "alias": [ + "奈芙尔", + "Nefer" + ], + "burstCD": 15, + "id": "10000122", + "name": "奈芙尔", + "nameEn": "Nefer", + "skillCD": 9, + "weapon": "10" } ] \ No newline at end of file diff --git a/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyGen.cs b/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyGen.cs index 4979419a..d21cf292 100644 --- a/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyGen.cs +++ b/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyGen.cs @@ -7,7 +7,7 @@ namespace BetterGenshinImpact.Test.Dataset; public class AvatarClassifyGen { // 基础图像文件夹 - private const string BaseDir = @"E:\HuiTask\更好的原神\侧面头像\源数据\AvatarIcon"; + private const string BaseDir = @"E:\HuiTask\更好的原神\侧面头像\side_src"; // 产出文件夹 private const string OutputDir = @"E:\HuiTask\更好的原神\侧面头像\dateset"; @@ -17,19 +17,19 @@ public class AvatarClassifyGen private static readonly Random Rd = new Random(); - public static readonly List ImgNames = ["UI_AvatarIcon_Side_Aino.png","UI_AvatarIcon_Side_Flins.png", "UI_AvatarIcon_Side_Nefer.png", "UI_AvatarIcon_Side_Nefer.png", "UI_AvatarIcon_Side_Lauma.png"]; + // public static readonly List ImgNames = ["UI_AvatarIcon_Side_Aino.png","UI_AvatarIcon_Side_Flins.png", "UI_AvatarIcon_Side_Nefer.png", "UI_AvatarIcon_Side_Nefer.png", "UI_AvatarIcon_Side_Lauma.png"]; public static void GenAll() { // 读取基础图像 - // List sideImageFiles = Directory.GetFiles(Path.Combine(BaseDir, "side_src"), "*.png", SearchOption.TopDirectoryOnly).ToList(); + List sideImageFiles = Directory.GetFiles(BaseDir, "*.png", SearchOption.TopDirectoryOnly).ToList(); // 只用一个图像 - List sideImageFiles = []; - - foreach (string imgName in ImgNames) - { - sideImageFiles.Add(Path.Combine(BaseDir, imgName)); - } + // List sideImageFiles = []; + // + // foreach (string imgName in ImgNames) + // { + // sideImageFiles.Add(Path.Combine(BaseDir, imgName)); + // } // 生成训练集 GenTo(sideImageFiles, Path.Combine(OutputDir, @"dateset\train"), 200); // 生成测试集 diff --git a/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyTransparentGen.cs b/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyTransparentGen.cs index e011b517..9c84af91 100644 --- a/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyTransparentGen.cs +++ b/Test/BetterGenshinImpact.Test/Dataset/AvatarClassifyTransparentGen.cs @@ -7,7 +7,7 @@ namespace BetterGenshinImpact.Test.Dataset; public class AvatarClassifyTransparentGen { // 基础图像文件夹 - private const string BaseDir = @"E:\HuiTask\更好的原神\侧面头像\源数据\AvatarIcon"; + private const string BaseDir = @"E:\HuiTask\更好的原神\侧面头像\side_src"; // 产出文件夹 private const string OutputDir = @"E:\HuiTask\更好的原神\侧面头像\dateset"; @@ -22,12 +22,16 @@ public class AvatarClassifyTransparentGen public static void GenAll() { - List sideImageFiles = []; - List imgNames = AvatarClassifyGen.ImgNames; - foreach (string imgName in imgNames) - { - sideImageFiles.Add(Path.Combine(BaseDir, imgName)); - } + // List sideImageFiles = []; + // List imgNames = AvatarClassifyGen.ImgNames; + // foreach (string imgName in imgNames) + // { + // sideImageFiles.Add(Path.Combine(BaseDir, imgName)); + // } + + // 度文件夹下所有 + List sideImageFiles = Directory.GetFiles(BaseDir, "*.png", SearchOption.TopDirectoryOnly).ToList(); + var newList = AdjustTransparency(sideImageFiles, 0.5f);