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

支持取消睡觉状态

Browse Source
This commit is contained in:
ZouJin 2023-08-25 05:37:55 +10:00
parent 74e8632e7c
commit 46cdde7e82
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
VPet-Simulator.Core/Display/ToolBar.xaml.cs
View File

@ -15,6 +15,8 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.TreeView;
using static VPet_Simulator.Core.GraphHelper;
using System.ComponentModel;
using System.Reflection;
using static System.Windows.Forms.AxHost;
using static VPet_Simulator.Core.Main;
namespace VPet_Simulator.Core
{
@ -73,7 +75,7 @@ namespace VPet_Simulator.Core
case Work.WorkType.Play:
ps.Add(w);
break;
}
}
}
if (ws.Count == 0)
{
@ -424,7 +426,10 @@ namespace VPet_Simulator.Core
this.Visibility = Visibility.Collapsed;
if (m.Core.Save.Mode != GameSave.ModeType.Ill)
if (m.State == Main.WorkingState.Sleep)
{
m.State = WorkingState.Nomal;
m.Display(GraphType.Sleep, AnimatType.C_End, m.DisplayNomal);
}
else if (m.State == Main.WorkingState.Nomal)
m.DisplaySleep(true);
else

1
VPet-Simulator.Windows/WinDesign/TalkSelect.xaml.cs
View File

@ -111,6 +111,7 @@ namespace VPet_Simulator.Windows
{
return;
}
mw.Main.ToolBar.Visibility = Visibility.Collapsed;
var say = textList[tbTalk.SelectedIndex];
textList.RemoveAt(tbTalk.SelectedIndex);
//聊天效果