diff --git a/Tutorial.md b/Tutorial.md
index 30b968f..08c84a0 100644
--- a/Tutorial.md
+++ b/Tutorial.md
@@ -1,6 +1,6 @@
# 虚拟桌宠模拟器 使用教程
-**本教程仅会在第一次启动/操作更新时自动打开**
+**本教程仅会在第一次启动/操作更新时自动打开** *如果你每次启动桌宠都能看到这个文件自动打开,那就是bug,请反馈给我*
桌宠默认会打开[数据计算](#数据计算), 打开数据计算后会计算桌宠心情/食物等消耗,需要玩家进行互动.可在设置中进行设置开关和游玩节奏
diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs
index 12d40c5..f54c357 100644
--- a/VPet-Simulator.Core/Display/MainLogic.cs
+++ b/VPet-Simulator.Core/Display/MainLogic.cs
@@ -236,7 +236,7 @@ namespace VPet_Simulator.Core
}
}
public event Action FunctionSpendHandle;
- private void EventTimer_Elapsed(object sender, ElapsedEventArgs e)
+ public void EventTimer_Elapsed(object sender, ElapsedEventArgs e)
{
//所有Handle
TimeHandle?.Invoke(this);
diff --git a/VPet-Simulator.Windows.Interface/Setting.cs b/VPet-Simulator.Windows.Interface/Setting.cs
index 8997269..a4beff0 100644
--- a/VPet-Simulator.Windows.Interface/Setting.cs
+++ b/VPet-Simulator.Windows.Interface/Setting.cs
@@ -2,6 +2,7 @@
using LinePutScript.Dictionary;
using System;
using System.Windows;
+using VPet_Simulator.Core;
namespace VPet_Simulator.Windows.Interface
{
@@ -106,6 +107,14 @@ namespace VPet_Simulator.Windows.Interface
// set => this["set"].SetBool("storemem", value);
//}
///
+ /// 非计算模式下默认模式
+ ///
+ public GameSave.ModeType CalFunState
+ {
+ get => (GameSave.ModeType)this[(gint)"calfunstate"];
+ set => this[(gint)"calfunstate"] = (int)value;
+ }
+ ///
/// 数据收集频率
///
public int DiagnosisInterval
diff --git a/VPet-Simulator.Windows/MainWindow.cs b/VPet-Simulator.Windows/MainWindow.cs
index 1993fa6..3b45d7c 100644
--- a/VPet-Simulator.Windows/MainWindow.cs
+++ b/VPet-Simulator.Windows/MainWindow.cs
@@ -75,9 +75,12 @@ namespace VPet_Simulator.Windows
if (Core != null && Core.Save != null)
{
- var ds = Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory + @"\UserData");
- while (ds.Length > Set.BackupSaveMaxNum)
+ var ds = new List(Directory.GetFiles(AppDomain.CurrentDomain.BaseDirectory + @"\UserData"));
+ while (ds.Count > Set.BackupSaveMaxNum)
+ {
File.Delete(ds[0]);
+ ds.RemoveAt(0);
+ }
if (File.Exists(AppDomain.CurrentDomain.BaseDirectory + $"\\UserData\\Save_{st}.lps"))
File.Delete(AppDomain.CurrentDomain.BaseDirectory + $"\\UserData\\Save_{st}.lps");
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index ac3587d..ecd2dd2 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -232,6 +232,7 @@ namespace VPet_Simulator.Windows
winSetting = new winGameSetting(this);
winBetterBuy = new winBetterBuy(this);
Main = new Main(Core) { };
+ Main.NoFunctionMOD = Set.CalFunState;
if (!Set["CGPT"][(gbol)"enable"] && IsSteamUser)
{
TalkBox = new TalkBox(this);
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
index 43be242..2a27217 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
@@ -218,11 +218,13 @@
-
+
+ Background="{DynamicResource SecondaryLight}" Padding="1" Margin="5" Grid.Row="1"
+ ToolTip="加载上次保存的存档" Click="BtnSaveReload_Click" />
@@ -320,16 +322,31 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -354,9 +371,10 @@
-
-
-
+
+
+
+
@@ -370,8 +388,8 @@
Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold"
Background="{x:Null}" Width="60" />
-
-
+
+
@@ -385,7 +403,7 @@
Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold"
Background="{x:Null}" Width="60" />
-
+
@@ -496,6 +514,7 @@
+ 每 两百 周期一次
每 五百 周期一次
每 一千 周期一次
每 两千 周期一次
@@ -642,14 +661,14 @@
- 杨远洛里斯, 广大MOD作者
+ 杨远洛里斯, 广大MOD作者
洛里斯杨远, トニーちゃん Git贡献名单
- 叶书天, 广大MOD作者
+ 叶书天, 广大MOD作者
- Panuon.WPF.UI
- LinePutScript
- Facepunch.Steamworks
- 查看引用名单
+ Panuon.WPF.UI
+ LinePutScript
+ Facepunch.Steamworks
+ 查看引用名单
访问Steam页面
访问Github页面
diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
index 595a828..8a8984b 100644
--- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
@@ -2,6 +2,7 @@
using Panuon.WPF.UI;
using Steamworks.Ugc;
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -70,6 +71,8 @@ namespace VPet_Simulator.Windows
TextBoxStartUpX.Text = mw.Set.StartRecordPoint.X.ToString();
TextBoxStartUpY.Text = mw.Set.StartRecordPoint.Y.ToString();
numBackupSaveMaxNum.Value = mw.Set.BackupSaveMaxNum;
+ combCalFunState.SelectedIndex = (int)mw.Set.CalFunState;
+ combCalFunState.IsEnabled = !mw.Set.EnableFunction;
if (mw.Set.StartRecordLast == true)
{
StartPlace.IsChecked = true;
@@ -787,7 +790,16 @@ namespace VPet_Simulator.Windows
if (!AllowChange)
return;
//MessageBoxX.Show("由于没做完,暂不支持数据计算\n敬请期待后续更新", "没做完!", MessageBoxButton.OK, MessageBoxIcon.Warning);
- mw.Set.EnableFunction = CalFunctionBox.IsChecked.Value;
+ if (CalFunctionBox.IsChecked == true)
+ {
+ mw.Set.EnableFunction = true;
+ combCalFunState.IsEnabled = false;
+ }
+ else
+ {
+ mw.Set.EnableFunction = false;
+ combCalFunState.IsEnabled = true;
+ }
}
private void SwitchMsgOut_Checked(object sender, RoutedEventArgs e)
@@ -846,5 +858,31 @@ namespace VPet_Simulator.Windows
}
}
}
+
+ private void Mod_Click(object sender, RoutedEventArgs e)
+ {
+ List list = new List();
+ foreach (CoreMOD mod in mw.CoreMODs)
+ {
+ foreach (string str in mod.Author.Split(','))
+ list.Add(str.Trim());
+ }
+ list = list.Distinct().ToList();
+ MessageBoxX.Show(string.Join("\n", list), "感谢以下MOD开发人员");
+ }
+
+ private void Using_Click(object sender, RoutedEventArgs e)
+ {
+ MessageBoxX.Show(string.Join("\n", CoreMOD.LoadedDLL), "DLL引用名单");
+ }
+
+ private void combCalFunState_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ if (!AllowChange)
+ return;
+ mw.Set.CalFunState = (GameSave.ModeType)combCalFunState.SelectedIndex;
+ mw.Main.NoFunctionMOD = (GameSave.ModeType)combCalFunState.SelectedIndex;
+ mw.Main.EventTimer_Elapsed(null, null);
+ }
}
}
diff --git a/VPet-Simulator.Windows/mod/0000_core/info.lps b/VPet-Simulator.Windows/mod/0000_core/info.lps
index 121a384..c8b219a 100644
--- a/VPet-Simulator.Windows/mod/0000_core/info.lps
+++ b/VPet-Simulator.Windows/mod/0000_core/info.lps
@@ -1,4 +1,4 @@
-vupmod#Core:|author#lorisyounger:|gamever#20:|ver#100:|
+vupmod#Core:|author#LorisYounger:|gamever#20:|ver#100:|
intro#这是虚拟桌宠模拟器的核心运行文件/com可以参考此文件编写mod:|
authorid#253101309:|
itemid#1:|