diff --git a/VPet-Simulator.Core/Graph/PNGAnimation.cs b/VPet-Simulator.Core/Graph/PNGAnimation.cs
index 65bb810..c77d9f5 100644
--- a/VPet-Simulator.Core/Graph/PNGAnimation.cs
+++ b/VPet-Simulator.Core/Graph/PNGAnimation.cs
@@ -211,7 +211,7 @@ namespace VPet_Simulator.Core
else
{
Control.Type = TaskControl.ControlType.Status_Stoped;
- Control.EndAction?.Invoke(); //运行结束动画时事件
+ Control.EndAction?.Invoke(); //运行结束动画时事件
return;
}
//要下一步
diff --git a/VPet-Simulator.Windows.Interface/TalkBox.xaml.cs b/VPet-Simulator.Windows.Interface/TalkBox.xaml.cs
index 0309f2f..272a740 100644
--- a/VPet-Simulator.Windows.Interface/TalkBox.xaml.cs
+++ b/VPet-Simulator.Windows.Interface/TalkBox.xaml.cs
@@ -71,16 +71,20 @@ namespace VPet_Simulator.Windows.Interface
}
}
///
- /// 显示思考结束动画
+ /// 显示思考结束并说话
///
- public void DisplayThinkEnd(Action Next = null)
+ public void DisplayThinkToSayRnd(string text, string desc = null)
{
var think = MainPlugin.MW.Core.Graph.FindGraphs("think", AnimatType.C_End, MainPlugin.MW.Core.Save.Mode);
- Next ??= MainPlugin.MW.Main.DisplayToNomal;
+ Action Next = () => { MainPlugin.MW.Main.SayRnd(text, true, desc); };
if (think.Count > 0)
{
MainPlugin.MW.Main.Display(think[Function.Rnd.Next(think.Count)], Next);
}
+ else
+ {
+ Next();
+ }
}
///
/// 聊天设置
diff --git a/VPet-Simulator.Windows/Function/CoreMOD.cs b/VPet-Simulator.Windows/Function/CoreMOD.cs
index ea8aed3..af2b3af 100644
--- a/VPet-Simulator.Windows/Function/CoreMOD.cs
+++ b/VPet-Simulator.Windows/Function/CoreMOD.cs
@@ -359,7 +359,11 @@ namespace VPet_Simulator.Windows
#endif
}
public bool IsOnMOD(MainWindow mw) => mw.Set.IsOnMod(Name);
+#if DEBUG
+ public bool IsPassMOD(MainWindow mw) => true;
+#else
public bool IsPassMOD(MainWindow mw) => mw.Set.IsPassMOD(Name);
+#endif
public void WriteFile()
{
diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs
index 8eb9333..33609a5 100644
--- a/VPet-Simulator.Windows/MainWindow.xaml.cs
+++ b/VPet-Simulator.Windows/MainWindow.xaml.cs
@@ -269,7 +269,7 @@ namespace VPet_Simulator.Windows
{
if (winMutiPlayer == null)
{
- winInputBox.Show(this, "请输入访客表ID".Translate(), "加入访客表".Translate(), "", (id) =>
+ winInputBox.Show(this, "请输入访客表ID".Translate(), "加入访客表".Translate(), "1860000", (id) =>
{
if (ulong.TryParse(id, NumberStyles.HexNumber, null, out ulong lid))
{
diff --git a/VPet-Simulator.Windows/MainWindow_Property.cs b/VPet-Simulator.Windows/MainWindow_Property.cs
index 6ee6280..63b9cd3 100644
--- a/VPet-Simulator.Windows/MainWindow_Property.cs
+++ b/VPet-Simulator.Windows/MainWindow_Property.cs
@@ -19,7 +19,7 @@ public partial class MainWindow
///
/// 版本号
///
- public int version { get; } = 11011;
+ public int version { get; } = 11012;
///
/// 版本号
///
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C/_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A_2/_000_125.png
similarity index 100%
rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C/_000_125.png
rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A_2/_000_125.png
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C/_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A_2/_001_125.png
similarity index 100%
rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C/_001_125.png
rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A_2/_001_125.png
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A/_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C_2/_000_125.png
similarity index 100%
rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A/_000_125.png
rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C_2/_000_125.png
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A/_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C_2/_001_125.png
similarity index 100%
rename from VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/A/_001_125.png
rename to VPet-Simulator.Windows/mod/0000_core/pet/vup/Think/Happy/C_2/_001_125.png