diff --git a/README.md b/README.md
index 1171c79..e28fd17 100644
--- a/README.md
+++ b/README.md
@@ -53,9 +53,14 @@
* 桌宠动画
* 物品/食物/饮料等
-* 桌宠工作
+* 自定义桌宠工作
* 说话文本
* 主题
+* 代码插件 - 通过编写代码给桌宠添加内容
+ * 添加新的动画逻辑/显示方案 (eg: l2d/spine 等)
+ * 添加新功能 (闹钟/记事板等等)
+ * 几乎无所不能, 示例例子参见 [VPet.Plugin.Demo](https://github.com/LorisYounger/VPet.Plugin.Demo)
+
### 反馈&建议&联系我们
@@ -188,7 +193,7 @@
## 参与开发
-欢迎参与虚拟桌宠模拟器的开发! 为保证代码可维护度和游戏性,如果想要开发新的功能,请先[邮件联系](mailto:zoujin.dev@exlb.org)我想要添加的功能/玩法, 以确保该功能/玩法适用于虚拟桌宠模拟器. 以免未来提交时因不合适被拒(而造成代码浪费)
+欢迎参与虚拟桌宠模拟器的开发! 为保证代码可维护度和游戏性,如果想要开发新的功能,请先[邮件联系](mailto:zoujin.dev@exlb.org)或发[Issues](https://github.com/LorisYounger/VPet/issues)我想要添加的功能/玩法, 以确保该功能/玩法适用于虚拟桌宠模拟器. 以免未来提交时因不合适被拒(而造成代码浪费)
如果是修复错误或者BUG,无需联系我,修好后直接PR即可
当想法通过后,您可以通过 [fork](https://github.com/LorisYounger/VPet/fork) 功能拷贝代码至自己的github以方便编写自己的代码, 编写完毕后通过[pull requests](https://github.com/LorisYounger/VPet/compare) 提交
diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs
index 3ca8d06..77c37d2 100644
--- a/VPet-Simulator.Core/Display/Main.xaml.cs
+++ b/VPet-Simulator.Core/Display/Main.xaml.cs
@@ -1,20 +1,12 @@
using LinePutScript;
using Panuon.WPF.UI;
using System;
-using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
using static VPet_Simulator.Core.GraphCore;
namespace VPet_Simulator.Core
diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs
index 2b27204..9a0e872 100644
--- a/VPet-Simulator.Core/Display/MainDisplay.cs
+++ b/VPet-Simulator.Core/Display/MainDisplay.cs
@@ -1,13 +1,6 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.AccessControl;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Input;
using System.Windows.Threading;
using static VPet_Simulator.Core.GraphCore;
@@ -1217,5 +1210,65 @@ namespace VPet_Simulator.Core
petgridcrlf = !petgridcrlf;
GC.Collect();
}
+ ///
+ /// 查找可用与显示的Border (自动多层切换)
+ ///
+ /// 动画
+ public Border FindDisplayBorder(IGraph graph)
+ {
+ DisplayType = graph.GraphType;
+ var PetGridTag = Dispatcher.Invoke(() => PetGrid.Tag);
+ var PetGrid2Tag = Dispatcher.Invoke(() => PetGrid2.Tag);
+ if (PetGridTag == graph)
+ {
+ petgridcrlf = true;
+ ((IGraph)(PetGrid2Tag)).Stop(true);
+ Dispatcher.Invoke(() =>
+ {
+ PetGrid.Visibility = Visibility.Visible;
+ PetGrid2.Visibility = Visibility.Hidden;
+ });
+ return PetGrid;
+ }
+ else if (PetGrid2Tag == graph)
+ {
+ petgridcrlf = false;
+ ((IGraph)(PetGridTag)).Stop(true);
+ Dispatcher.Invoke(() =>
+ {
+ PetGrid2.Visibility = Visibility.Visible;
+ PetGrid.Visibility = Visibility.Hidden;
+ });
+ return PetGrid2;
+ }
+
+ if (petgridcrlf)
+ {
+ ((IGraph)(PetGridTag)).Stop(true);
+ Dispatcher.Invoke(() =>
+ {
+ PetGrid.Visibility = Visibility.Hidden;
+ PetGrid2.Visibility = Visibility.Visible;
+ //PetGrid2.Tag = graph;
+ });
+ petgridcrlf = !petgridcrlf;
+ GC.Collect();
+ return PetGrid2;
+ }
+ else
+ {
+ ((IGraph)(PetGrid2Tag)).Stop(true);
+ Dispatcher.Invoke(() =>
+ {
+ PetGrid2.Visibility = Visibility.Hidden;
+ PetGrid.Visibility = Visibility.Visible;
+ //PetGrid.Tag = graph;
+ });
+ petgridcrlf = !petgridcrlf;
+ GC.Collect();
+ return PetGrid;
+ }
+
+ }
}
}
diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs
index 53f84b6..9cc130e 100644
--- a/VPet-Simulator.Core/Display/MainLogic.cs
+++ b/VPet-Simulator.Core/Display/MainLogic.cs
@@ -1,7 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Timers;
using System.Windows;
diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml.cs b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
index dedaa27..b8c4233 100644
--- a/VPet-Simulator.Core/Display/MessageBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/MessageBar.xaml.cs
@@ -1,19 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Timers;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
using Timer = System.Timers.Timer;
namespace VPet_Simulator.Core
diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml b/VPet-Simulator.Core/Display/ToolBar.xaml
index 28284a9..4d7dac9 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml
@@ -101,11 +101,8 @@
-
+