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

修复Timer无法停止的错误

Browse Source
This commit is contained in:
ZouJin 2023-07-24 08:57:06 +10:00
parent 0e760c9585
commit a81dcd59b3
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
VPet-Simulator.Core/Display/Main.xaml.cs
View File

@ -1,4 +1,5 @@
using LinePutScript;
using LinePutScript.Localization.WPF;
using Panuon.WPF.UI;
using System;
using System.Linq;
@ -180,20 +181,37 @@ namespace VPet_Simulator.Core
PlayingVoice = false;
VoicePlayer.Clock = null;
}
public bool MoveTimerSmartMove = false;
private void SmartMoveTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
MoveTimer.AutoReset = false;
MoveTimerSmartMove = false;
}
private void MoveTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
if (MoveTimer.Enabled == false || DisplayType.Type != GraphType.Move)
if (DisplayType.Type != GraphType.Move || !MoveTimerSmartMove)
{
MoveTimer.Enabled = false;
return;
}
Core.Controller.MoveWindows(MoveTimerPoint.X, MoveTimerPoint.Y);
//if (Core.Controller.GetWindowsDistanceLeft() < -500)
//{
// MessageBox.Show("当前动画移动设计错误: 已到达边界 左侧\n动画名称: {0}\n距离: {1}".Translate(DisplayType.Name, Core.Controller.GetWindowsDistanceLeft()), "MOD移动设计错误".Translate());
//}
//else if (Core.Controller.GetWindowsDistanceRight() < -500)
//{
// MessageBox.Show("当前动画移动设计错误: 已到达边界 右侧\n动画名称: {0}\n距离: {1}".Translate(DisplayType.Name, Core.Controller.GetWindowsDistanceRight()), "MOD移动设计错误".Translate());
//}
//else if (Core.Controller.GetWindowsDistanceUp() < -500)
//{
// MessageBox.Show("当前动画移动设计错误: 已到达边界 上侧\n动画名称: {0}\n距离: {1}".Translate(DisplayType.Name, Core.Controller.GetWindowsDistanceUp()), "MOD移动设计错误".Translate());
//}
//else if (Core.Controller.GetWindowsDistanceDown() < -500)
//{
// MessageBox.Show("当前动画移动设计错误: 已到达边界 下侧\n动画名称: {0}\n距离: {1}".Translate(DisplayType.Name, Core.Controller.GetWindowsDistanceDown()), "MOD移动设计错误".Translate());
//}
MoveTimer.Start();
}
public Action DefaultClickAction;
bool isPress = false;
@ -256,7 +274,7 @@ namespace VPet_Simulator.Core
//}
if (SmartMove)
{
MoveTimer.AutoReset = true;
MoveTimerSmartMove = true;
SmartMoveTimer.Enabled = false;
SmartMoveTimer.Start();
}

9
VPet-Simulator.Core/Display/MainLogic.cs
View File

@ -349,10 +349,7 @@ namespace VPet_Simulator.Core
/// <summary>
/// 定点移动定时器
/// </summary>
public Timer MoveTimer = new Timer(125)
{
AutoReset = true,
};
public Timer MoveTimer = new Timer();
/// <summary>
/// 设置计算间隔
/// </summary>
@ -380,7 +377,7 @@ namespace VPet_Simulator.Core
MoveTimer.Enabled = false;
if (AllowMove)
{
MoveTimer.AutoReset = true;
MoveTimerSmartMove = true;
if (smartMove)
{
SmartMoveTimer.Interval = SmartMoveInterval;
@ -395,7 +392,7 @@ namespace VPet_Simulator.Core
}
else
{
MoveTimer.AutoReset = false;
MoveTimerSmartMove = false;
}
}
/// <summary>