diff --git a/VPet.ModMaker/Models/ModLoader.cs b/VPet.ModMaker/Models/ModLoader.cs index 2525c94..92a1a34 100644 --- a/VPet.ModMaker/Models/ModLoader.cs +++ b/VPet.ModMaker/Models/ModLoader.cs @@ -1,6 +1,7 @@ using LinePutScript; using LinePutScript.Converter; using LinePutScript.Dictionary; +using LinePutScript.Localization.WPF; using System; using System.Collections.Generic; using System.IO; @@ -213,30 +214,23 @@ public class ModLoader case "lang": Tag.Add("lang"); langDirectory = di; - //foreach (FileInfo fi in di.EnumerateFiles("*.lps")) - //{ - // //LocalizeCore.AddCulture( - // // fi.Id.Substring(0, fi.Id.Length - fi.Extension.Length), - // // new LPS_D(File.ReadAllText(fi.FullName)) - // //); - //} - //foreach (DirectoryInfo dis in di.EnumerateDirectories()) - //{ - // foreach (FileInfo fi in dis.EnumerateFiles("*.lps")) - // { - // //LocalizeCore.AddCulture( - // // dis.Id, - // // new LPS_D(File.ReadAllText(fi.FullName)) - // //); - // } - //} - - //if (mw.Set.Language == "null") - //{ - // LocalizeCore.LoadDefaultCulture(); - //} - //else - // LocalizeCore.LoadCulture(mw.Set.Language); + foreach (FileInfo fi in di.EnumerateFiles("*.lps")) + { + LocalizeCore.AddCulture( + Path.GetFileNameWithoutExtension(fi.Name), + new LPS_D(File.ReadAllText(fi.FullName)) + ); + } + foreach (DirectoryInfo dis in di.EnumerateDirectories()) + { + foreach (FileInfo fi in dis.EnumerateFiles("*.lps")) + { + LocalizeCore.AddCulture( + dis.Name, + new LPS_D(File.ReadAllText(fi.FullName)) + ); + } + } break; } } diff --git a/VPet.ModMaker/Models/ModMaker.cs b/VPet.ModMaker/Models/ModMaker.cs index e34639d..d56fe87 100644 --- a/VPet.ModMaker/Models/ModMaker.cs +++ b/VPet.ModMaker/Models/ModMaker.cs @@ -50,7 +50,7 @@ public class ModMaker : MainPlugin ModMakerInfo.GameVersion = MW.version; // 载入本体宠物 foreach (var pet in MW.Pets) - ModMakerInfo.MainPets.Add(pet.Name, new(pet, true)); + ModMakerInfo.MainPets.TryAdd(pet.Name, new(pet, true)); //Maker.ModMaker = this; Maker.Show(); Maker.Closed += Maker_Closed; diff --git a/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml index 2991333..ae947ee 100644 --- a/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml +++ b/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml @@ -168,7 +168,7 @@