Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

MOD制作器兼容

Browse Source
This commit is contained in:
ZouJin
2024-03-30 17:08:50 +08:00
parent a04d590533
commit 07196d20e9
6 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VPet-Simulator.Core/VPet-Simulator.Core.csproj
View File

@ -26,7 +26,7 @@
<PackageReference Include="LinePutScript" Version="1.11.6" /> <PackageReference Include="LinePutScript" Version="1.11.6" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">

2
VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
View File

@ -19,6 +19,6 @@
<PackageReference Include="LinePutScript" Version="1.11.6" /> <PackageReference Include="LinePutScript" Version="1.11.6" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
VPet-Simulator.Windows/Function/CoreMOD.cs
View File

@ -19,7 +19,7 @@ namespace VPet_Simulator.Windows
/// <summary> /// <summary>
/// 自动启用MOD名称 /// 自动启用MOD名称
/// </summary> /// </summary>
public static readonly string[] OnModDefList = new string[] { "Core", "PCat", };//"ModMaker" 暂时移除MODMaker public static readonly string[] OnModDefList = new string[] { "Core", "PCat", "ModMaker" };
public static HashSet<string> LoadedDLL { get; } = new HashSet<string>() public static HashSet<string> LoadedDLL { get; } = new HashSet<string>()
{ {
@ -279,10 +279,10 @@ namespace VPet_Simulator.Windows
continue; continue;
} }
#endif #endif
#if !DEBUG5
try try
{ {
#endif
var path = tmpfi.Name; var path = tmpfi.Name;
if (LoadedDLL.Contains(path)) if (LoadedDLL.Contains(path))
continue; continue;
@ -304,7 +304,8 @@ namespace VPet_Simulator.Windows
if (authtype != "FAIL") if (authtype != "FAIL")
authtype = "[认证]".Translate(); authtype = "[认证]".Translate();
} }
else if (certificate.Subject != "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" && !IsPassMOD(mw)) else if (!(certificate.Subject.Contains("Microsoft Corporation") &&
certificate.Issuer.Contains("Microsoft Corporation")) && !IsPassMOD(mw))
{//不是通过模组,不加载 {//不是通过模组,不加载
SuccessLoad = false; SuccessLoad = false;
continue; continue;
@ -329,13 +330,14 @@ namespace VPet_Simulator.Windows
mw.Plugins.Add((MainPlugin)Activator.CreateInstance(exportedType, mw)); mw.Plugins.Add((MainPlugin)Activator.CreateInstance(exportedType, mw));
} }
} }
#if !DEBUG5
} }
catch (Exception e) catch (Exception e)
{ {
ErrorMessage = e.Message; ErrorMessage = e.Message;
SuccessLoad = false; SuccessLoad = false;
} }
#endif
} }
if (authtype != "FAIL") if (authtype != "FAIL")
Author += authtype; Author += authtype;

2
VPet-Simulator.Windows/MainWindow.cs
View File

@ -2042,7 +2042,7 @@ namespace VPet_Simulator.Windows
if (!cm.SuccessLoad) if (!cm.SuccessLoad)
if (cm.Tag.Contains("该模组已损坏")) if (cm.Tag.Contains("该模组已损坏"))
MessageBoxX.Show("模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题".Translate(cm.Name) + '\n' + cm.ErrorMessage, "该模组已损坏".Translate()); MessageBoxX.Show("模组 {0} 插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题".Translate(cm.Name) + '\n' + cm.ErrorMessage, "该模组已损坏".Translate());
else if (Set.IsPassMOD(cm.Name)) else if (Set.IsPassMOD(cm.Name) || !string.IsNullOrEmpty(cm.ErrorMessage))
MessageBoxX.Show("模组 {0} 的代码插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题".Translate(cm.Name) + '\n' + cm.ErrorMessage, "{0} 未加载代码插件".Translate(cm.Name)); MessageBoxX.Show("模组 {0} 的代码插件损坏\n虚拟桌宠模拟器未能成功加载该插件\n请联系作者修复该问题".Translate(cm.Name) + '\n' + cm.ErrorMessage, "{0} 未加载代码插件".Translate(cm.Name));
else if (Set.IsMSGMOD(cm.Name)) else if (Set.IsMSGMOD(cm.Name))
MessageBoxX.Show("由于 {0} 包含代码插件\n虚拟桌宠模拟器已自动停止加载该插件\n请手动前往设置允许启用该mod 代码插件".Translate(cm.Name), "{0} 未加载代码插件".Translate(cm.Name)); MessageBoxX.Show("由于 {0} 包含代码插件\n虚拟桌宠模拟器已自动停止加载该插件\n请手动前往设置允许启用该mod 代码插件".Translate(cm.Name), "{0} 未加载代码插件".Translate(cm.Name));

2
VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
View File

@ -223,7 +223,7 @@
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NAudio" Version="2.2.1" /> <PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" /> <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />

2
VPet.Solution/VPet.Solution.csproj
View File

@ -23,7 +23,7 @@
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.1" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>