Skip to content

Commit

Permalink
正式支持语言内容
Browse files Browse the repository at this point in the history
  • Loading branch information
@LorisYounger
LorisYounger committed Jul 3, 2023
1 parent ddd7356 commit 0749dfd
Show file tree
Hide file tree
Showing 15 changed files with 446 additions and 232 deletions.
3 changes: 2 additions & 1 deletion VPet-Simulator.Core/Handle/GameSave.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public class GameSave
/// <summary>
/// 金钱
/// </summary>
[Line(Type = LPSConvert.ConvertType.ToFloat, Name = "money")] public double Money { get; set; }
[Line(Type = LPSConvert.ConvertType.ToFloat, Name = "money")]
public double Money { get; set; }
/// <summary>
/// 经验值
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions VPet-Simulator.Core/VPet-Simulator.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="LinePutScript, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LinePutScript.1.8.2\lib\net462\LinePutScript.dll</HintPath>
<HintPath>..\packages\LinePutScript.1.8.3\lib\net462\LinePutScript.dll</HintPath>
</Reference>
<Reference Include="LinePutScript.Localization.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LinePutScript.Localization.WPF.1.0.4\lib\net462\LinePutScript.Localization.WPF.dll</HintPath>
<HintPath>..\packages\LinePutScript.Localization.WPF.1.0.6\lib\net462\LinePutScript.Localization.WPF.dll</HintPath>
</Reference>
<Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions VPet-Simulator.Core/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LinePutScript" version="1.8.2" targetFramework="net462" />
<package id="LinePutScript.Localization.WPF" version="1.0.4" targetFramework="net462" />
<package id="LinePutScript" version="1.8.3" targetFramework="net462" />
<package id="LinePutScript.Localization.WPF" version="1.0.6" targetFramework="net462" />
<package id="Panuon.WPF" version="1.0.1" targetFramework="net462" />
<package id="Panuon.WPF.UI" version="1.1.14" targetFramework="net462" />
</packages>
4 changes: 2 additions & 2 deletions VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="LinePutScript, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LinePutScript.1.8.2\lib\net462\LinePutScript.dll</HintPath>
<HintPath>..\packages\LinePutScript.1.8.3\lib\net462\LinePutScript.dll</HintPath>
</Reference>
<Reference Include="LinePutScript.Localization.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LinePutScript.Localization.WPF.1.0.4\lib\net462\LinePutScript.Localization.WPF.dll</HintPath>
<HintPath>..\packages\LinePutScript.Localization.WPF.1.0.6\lib\net462\LinePutScript.Localization.WPF.dll</HintPath>
</Reference>
<Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions VPet-Simulator.Windows.Interface/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LinePutScript" version="1.8.2" targetFramework="net462" />
<package id="LinePutScript.Localization.WPF" version="1.0.4" targetFramework="net462" />
<package id="LinePutScript" version="1.8.3" targetFramework="net462" />
<package id="LinePutScript.Localization.WPF" version="1.0.6" targetFramework="net462" />
<package id="Panuon.WPF" version="1.0.1" targetFramework="net462" />
<package id="Panuon.WPF.UI" version="1.1.14" targetFramework="net462" />
</packages>
15 changes: 11 additions & 4 deletions VPet-Simulator.Windows/MainWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public partial class MainWindow : IMainWindow
/// <summary>
/// 版本号
/// </summary>
public int verison { get; } = 21;
public int verison { get; } = 30;
/// <summary>
/// 版本号
/// </summary>
Expand Down Expand Up @@ -126,16 +126,23 @@ public void LoadDIY()
/// 加载帮助器
/// </summary>
public void LoadPetHelper()
{
{
petHelper = new PetHelper(this);
petHelper.Show();
}

public static void RunDIY(string content)
{
if (content.Contains("://") || content.Contains(@":\"))
{
Process.Start(content);
try
{
Process.Start(content);
}
catch(Exception e)
{
MessageBox.Show("快捷键运行失败:无法运行指定内容".Translate() + '\n' + e.Message);
}
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@
<HintPath>..\packages\ChatGPT.API.Framework.1.0.4\lib\net462\ChatGPT.API.Framework.dll</HintPath>
</Reference>
<Reference Include="LinePutScript, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LinePutScript.1.8.2\lib\net48\LinePutScript.dll</HintPath>
<HintPath>..\packages\LinePutScript.1.8.3\lib\net48\LinePutScript.dll</HintPath>
</Reference>
<Reference Include="LinePutScript.Localization.WPF, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LinePutScript.Localization.WPF.1.0.4\lib\net462\LinePutScript.Localization.WPF.dll</HintPath>
<HintPath>..\packages\LinePutScript.Localization.WPF.1.0.6\lib\net462\LinePutScript.Localization.WPF.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand Down
1 change: 0 additions & 1 deletion VPet-Simulator.Windows/WinDesign/winReport.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public winReport(MainWindow mainw, string errmsg = null)
tType.SelectedIndex = 0;
tContent.Text = errmsg;
tContent.IsReadOnly = true;
tContent.Height = 44;
}

if (!mw.IsSteamUser)
Expand Down
Binary file modified VPet-Simulator.Windows/mod/0000_core/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0749dfd

Please sign in to comment.