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

修复 处于某些动作时，触发别的动作存在bug

Browse Source 
Fix #92
This commit is contained in:
ZouJin 2023-11-21 00:58:09 +08:00
parent 2157095823
commit c259f4e9cb
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VPet-Simulator.Core/Display/MainDisplay.cs
View File

@ -273,6 +273,7 @@ namespace VPet_Simulator.Core
{ {
if (Function.Rnd.Next(++looptimes) > Core.Graph.GraphConfig.GetDuration(graphname)) if (Function.Rnd.Next(++looptimes) > Core.Graph.GraphConfig.GetDuration(graphname))
{ {
looptimes = 0;
Display(graphname, AnimatType.C_End, GraphType.StateTWO, DisplayIdel_StateONEing); Display(graphname, AnimatType.C_End, GraphType.StateTWO, DisplayIdel_StateONEing);
} }
else else

14
VPet-Simulator.Windows/MainWindow.xaml.cs
View File

@ -7,16 +7,10 @@ using System.Threading.Tasks;
using System.Windows; using System.Windows;
using VPet_Simulator.Core; using VPet_Simulator.Core;
using System.Windows.Forms; 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 System.Timers;
using LinePutScript; using LinePutScript;
using static VPet_Simulator.Core.GraphCore;
using Panuon.WPF.UI; using Panuon.WPF.UI;
using VPet_Simulator.Windows.Interface; using VPet_Simulator.Windows.Interface;
using System.Windows.Controls;
using System.Linq; using System.Linq;
using LinePutScript.Localization.WPF; using LinePutScript.Localization.WPF;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -25,9 +19,7 @@ using static VPet_Simulator.Windows.PerformanceDesktopTransparentWindow;
using Line = LinePutScript.Line; using Line = LinePutScript.Line;
using static VPet_Simulator.Core.GraphInfo; using static VPet_Simulator.Core.GraphInfo;
using System.Globalization; using System.Globalization;
using static VPet_Simulator.Windows.Interface.ExtensionFunction;
using LinePutScript.Dictionary; using LinePutScript.Dictionary;
using System.Windows.Media.Imaging;
namespace VPet_Simulator.Windows namespace VPet_Simulator.Windows
{ {
@ -388,12 +380,6 @@ namespace VPet_Simulator.Windows
Core.Save = GameSavesData.GameSave; Core.Save = GameSavesData.GameSave;
} }
private void M_menu_Popup(object sender, EventArgs e)
{
throw new NotImplementedException();
}
private void WorkTimer_E_FinishWork(WorkTimer.FinishWorkInfo obj) private void WorkTimer_E_FinishWork(WorkTimer.FinishWorkInfo obj)
{ {
if (obj.work.Type == GraphHelper.Work.WorkType.Work) if (obj.work.Type == GraphHelper.Work.WorkType.Work)

2
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
View File

@ -5,7 +5,7 @@
xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF"
xmlns:local="clr-namespace:VPet_Simulator.Windows" xmlns:local="clr-namespace:VPet_Simulator.Windows"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 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" 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"> WindowStartupLocation="CenterScreen" mc:Ignorable="d">