diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs
index 1569e18..5f2c408 100644
--- a/VPet-Simulator.Core/Display/Main.xaml.cs
+++ b/VPet-Simulator.Core/Display/Main.xaml.cs
@@ -142,6 +142,7 @@ namespace VPet_Simulator.Core
public void LoadTouchEvent()
{
Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchHeadLocate, Core.Graph.GraphConfig.TouchHeadSize, () => { DisplayTouchHead(); return true; }));
+ Core.TouchEvent.Add(new TouchArea(Core.Graph.GraphConfig.TouchBodyLocate, Core.Graph.GraphConfig.TouchBodySize, () => { DisplayTouchBody(); return true; }));
for (int i = 0; i < 4; i++)
{
GameSave.ModeType m = (GameSave.ModeType)i;
diff --git a/VPet-Simulator.Core/Graph/GraphCore.cs b/VPet-Simulator.Core/Graph/GraphCore.cs
index ecf7205..55d207a 100644
--- a/VPet-Simulator.Core/Graph/GraphCore.cs
+++ b/VPet-Simulator.Core/Graph/GraphCore.cs
@@ -198,6 +198,14 @@ namespace VPet_Simulator.Core
///
public Size TouchHeadSize;
///
+ /// 摸身体触发位置
+ ///
+ public Point TouchBodyLocate;
+ ///
+ /// 摸身体触发大小
+ ///
+ public Size TouchBodySize;
+ ///
/// 提起触发大小
///
public Size[] TouchRaisedSize;
@@ -242,6 +250,8 @@ namespace VPet_Simulator.Core
{
TouchHeadLocate = new Point(lps["touchhead"][(gdbe)"px"], lps["touchhead"][(gdbe)"py"]);
TouchHeadSize = new Size(lps["touchhead"][(gdbe)"sw"], lps["touchhead"][(gdbe)"sh"]);
+ TouchBodyLocate = new Point(lps["touchbody"][(gdbe)"px"], lps["touchbody"][(gdbe)"py"]);
+ TouchBodySize = new Size(lps["touchbody"][(gdbe)"sw"], lps["touchbody"][(gdbe)"sh"]);
TouchRaisedLocate = new Point[] {
new Point(lps["touchraised"][(gdbe)"happy_px"], lps["touchraised"][(gdbe)"happy_py"]),
new Point(lps["touchraised"][(gdbe)"nomal_px"], lps["touchraised"][(gdbe)"nomal_py"]),
@@ -282,6 +292,12 @@ namespace VPet_Simulator.Core
TouchHeadLocate = new Point(lps["touchhead"][(gdbe)"px"], lps["touchhead"][(gdbe)"py"]);
TouchHeadSize = new Size(lps["touchhead"][(gdbe)"sw"], lps["touchhead"][(gdbe)"wh"]);
}
+ if (lps.FindLine("touchbody") != null)
+ {
+ TouchBodyLocate = new Point(lps["touchbody"][(gdbe)"px"], lps["touchbody"][(gdbe)"py"]);
+ TouchBodySize = new Size(lps["touchbody"][(gdbe)"sw"], lps["touchbody"][(gdbe)"sh"]);
+ }
+
if (lps.FindLine("touchraised") != null)
{
TouchRaisedLocate = new Point[] {
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index b7950a3..186636e 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -762,6 +762,35 @@ namespace VPet_Simulator.Windows
winSetting.Show();
});
+ //if (PrefixSave == "" && App.MutiSaves.Count > 1)
+ //{
+ // var menuItem = new System.Windows.Controls.MenuItem()
+ // {
+ // Header = "多开",
+ // HorizontalContentAlignment = HorizontalAlignment.Center
+ // };
+ // menuItem.Click += delegate
+ // {
+ // clickCallback?.Invoke();
+ // };
+ // if (str.EndsWith(")") || App.MainWindows.FirstOrDefault(x => x.PrefixSave.Trim('-') == str) != null)
+ // {
+ // MessageBoxX.Show("当前多开已经加载,请先关闭改多开后重试".Translate());
+ // return;
+ // }
+ // if (!App.MutiSaves.Contains(str))
+ // {
+ // LoadMutiUI();
+ // return;
+ // }
+ // if (MessageBoxX.Show("是否删除当前选择({0})的多开存档?".Translate(str), "删除前确认".Translate(), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+ // {
+ // File.Delete(ExtensionValue.BaseDirectory + @$"\Setting-{str}.lps");
+ // App.MutiSaves.Remove(str);
+ // LoadMutiUI();
+ // }
+ //}
+
//this.Background = new ImageBrush(new BitmapImage(new Uri("pack://application:,,,/Res/TopLogo2019.PNG")));
//Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Feed, "喂食测试", () =>
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps b/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps
index 5749e48..d1aee46 100644
--- a/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/pet/vup.lps
@@ -1,5 +1,6 @@
pet#默认虚拟桌宠:|intor#虚拟主播模拟器默认人物形象:|path#vup:|petname#萝莉斯:|
touchhead:|px#159:|py#16:|sw#189:|sh#178:|
+touchbody:|px#166:|py#206:|sw#163:|sh#136:|
touchraised:|happy_px#0:|happy_py#50:|happy_sw#500:|happy_sh#200:|nomal_px#0:|nomal_py#50:|nomal_sw#500:|nomal_sh#200:|poorcondition_px#0:|poorcondition_py#50:|poorcondition_sw#500:|poorcondition_sh#200:|ill_px#0:|ill_py#200:|ill_sw#500:|ill_sh#300:|
raisepoint:|happy_x#290:|happy_y#128:|nomal_x#290:|nomal_y#128:|poorcondition_x#290:|poorcondition_y#128:|ill_x#225:|ill_y#115:|
work:|Type#Work:|Name#文案:|MoneyBase#8:|MoneyLevel#0.5:|Graph#workone:|StrengthFood#3.5:|StrengthDrink#2.5:|Feeling#1.5:|Time#60:|FinishBonus#0.1:|BorderBrush#000000:|Background#413d39:|ButtonBackground#322e2b:|ButtonForeground#FFFFFF:|Foreground#ccbdad:|Left#113:|Top#315:|Width#280:|