From c259f4e9cb4752a290a344a5815b2047b438c220 Mon Sep 17 00:00:00 2001 From: ZouJin Date: Tue, 21 Nov 2023 00:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A4=84=E4=BA=8E?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E5=8A=A8=E4=BD=9C=E6=97=B6=EF=BC=8C=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E5=88=AB=E7=9A=84=E5=8A=A8=E4=BD=9C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #92 --- VPet-Simulator.Core/Display/MainDisplay.cs | 1 + VPet-Simulator.Windows/MainWindow.xaml.cs | 14 -------------- .../WinDesign/winGameSetting.xaml | 4 ++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs index 08f3251..958566a 100644 --- a/VPet-Simulator.Core/Display/MainDisplay.cs +++ b/VPet-Simulator.Core/Display/MainDisplay.cs @@ -273,6 +273,7 @@ namespace VPet_Simulator.Core { if (Function.Rnd.Next(++looptimes) > Core.Graph.GraphConfig.GetDuration(graphname)) { + looptimes = 0; Display(graphname, AnimatType.C_End, GraphType.StateTWO, DisplayIdel_StateONEing); } else diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 100add0..99444de 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -7,16 +7,10 @@ using System.Threading.Tasks; using System.Windows; using VPet_Simulator.Core; using System.Windows.Forms; -using MessageBox = System.Windows.MessageBox; -using ContextMenu = System.Windows.Forms.ContextMenu; -using MenuItem = System.Windows.Forms.MenuItem; -using Application = System.Windows.Application; using System.Timers; using LinePutScript; -using static VPet_Simulator.Core.GraphCore; using Panuon.WPF.UI; using VPet_Simulator.Windows.Interface; -using System.Windows.Controls; using System.Linq; using LinePutScript.Localization.WPF; using System.Runtime.InteropServices; @@ -25,9 +19,7 @@ using static VPet_Simulator.Windows.PerformanceDesktopTransparentWindow; using Line = LinePutScript.Line; using static VPet_Simulator.Core.GraphInfo; using System.Globalization; -using static VPet_Simulator.Windows.Interface.ExtensionFunction; using LinePutScript.Dictionary; -using System.Windows.Media.Imaging; namespace VPet_Simulator.Windows { @@ -388,12 +380,6 @@ namespace VPet_Simulator.Windows Core.Save = GameSavesData.GameSave; } - - private void M_menu_Popup(object sender, EventArgs e) - { - throw new NotImplementedException(); - } - private void WorkTimer_E_FinishWork(WorkTimer.FinishWorkInfo obj) { if (obj.work.Type == GraphHelper.Work.WorkType.Work) diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml index 2da2aa7..1c62989 100644 --- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml +++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml @@ -5,9 +5,9 @@ xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" xmlns:local="clr-namespace:VPet_Simulator.Windows" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" + xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" d:DesignHeight="1000" xmlns:system="clr-namespace:System;assembly=mscorlib" Width="{ll:Dbe SettingWidth, DefValue=650}" Height="550" - Closing="WindowX_Closing" FontSize="16" Style="{DynamicResource BaseWindowXStyle}" Topmost="True" + Closing="WindowX_Closing" FontSize="16" Style="{DynamicResource BaseWindowXStyle}" Topmost="True" WindowStartupLocation="CenterScreen" mc:Ignorable="d">