diff --git a/.editorconfig b/.editorconfig index adcd2ed..5f3f6ee 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,3 +5,5 @@ dotnet_diagnostic.CS1591.severity = suggestion dotnet_diagnostic.CS1573.severity = suggestion dotnet_diagnostic.CS1570.severity = suggestion +# CS8632: 只能在 "#nullable" 注释上下文内的代码中使用可为 null 的引用类型的注释。 +dotnet_diagnostic.CS8632.severity = suggestion diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj index f719fda..502cf1f 100644 --- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj +++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj @@ -23,10 +23,10 @@ - + - - + + diff --git a/VPet-Simulator.Windows.Interface/Setting.cs b/VPet-Simulator.Windows.Interface/Setting.cs index 4df6626..7a34d0b 100644 --- a/VPet-Simulator.Windows.Interface/Setting.cs +++ b/VPet-Simulator.Windows.Interface/Setting.cs @@ -87,7 +87,7 @@ namespace VPet_Simulator.Windows.Interface /// public double VoiceVolume { - get => GetFloat("voicevolume", 0.5); + get => (double)GetFloat("voicevolume", 0.5); set => SetFloat("voicevolume", value); } /// @@ -275,7 +275,7 @@ namespace VPet_Simulator.Windows.Interface /// public double PetHelpLeft { - get => this["pethelp"].GetFloat("left", 0); + get => (double)this["pethelp"].GetFloat("left", 0); set => this["pethelp"].SetFloat("left", value); } /// @@ -283,7 +283,7 @@ namespace VPet_Simulator.Windows.Interface /// public double PetHelpTop { - get => this["pethelp"].GetFloat("top", 0); + get => (double)this["pethelp"].GetFloat("top", 0); set => this["pethelp"].SetFloat("top", value); } diff --git a/VPet-Simulator.Windows.Interface/Statistics.cs b/VPet-Simulator.Windows.Interface/Statistics.cs index a1d0c06..153329f 100644 --- a/VPet-Simulator.Windows.Interface/Statistics.cs +++ b/VPet-Simulator.Windows.Interface/Statistics.cs @@ -45,7 +45,7 @@ namespace VPet_Simulator.Windows.Interface get => GetDateTime((string)subName); set => SetDateTime((string)subName, value); } - public double this[gflt subName] + public FInt64 this[gflt subName] { get => GetFloat((string)subName); set => SetFloat((string)subName, value); @@ -113,9 +113,9 @@ namespace VPet_Simulator.Windows.Interface public void SetInt64(string subName, long value) => Set(subName, value); - public double GetFloat(string subName, double defaultvalue = 0) => Find(subName)?.GetFloat() ?? defaultvalue; + public FInt64 GetFloat(string subName, FInt64 defaultvalue = default) => Find(subName)?.GetFloat() ?? defaultvalue; - public void SetFloat(string subName, double value) => Set(subName, value); + public void SetFloat(string subName, FInt64 value) => Set(subName, new SetObject(value)); public DateTime GetDateTime(string subName, DateTime defaultvalue = default) => Find(subName)?.GetDateTime() ?? defaultvalue; diff --git a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj index 28cecf0..63b2c61 100644 --- a/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj +++ b/VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj @@ -16,9 +16,9 @@ - + - - + + \ No newline at end of file diff --git a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj index d41dd05..851ce93 100644 --- a/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj +++ b/VPet-Simulator.Windows/VPet-Simulator.Windows.csproj @@ -185,6 +185,9 @@ false + + + @@ -234,10 +237,10 @@ - + - - + + \ No newline at end of file diff --git a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs index a1805c4..300fe90 100644 --- a/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs +++ b/VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml.cs @@ -50,7 +50,7 @@ namespace VPet_Simulator.Windows } } - private void Statistics_StatisticChanged(Interface.Statistics sender, string name, LinePutScript.SetObject value) + private void Statistics_StatisticChanged(Interface.Statistics sender, string name, SetObject value) { Dispatcher.Invoke(() => { diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2401.lps b/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2401.lps index 5e9164a..a768d75 100644 --- a/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2401.lps +++ b/VPet-Simulator.Windows/mod/0000_core/lang/en/Base2401.lps @@ -1,2 +1,3 @@ 由于操作系统的设计，通过我们软件启动的程序可能会在任务管理器中归类为我们软件的子进程，这可能导致CPU/内存占用显示较高#Due to the design of the operating system, programs launched by our software may be categorized as sub-processes of our software in the task manager, which may result in higher displayed CPU/memory usage.:| 关于CPU/内存占用显示较高的一次性提示#One-time Notice Regarding Higher Displayed CPU/Memory Usage:| +尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待#Attempting to load animations and generate cache\nThis step may take a while\nPlease be patient:| \ No newline at end of file diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2401.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2401.lps index 6b00360..1829f98 100644 --- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2401.lps +++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Base2401.lps @@ -1,2 +1,3 @@ 由于操作系统的设计，通过我们软件启动的程序可能会在任务管理器中归类为我们软件的子进程，这可能导致CPU/内存占用显示较高#由于操作系统的设计，通过我们软件启动的程序可能会在任务管理器中归类为我们软件的子进程，这可能导致CPU/内存占用显示较高:| 关于CPU/内存占用显示较高的一次性提示#关于CPU/内存占用显示较高的一次性提示:| +尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待#尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待:| \ No newline at end of file diff --git a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2401.lps b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2401.lps index 2bf09c4..80cfd49 100644 --- a/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2401.lps +++ b/VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Base2401.lps @@ -1,2 +1,3 @@ 由于操作系统的设计，通过我们软件启动的程序可能会在任务管理器中归类为我们软件的子进程，这可能导致CPU/内存占用显示较高#由於操作系統的設計，透過我們軟體啟動的程序可能會在任務管理器中歸類為我們軟體的子進程，這可能導致CPU/內存占用顯示較高:| 关于CPU/内存占用显示较高的一次性提示#關於CPU/內存占用顯示較高的一次性提示:| +尝试加载动画和生成缓存\n该步骤可能会耗时比较长\n请耐心等待#嘗試加載動畫和生成緩存\n該步驟可能會耗時比較長\n請耐心等待:| \ No newline at end of file diff --git a/VPet.Solution/VPet.Solution.csproj b/VPet.Solution/VPet.Solution.csproj index 1db3f59..2b10e0f 100644 --- a/VPet.Solution/VPet.Solution.csproj +++ b/VPet.Solution/VPet.Solution.csproj @@ -40,11 +40,10 @@ ..\packages\FastMember.1.5.0\lib\net461\FastMember.dll - ..\packages\LinePutScript.1.9.2\lib\net462\LinePutScript.dll + ..\packages\LinePutScript.1.10.2\lib\net462\LinePutScript.dll - - ..\packages\LinePutScript.Localization.WPF.1.0.6\lib\net462\LinePutScript.Localization.WPF.dll + ..\packages\LinePutScript.Localization.WPF.1.0.6\lib\net462\LinePutScript.Localization.WPF.dll ..\packages\Panuon.WPF.1.0.3\lib\net462\Panuon.WPF.dll diff --git a/VPet.Solution/packages.config b/VPet.Solution/packages.config index 1740b79..1ed94dc 100644 --- a/VPet.Solution/packages.config +++ b/VPet.Solution/packages.config @@ -1,8 +1,8 @@  - + - + \ No newline at end of file