diff --git a/VPet-Simulator.Windows/App.xaml.cs b/VPet-Simulator.Windows/App.xaml.cs index 99815c7..b2a8fce 100644 --- a/VPet-Simulator.Windows/App.xaml.cs +++ b/VPet-Simulator.Windows/App.xaml.cs @@ -23,7 +23,7 @@ namespace VPet_Simulator.Windows var expt = e.Exception.ToString(); if (expt.Contains("value") && expt.Contains("Panuon.WPF.UI.Internal.Utils") && expt.Contains("NaN")) { - MessageBox.Show(expt, "由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD".Translate()); + MessageBox.Show("由于修改游戏数据导致数据溢出,存档可能会出错\n开发者提醒您请不要使用过于超模的MOD".Translate()); } string errstr = "游戏发生错误,可能是".Translate() + (string.IsNullOrWhiteSpace(CoreMOD.NowLoading) ? diff --git a/VPet-Simulator.Windows/Function/CoreMOD.cs b/VPet-Simulator.Windows/Function/CoreMOD.cs index 48f8d47..2627b60 100644 --- a/VPet-Simulator.Windows/Function/CoreMOD.cs +++ b/VPet-Simulator.Windows/Function/CoreMOD.cs @@ -67,188 +67,194 @@ namespace VPet_Simulator.Windows } public CoreMOD(DirectoryInfo directory, MainWindow mw) { - Path = directory; - LpsDocument modlps = new LpsDocument(File.ReadAllText(directory.FullName + @"\info.lps")); - Name = modlps.FindLine("vupmod").Info; - NowLoading = Name; - Intro = modlps.FindLine("intro").Info; - GameVer = modlps.FindSub("gamever").InfoToInt; - Ver = modlps.FindSub("ver").InfoToInt; - Author = modlps.FindSub("author").Info.Split('[').First(); - if (modlps.FindLine("authorid") != null) - AuthorID = modlps.FindLine("authorid").InfoToInt64; - else - AuthorID = 0; - if (modlps.FindLine("itemid") != null) - ItemID = Convert.ToUInt64(modlps.FindLine("itemid").info); - else - ItemID = 0; - CacheDate = modlps.GetDateTime("cachedate", DateTime.MinValue); - - //MOD未加载时支持翻译 - foreach (var line in modlps.FindAllLine("lang")) + try { - List ls = new List(); - foreach (var sub in line) + Path = directory; + LpsDocument modlps = new LpsDocument(File.ReadAllText(directory.FullName + @"\info.lps")); + Name = modlps.FindLine("vupmod").Info; + NowLoading = Name; + Intro = modlps.FindLine("intro").Info; + GameVer = modlps.FindSub("gamever").InfoToInt; + Ver = modlps.FindSub("ver").InfoToInt; + Author = modlps.FindSub("author").Info.Split('[').First(); + if (modlps.FindLine("authorid") != null) + AuthorID = modlps.FindLine("authorid").InfoToInt64; + else + AuthorID = 0; + if (modlps.FindLine("itemid") != null) + ItemID = Convert.ToUInt64(modlps.FindLine("itemid").info); + else + ItemID = 0; + CacheDate = modlps.GetDateTime("cachedate", DateTime.MinValue); + + //MOD未加载时支持翻译 + foreach (var line in modlps.FindAllLine("lang")) { - ls.Add(new Line(sub.Name, sub.info)); + List ls = new List(); + foreach (var sub in line) + { + ls.Add(new Line(sub.Name, sub.info)); + } + LocalizeCore.AddCulture(line.info, ls); } - LocalizeCore.AddCulture(line.info, ls); - } - if (!IsOnMOD(mw)) - { - Tag.Add("该模组已停用"); - return; - } - - foreach (DirectoryInfo di in Path.EnumerateDirectories()) - { - switch (di.Name.ToLower()) + if (!IsOnMOD(mw)) { - case "pet": - //宠物模型 - Tag.Add("pet"); - foreach (FileInfo fi in di.EnumerateFiles("*.lps")) - { - LpsDocument lps = new LpsDocument(File.ReadAllText(fi.FullName)); - if (lps.First().Name.ToLower() == "pet") - { - var name = lps.First().Info; - var p = mw.Pets.FirstOrDefault(x => x.Name == name); - if (p == null) - mw.Pets.Add(new PetLoader(lps, di)); - else - { - p.path.Add(di.FullName + "\\" + lps.First()["path"].Info); - p.Config.Set(lps); - } - } - } - break; - case "food": - Tag.Add("food"); - foreach (FileInfo fi in di.EnumerateFiles("*.lps")) - { - var tmp = new LpsDocument(File.ReadAllText(fi.FullName)); - foreach (ILine li in tmp) - { - string tmps = li.Find("name").info; - mw.Foods.RemoveAll(x => x.Name == tmps); - mw.Foods.Add(LPSConvert.DeserializeObject(li)); - } - } - break; - case "image": - Tag.Add("image"); - LoadImage(mw, di); - break; - case "text": - Tag.Add("text"); - foreach (FileInfo fi in di.EnumerateFiles("*.lps")) - { - var tmp = new LpsDocument(File.ReadAllText(fi.FullName)); - foreach (ILine li in tmp) - { - switch (li.Name.ToLower()) - { - case "lowfoodtext": - mw.LowFoodText.Add(LPSConvert.DeserializeObject(li)); - break; - case "lowdrinktext": - mw.LowDrinkText.Add(LPSConvert.DeserializeObject(li)); - break; - case "clicktext": - mw.ClickTexts.Add(LPSConvert.DeserializeObject(li)); - break; - } - } - } - break; - case "lang": - Tag.Add("lang"); - foreach (FileInfo fi in di.EnumerateFiles("*.lps")) - { - LocalizeCore.AddCulture(fi.Name.Substring(0, fi.Name.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.Name, new LPS_D(File.ReadAllText(fi.FullName))); - } - } - - if (mw.Set.Language == "null") - { - LocalizeCore.LoadDefaultCulture(); - } - else - LocalizeCore.LoadCulture(mw.Set.Language); - break; - case "plugin": - Tag.Add("plugin"); - SuccessLoad = true; - string authtype = ""; - foreach (FileInfo tmpfi in di.EnumerateFiles("*.dll")) - { - try - { - var path = tmpfi.Name; - if (LoadedDLL.Contains(path)) - continue; - LoadedDLL.Add(path); - Assembly dll = Assembly.LoadFrom(tmpfi.FullName); - var certificate = dll.GetModules()?.First()?.GetSignerCertificate(); - if (certificate != null) - { - if (certificate.Subject == "CN=\"Shenzhen Lingban Computer Technology Co., Ltd.\", O=\"Shenzhen Lingban Computer Technology Co., Ltd.\", L=Shenzhen, S=Guangdong Province, C=CN, SERIALNUMBER=91440300MA5H8REU3K, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.1=Shenzhen, OID.1.3.6.1.4.1.311.60.2.1.2=Guangdong Province, OID.1.3.6.1.4.1.311.60.2.1.3=CN" - && certificate.Issuer == "CN=DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1, O=\"DigiCert, Inc.\", C=US") - {//LBGame 信任的证书 - if (authtype != "FAIL") - authtype = "[认证]".Translate(); - } - else if (certificate.Subject != "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" && !IsPassMOD(mw)) - {//不是通过模组,不加载 - SuccessLoad = false; - continue; - } - else if (authtype != "") - { - authtype = "[签名]".Translate(); - //Intro += $"\nSubject:{certificate.Subject}\nIssuer:{certificate.Subject}"; - } - } - else - { - authtype = "FAIL"; - if (!IsPassMOD(mw)) - {//不是通过模组,不加载 - SuccessLoad = false; - Author = modlps.FindSub("author").Info.Split('[').First(); - continue; - } - } - var v = dll.GetExportedTypes(); - foreach (Type exportedType in v) - { - if (exportedType.BaseType == typeof(MainPlugin)) - { - mw.Plugins.Add((MainPlugin)Activator.CreateInstance(exportedType, mw)); - } - } - } - catch (Exception Exception) - { - SuccessLoad = false; - string errstr = "MOD加载错误,是MOD({0})导致的\n如有可能请发送 错误信息截图和引发错误之前的操作 给开发者:service@exlb.net\n感谢您对游戏开发的支持\n".Translate() + Exception.ToString(); - new winReport(mw, errstr).Show(); - } - } - if (authtype != "FAIL") - Author += authtype; - break; + Tag.Add("该模组已停用"); + return; } + + foreach (DirectoryInfo di in Path.EnumerateDirectories()) + { + switch (di.Name.ToLower()) + { + case "pet": + //宠物模型 + Tag.Add("pet"); + foreach (FileInfo fi in di.EnumerateFiles("*.lps")) + { + LpsDocument lps = new LpsDocument(File.ReadAllText(fi.FullName)); + if (lps.First().Name.ToLower() == "pet") + { + var name = lps.First().Info; + var p = mw.Pets.FirstOrDefault(x => x.Name == name); + if (p == null) + mw.Pets.Add(new PetLoader(lps, di)); + else + { + p.path.Add(di.FullName + "\\" + lps.First()["path"].Info); + p.Config.Set(lps); + } + } + } + break; + case "food": + Tag.Add("food"); + foreach (FileInfo fi in di.EnumerateFiles("*.lps")) + { + var tmp = new LpsDocument(File.ReadAllText(fi.FullName)); + foreach (ILine li in tmp) + { + string tmps = li.Find("name").info; + mw.Foods.RemoveAll(x => x.Name == tmps); + mw.Foods.Add(LPSConvert.DeserializeObject(li)); + } + } + break; + case "image": + Tag.Add("image"); + LoadImage(mw, di); + break; + case "text": + Tag.Add("text"); + foreach (FileInfo fi in di.EnumerateFiles("*.lps")) + { + var tmp = new LpsDocument(File.ReadAllText(fi.FullName)); + foreach (ILine li in tmp) + { + switch (li.Name.ToLower()) + { + case "lowfoodtext": + mw.LowFoodText.Add(LPSConvert.DeserializeObject(li)); + break; + case "lowdrinktext": + mw.LowDrinkText.Add(LPSConvert.DeserializeObject(li)); + break; + case "clicktext": + mw.ClickTexts.Add(LPSConvert.DeserializeObject(li)); + break; + } + } + } + break; + case "lang": + Tag.Add("lang"); + foreach (FileInfo fi in di.EnumerateFiles("*.lps")) + { + LocalizeCore.AddCulture(fi.Name.Substring(0, fi.Name.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.Name, new LPS_D(File.ReadAllText(fi.FullName))); + } + } + + if (mw.Set.Language == "null") + { + LocalizeCore.LoadDefaultCulture(); + } + else + LocalizeCore.LoadCulture(mw.Set.Language); + break; + case "plugin": + Tag.Add("plugin"); + SuccessLoad = true; + string authtype = ""; + foreach (FileInfo tmpfi in di.EnumerateFiles("*.dll")) + { + try + { + var path = tmpfi.Name; + if (LoadedDLL.Contains(path)) + continue; + LoadedDLL.Add(path); + Assembly dll = Assembly.LoadFrom(tmpfi.FullName); + var certificate = dll.GetModules()?.First()?.GetSignerCertificate(); + if (certificate != null) + { + if (certificate.Subject == "CN=\"Shenzhen Lingban Computer Technology Co., Ltd.\", O=\"Shenzhen Lingban Computer Technology Co., Ltd.\", L=Shenzhen, S=Guangdong Province, C=CN, SERIALNUMBER=91440300MA5H8REU3K, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.1=Shenzhen, OID.1.3.6.1.4.1.311.60.2.1.2=Guangdong Province, OID.1.3.6.1.4.1.311.60.2.1.3=CN" + && certificate.Issuer == "CN=DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1, O=\"DigiCert, Inc.\", C=US") + {//LBGame 信任的证书 + if (authtype != "FAIL") + authtype = "[认证]".Translate(); + } + else if (certificate.Subject != "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" && !IsPassMOD(mw)) + {//不是通过模组,不加载 + SuccessLoad = false; + continue; + } + else if (authtype != "") + { + authtype = "[签名]".Translate(); + //Intro += $"\nSubject:{certificate.Subject}\nIssuer:{certificate.Subject}"; + } + } + else + { + authtype = "FAIL"; + if (!IsPassMOD(mw)) + {//不是通过模组,不加载 + SuccessLoad = false; + Author = modlps.FindSub("author").Info.Split('[').First(); + continue; + } + } + var v = dll.GetExportedTypes(); + foreach (Type exportedType in v) + { + if (exportedType.BaseType == typeof(MainPlugin)) + { + mw.Plugins.Add((MainPlugin)Activator.CreateInstance(exportedType, mw)); + } + } + } + catch + { + SuccessLoad = false; + } + } + if (authtype != "FAIL") + Author += authtype; + break; + } + } + } + catch + { + Tag.Add("该模组已损坏"); + SuccessLoad = false; } } public bool IsOnMOD(MainWindow mw) => mw.Set.IsOnMod(Name); diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 4521461..980bfe0 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -28,6 +28,7 @@ using Line = LinePutScript.Line; using static VPet_Simulator.Core.GraphInfo; using System.Globalization; using static System.Windows.Forms.VisualStyles.VisualStyleElement.ToolTip; +using System.Diagnostics.Eventing.Reader; namespace VPet_Simulator.Windows { @@ -608,7 +609,9 @@ namespace VPet_Simulator.Windows //MOD报错 foreach (CoreMOD cm in CoreMODs) if (!cm.SuccessLoad) - if (Set.IsPassMOD(cm.Name)) + if (cm.Tag.Contains("该模组已损坏")) + MessageBoxX.Show("模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题".Translate(cm.Name), "{0} 未加载代码插件".Translate(cm.Name)); + else if (Set.IsPassMOD(cm.Name)) MessageBoxX.Show("模组 {0} 的代码插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题".Translate(cm.Name), "{0} 未加载代码插件".Translate(cm.Name)); else if (Set.IsMSGMOD(cm.Name)) MessageBoxX.Show("由于 {0} 包含代码插件\n虚拟桌宠模拟器已自动停止加载该插件\n请手动前往设置允许启用该mod 代码插件".Translate(cm.Name), "{0} 未加载代码插件".Translate(cm.Name)); diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2308.lps b/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2308.lps index a156a2f..03c0f5b 100644 --- a/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2308.lps +++ b/VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2308.lps @@ -5,4 +5,5 @@ 玩游戏#Play game:| 保存游戏#Save game:| 手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存#Manually save the desktop pet archive, even if you do not manually save, the desktop pet will automatically save when you exit.:| -保存成功#Save successfully:| \ No newline at end of file +保存成功#Save successfully:| +模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题#Module {0} plug-in damage\nVirtual desktop pet simulator failed to load the plug-in\nPlease contact the author to fix the problem.:| \ No newline at end of file diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2308.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2308.lps index b3e3747..8b639fe 100644 --- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2308.lps +++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2308.lps @@ -5,4 +5,5 @@ 玩游戏#玩游戏:| 保存游戏#保存游戏:| 手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存#手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存:| -保存成功#保存成功:| \ No newline at end of file +保存成功#保存成功:| +模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题#模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题:| \ No newline at end of file diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2308.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2308.lps index de9f284..a2831fb 100644 --- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2308.lps +++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2308.lps @@ -5,4 +5,5 @@ 玩游戏#玩遊戲:| 保存游戏#保存遊戲:| 手动保存桌宠存档,就算不手动保存,桌宠也会在退出的时候自动保存#手動保存桌寵存檔,就算不手動保存，桌寵也會在退出的時候自動保存:| -保存成功#保存成功:| \ No newline at end of file +保存成功#保存成功:| +模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题#模組 {0} 插件損壞\n虛擬桌寵模擬器未能成功加載該插件\n請聯繫作者修復該問題:| \ No newline at end of file