diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs
index eb2f4a9..cf6442b 100644
--- a/VPet-Simulator.Core/Display/Main.xaml.cs
+++ b/VPet-Simulator.Core/Display/Main.xaml.cs
@@ -58,7 +58,7 @@ namespace VPet_Simulator.Core
var ig = Core.Graph.FindGraph(GraphCore.GraphType.Default, Core.Save.Mode);
PetGrid.Child = ig.This;
ig.Run(DisplayNomal);
-
+
EventTimer.Elapsed += EventTimer_Elapsed;
MoveTimer.Elapsed += MoveTimer_Elapsed;
@@ -76,10 +76,12 @@ namespace VPet_Simulator.Core
private void MainGrid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
isPress = true;
- if (!IsNomal)
+ if (DisplayType != GraphCore.GraphType.Default)
{//不是nomal! 可能会卡timer,所有全部timer清空下
MoveTimer.Stop();
MainGrid.MouseMove -= MainGrid_MouseMove;
+ if (DisplayStopMove(DisplayNomal))
+ return;
}
Task.Run(() =>
{
@@ -128,7 +130,7 @@ namespace VPet_Simulator.Core
{
ToolBar.Show();
}
-
+
public void Dispose()
{
EventTimer.Stop();
diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs
index c7ade5e..abbb1b9 100644
--- a/VPet-Simulator.Core/Display/MainDisplay.cs
+++ b/VPet-Simulator.Core/Display/MainDisplay.cs
@@ -6,6 +6,7 @@ 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;
@@ -13,20 +14,38 @@ namespace VPet_Simulator.Core
{
public partial class Main
{
+ public GraphCore.GraphType DisplayType = GraphCore.GraphType.Default;
///
/// 显示默认情况
///
public void DisplayNomal()
{
- IsNomal = true;
Display(Core.Graph.FindGraph(GraphCore.GraphType.Default, Core.Save.Mode), DisplayNomal);
}
+ ///
+ /// 显示结束动画
+ ///
+ /// 结束后接下来
+ /// 是否成功结束
+ public bool DisplayStopMove(Action EndAction)
+ {
+ switch (DisplayType)
+ {
+ case GraphCore.GraphType.Boring_B_Loop:
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode), EndAction);
+ return true;
+ case GraphCore.GraphType.Squat_B_Loop:
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode), EndAction);
+ return true;
+ }
+ return false;
+ }
+
///
/// 显示摸头情况
///
public void DisplayTouchHead()
{
- IsNomal = false;
if (petgridcrlf)
if (PetGrid.Child is IGraph ig && ig.GraphType == GraphCore.GraphType.Touch_Head_B_Loop)
{
@@ -43,12 +62,49 @@ namespace VPet_Simulator.Core
Display(Core.Graph.FindGraph(GraphCore.GraphType.Touch_Head_C_End, Core.Save.Mode), DisplayNomal
)));
}
+
+ ///
+ /// 显示无聊情况
+ ///
+ public void DisplayBoring()
+ {
+ looptimes = 0;
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_A_Start, Core.Save.Mode), DisplayBoringing);
+ }
+ ///
+ /// 显示无聊情况
+ ///
+ private void DisplayBoringing()
+ {
+ if (Function.Rnd.Next(++looptimes) > 10)
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_C_End, Core.Save.Mode), DisplayNomal);
+ else
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Boring_B_Loop, Core.Save.Mode), DisplayBoringing);
+ }
+ int looptimes;
+ ///
+ /// 显示蹲下情况
+ ///
+ public void DisplaySquat()
+ {
+ looptimes = 0;
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_A_Start, Core.Save.Mode), DisplaySquating);
+ }
+ ///
+ /// 显示蹲下情况
+ ///
+ public void DisplaySquating()
+ {
+ if (Function.Rnd.Next(++looptimes) > 10)
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_C_End, Core.Save.Mode), DisplayNomal);
+ else
+ Display(Core.Graph.FindGraph(GraphCore.GraphType.Squat_B_Loop, Core.Save.Mode), DisplaySquating);
+ }
///
/// 显示拖拽情况
///
public void DisplayRaised()
{
- IsNomal = false;
//位置迁移: 254-128
MainGrid.MouseMove += MainGrid_MouseMove;
rasetype = 0;
@@ -116,7 +172,6 @@ namespace VPet_Simulator.Core
if (Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_A_Start, Core.Save.Mode), () =>
{
MoveTimerPoint = new Point(-20, 0);//TODO:锚定设置
@@ -175,7 +230,7 @@ namespace VPet_Simulator.Core
if (Core.Controller.GetWindowsDistanceRight() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
+
Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_A_Start, Core.Save.Mode), () =>
{
MoveTimerPoint = new Point(-20, 0);//TODO:锚定设置
@@ -184,6 +239,64 @@ namespace VPet_Simulator.Core
});
}
}
+ /////
+ ///// 显示向左爬 (有判断)
+ /////
+ //public void DisplayClimb_Bottom_Left()
+ //{
+ // //看看距离是否满足调节
+ // if (Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio)
+ // {
+ // walklength = 0;
+ // Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Bottom_Left, Core.Save.Mode), () =>
+ // {
+ // MoveTimerPoint = new Point(-20, 0);//TODO:锚定设置
+ // MoveTimer.Start();
+ // DisplayWalk_Lefting();
+ // });
+ // }
+ //}
+ /////
+ ///// 显示向左爬
+ /////
+ //private void DisplayClimb_Bottom_Lefting()
+ //{
+ // //看看距离是不是不足
+ // if (Core.Controller.GetWindowsDistanceLeft() < 50 * Core.Controller.ZoomRatio)
+ // {//是,停下恢复默认 or/爬墙
+ // switch (Function.Rnd.Next(3))
+ // {
+ // case 0:
+ // DisplayClimb_Left_UP(() =>
+ // {
+ // MoveTimer.Stop();
+ // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal);
+ // });
+ // return;
+ // case 1:
+ // DisplayClimb_Left_DOWN(() =>
+ // {
+ // MoveTimer.Stop();
+ // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal);
+ // });
+ // return;
+ // default:
+ // MoveTimer.Stop();
+ // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal);
+ // return;
+ // }
+ // }
+ // //不是:继续右边走or停下
+ // if (Function.Rnd.Next(walklength++) < 5)
+ // {
+ // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_B_Loop, Core.Save.Mode), DisplayWalk_Lefting);
+ // }
+ // else
+ // {//停下来
+ // MoveTimer.Stop();
+ // Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_C_End, Core.Save.Mode), DisplayNomal);
+ // }
+ //}
///
/// 显示向右走
///
@@ -231,11 +344,9 @@ namespace VPet_Simulator.Core
public void DisplayClimb_Left_UP(Action ifNot = null)
{
//看看距离是否满足调节
- if (Core.Controller.GetWindowsDistanceLeft() < 100 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceUp() > 400 * Core.Controller.ZoomRatio)
+ if (Core.Controller.GetWindowsDistanceLeft() < 100 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceUp() > 300 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
-
Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio - 145, 0);//TODO:锚定设置
Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_A_Start, Core.Save.Mode), () =>
{
@@ -269,7 +380,7 @@ namespace VPet_Simulator.Core
}
}
//不是:继续or停下
- if (Function.Rnd.Next(walklength++) < 5)
+ if (Function.Rnd.Next(walklength++) < 8)
{
Display(Core.Graph.FindGraph(GraphCore.GraphType.Climb_Left, Core.Save.Mode), DisplayClimb_Lefting_UP);
}
@@ -288,7 +399,7 @@ namespace VPet_Simulator.Core
if (Core.Controller.GetWindowsDistanceLeft() < 50 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceDown() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
+
Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio - 145, 0);//TODO:锚定设置
Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Left_A_Start, Core.Save.Mode), () =>
@@ -332,7 +443,7 @@ namespace VPet_Simulator.Core
if (Core.Controller.GetWindowsDistanceRight() < 100 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceUp() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
+
Core.Controller.MoveWindows(Core.Controller.GetWindowsDistanceRight() / Core.Controller.ZoomRatio + 185, 0);//TODO:锚定设置
Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_A_Start, Core.Save.Mode), () =>
@@ -386,7 +497,7 @@ namespace VPet_Simulator.Core
if (Core.Controller.GetWindowsDistanceRight() < 100 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceDown() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
+
Core.Controller.MoveWindows(Core.Controller.GetWindowsDistanceRight() / Core.Controller.ZoomRatio + 185, 0);//TODO:锚定设置
Display(Core.Graph.FindGraph(GraphCore.GraphType.Walk_Right_A_Start, Core.Save.Mode), () =>
@@ -427,10 +538,9 @@ namespace VPet_Simulator.Core
public void DisplayClimb_Top_Right()
{
//看看距离是否满足调节
- if (Core.Controller.GetWindowsDistanceUp() < 50 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceRight() > 400 * Core.Controller.ZoomRatio)
+ if (Core.Controller.GetWindowsDistanceUp() < 100 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceRight() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio - 150);//TODO:锚定设置
MoveTimerPoint = new Point(8, 0);//TODO:锚定设置
@@ -481,7 +591,7 @@ namespace VPet_Simulator.Core
if (Core.Controller.GetWindowsDistanceUp() < 50 * Core.Controller.ZoomRatio && Core.Controller.GetWindowsDistanceLeft() > 400 * Core.Controller.ZoomRatio)
{
walklength = 0;
- IsNomal = false;
+
Core.Controller.MoveWindows(0, -Core.Controller.GetWindowsDistanceUp() / Core.Controller.ZoomRatio - 150);//TODO:锚定设置
MoveTimerPoint = new Point(8, 0);//TODO:锚定设置
@@ -539,9 +649,11 @@ namespace VPet_Simulator.Core
/// 结束操作
public void Display(IGraph graph, Action EndAction = null)
{
+ DisplayType = graph.GraphType;
if (PetGrid.Child == graph.This)
{
- Dispatcher.Invoke(() => {
+ Dispatcher.Invoke(() =>
+ {
PetGrid.Visibility = Visibility;
PetGrid2.Visibility = Visibility.Collapsed;
});
@@ -550,7 +662,8 @@ namespace VPet_Simulator.Core
}
else if (PetGrid2.Child == graph.This)
{
- Dispatcher.Invoke(() => {
+ Dispatcher.Invoke(() =>
+ {
PetGrid2.Visibility = Visibility;
PetGrid.Visibility = Visibility.Collapsed;
});
@@ -563,7 +676,8 @@ namespace VPet_Simulator.Core
if (petgridcrlf)
{
((IGraph)(PetGrid.Child)).Stop(true);
- Dispatcher.Invoke(() => {
+ Dispatcher.Invoke(() =>
+ {
PetGrid2.Visibility = Visibility;
PetGrid.Visibility = Visibility.Collapsed;
PetGrid2.Child = graph.This;
@@ -577,7 +691,8 @@ namespace VPet_Simulator.Core
else
{
((IGraph)(PetGrid2.Child)).Stop(true);
- Dispatcher.Invoke(() => {
+ Dispatcher.Invoke(() =>
+ {
PetGrid.Visibility = Visibility;
PetGrid2.Visibility = Visibility.Collapsed;
PetGrid.Child = graph.This;
diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs
index 0f8c140..6c7beda 100644
--- a/VPet-Simulator.Core/Display/MainLogic.cs
+++ b/VPet-Simulator.Core/Display/MainLogic.cs
@@ -10,10 +10,6 @@ namespace VPet_Simulator.Core
{
public partial class Main
{
- ///
- /// 是否在默认情况(playnoaml)
- ///
- public bool IsNomal = true;
public Timer EventTimer = new Timer(15000)
{
@@ -27,13 +23,13 @@ namespace VPet_Simulator.Core
TimeHandle?.Invoke(this);
//TODO:饮食等乱七八糟的消耗
-
+
//UIHandle
Dispatcher.Invoke(() => TimeUIHandle.Invoke(this));
- if (IsNomal)
- switch (10)//Function.Rnd.Next(10))
+ if (DisplayType == GraphCore.GraphType.Default)
+ switch (20)//Function.Rnd.Next(10))
{
case 0:
//随机向右
@@ -51,12 +47,25 @@ namespace VPet_Simulator.Core
case 4:
DisplayClimb_Right_DOWN();
break;
+ case 5:
+ DisplayWalk_Right();
+ break;
case 10:
DisplayClimb_Top_Right();
break;
+ case 11:
+ DisplayClimb_Top_Left();
+ break;
+ case 20:
+ DisplayBoring();
+ break;
+ case 21:
+ DisplaySquat();
+ break;
default:
break;
}
+
}
///
/// 定点移动位置向量
diff --git a/VPet-Simulator.Core/Graph/GraphCore.cs b/VPet-Simulator.Core/Graph/GraphCore.cs
index 86ff696..be4d540 100644
--- a/VPet-Simulator.Core/Graph/GraphCore.cs
+++ b/VPet-Simulator.Core/Graph/GraphCore.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -34,14 +35,6 @@ namespace VPet_Simulator.Core
///
Climb_Top_Left,
///
- /// 从下向右爬 (循环)
- ///
- Climb_Bottom_Right,
- ///
- /// 从下向左爬 (循环)
- ///
- Climb_Bottom_Left,
- ///
/// 爬起向右
///
Climb_Up_Right,
@@ -133,6 +126,18 @@ namespace VPet_Simulator.Core
/// 走路向左 (结束)
///
Walk_Left_C_End,
+ ///
+ /// 无聊 (开始)
+ ///
+ Boring_A_Start,
+ ///
+ /// 无聊 (循环)
+ ///
+ Boring_B_Loop,
+ ///
+ /// 无聊 (结束)
+ ///
+ Boring_C_End,
}
///// loop 应该被取缔
///// 动画类型默认设置 前文本|是否循环|是否常用
@@ -180,12 +185,31 @@ namespace VPet_Simulator.Core
/// 类型
public void AddGraph(IGraph graph, GraphType type)
{
+ //switch (graph.GraphType)
+ //{
+ // case GraphType.Default:
+ // case GraphType.Boring_B_Loop:
+ // case GraphType.Squat_B_Loop:
+ // graph.IsLoop = true;
+ // break;
+ //}//循环真要不得,要做随机循环
if (!Graphs.ContainsKey(type))
{
Graphs.Add(type, new List());
}
Graphs[type].Add(graph);
}
+ public void AddGraph(string path, Save.ModeType modetype, GraphType graphtype, bool storemem = false)
+ {
+ var paths = new DirectoryInfo(path).GetFiles();
+ if (paths.Length == 0)
+ return;
+ if (paths.Length == 1)
+ AddGraph(new Picture(paths[0].FullName, modetype, graphtype,
+ int.Parse(paths[0].Name.Split('.').Reverse().ToArray()[1].Split('_').Last())), graphtype);
+ else
+ AddGraph(new PNGAnimation(paths, modetype, graphtype, storemem), graphtype);
+ }
public IGraph FindGraph(GraphType type, Save.ModeType mode)
{
if (Graphs.ContainsKey(type))
diff --git a/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs b/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs
index f6b7829..5dfe7c7 100644
--- a/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs
+++ b/VPet-Simulator.Core/Graph/PNGAnimation.xaml.cs
@@ -58,10 +58,10 @@ namespace VPet_Simulator.Core
///
/// 新建 PNG 动画
///
- /// 文件夹位置
+ /// 文件夹位置
/// 是否循环
/// 是否储存到内存以支持快速显示
- public PNGAnimation(string path, Save.ModeType modetype, GraphCore.GraphType graphtype, bool storemem = false, bool isLoop = false)
+ public PNGAnimation(FileInfo[] paths, Save.ModeType modetype, GraphCore.GraphType graphtype, bool storemem = false, bool isLoop = false)
{
InitializeComponent();
Animations = new List();
@@ -70,7 +70,7 @@ namespace VPet_Simulator.Core
GraphType = graphtype;
ModeType = modetype;
if (storemem)
- foreach (var file in new DirectoryInfo(path).GetFiles())
+ foreach (var file in paths)
{
int time = int.Parse(file.Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
var img = new Image()
@@ -99,13 +99,11 @@ namespace VPet_Simulator.Core
{
Visibility = Visibility.Hidden
};
- var fs = new DirectoryInfo(path).GetFiles();
-
- int time = int.Parse(fs[0].Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
+ int time = int.Parse(paths[0].Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
//第一张图:有专门自己的图层
var img = new Image()
{
- Source = new BitmapImage(new Uri(fs[0].FullName)),
+ Source = new BitmapImage(new Uri(paths[0].FullName)),
Visibility = Visibility.Hidden
};
MainGrid.Children.Add(img);
@@ -115,16 +113,16 @@ namespace VPet_Simulator.Core
Animations.Add(new Animation(this, time, () =>
{
img.Visibility = Visibility.Visible;
- imgs[1].Source = new BitmapImage(new Uri(fs[1].FullName));
+ imgs[1].Source = new BitmapImage(new Uri(paths[1].FullName));
}, () => img.Visibility = Visibility.Hidden));
- int last = fs.Count() - 1;
+ int last = paths.Count() - 1;
for (int i = 1; i < last; i++)
{
- time = int.Parse(fs[i].Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
+ time = int.Parse(paths[i].Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
var im1 = imgs[i % 3];
var im2 = imgs[(i + 1) % 3];
- var st3 = fs[i + 1].FullName;
+ var st3 = paths[i + 1].FullName;
Animations.Add(new Animation(this, time, () =>
{
im1.Visibility = Visibility.Visible;
@@ -133,7 +131,7 @@ namespace VPet_Simulator.Core
}
//最后一张图: 不处理下一张图的imgsSources
- time = int.Parse(fs[last].Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
+ time = int.Parse(paths[last].Name.Split('.').Reverse().ToArray()[1].Split('_').Last());
Animations.Add(new Animation(this, time, () => imgs[last % 3].Visibility = Visibility.Visible
, () => imgs[last % 3].Visibility = Visibility.Hidden));
}
diff --git a/VPet-Simulator.Core/Graph/Picture.xaml.cs b/VPet-Simulator.Core/Graph/Picture.xaml.cs
index 6dcd2be..49b12ee 100644
--- a/VPet-Simulator.Core/Graph/Picture.xaml.cs
+++ b/VPet-Simulator.Core/Graph/Picture.xaml.cs
@@ -25,13 +25,14 @@ namespace VPet_Simulator.Core
/// 新建新静态图像
///
/// 图片路径
- public Picture(string path, Save.ModeType modetype, int length = 1000, bool isloop = false)
+ public Picture(string path, Save.ModeType modetype, GraphCore.GraphType graphType, int length = 1000, bool isloop = false)
{
InitializeComponent();
ModeType = modetype;
IsLoop = isloop;
Length = length;
Source = new BitmapImage(new Uri(path));
+ GraphType = graphType;
}
public Save.ModeType ModeType { get; private set; }
@@ -42,9 +43,9 @@ namespace VPet_Simulator.Core
public UIElement This => this;
- public bool IsContinue { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+ public bool IsContinue { get; set; }
- public GraphCore.GraphType GraphType => throw new NotImplementedException();
+ public GraphCore.GraphType GraphType { get; set; }
public void Run(Action EndAction = null)
{
diff --git a/VPet-Simulator.Windows/Function/CorePet.cs b/VPet-Simulator.Windows/Function/CorePet.cs
index 60bc9bf..df81a34 100644
--- a/VPet-Simulator.Windows/Function/CorePet.cs
+++ b/VPet-Simulator.Windows/Function/CorePet.cs
@@ -66,19 +66,19 @@ namespace VPet_Simulator.Windows
if (path_name.Contains("happy"))
{
- graph.AddGraph(new PNGAnimation(di.FullName, Save.ModeType.Happy, (GraphType)i, storemem), (GraphType)i);
+ graph.AddGraph(di.FullName, Save.ModeType.Happy, (GraphType)i, storemem);
}
if (path_name.Contains("nomal"))
{
- graph.AddGraph(new PNGAnimation(di.FullName, Save.ModeType.Nomal, (GraphType)i, storemem), (GraphType)i);
+ graph.AddGraph(di.FullName, Save.ModeType.Nomal, (GraphType)i, storemem);
}
if (path_name.Contains("poorcondition"))
{
- graph.AddGraph(new PNGAnimation(di.FullName, Save.ModeType.PoorCondition, (GraphType)i, storemem), (GraphType)i);
+ graph.AddGraph(di.FullName, Save.ModeType.PoorCondition, (GraphType)i, storemem);
}
if (path_name.Contains("ill"))
{
- graph.AddGraph(new PNGAnimation(di.FullName, Save.ModeType.Ill, (GraphType)i, storemem), (GraphType)i);
+ graph.AddGraph(di.FullName, Save.ModeType.Ill, (GraphType)i, storemem);
}
return;
}
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/A_Nomal/低头打呼噜_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/A_Nomal/低头打呼噜_000_125.png
new file mode 100644
index 0000000..60ebcdd
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/A_Nomal/低头打呼噜_000_125.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_000_125.png
new file mode 100644
index 0000000..9813888
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_000_125.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_001_375.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_001_375.png
new file mode 100644
index 0000000..f7da879
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_001_375.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_002_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_002_250.png
new file mode 100644
index 0000000..86c075e
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_002_250.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_003_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_003_250.png
new file mode 100644
index 0000000..782b759
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_003_250.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_004_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_004_250.png
new file mode 100644
index 0000000..93700b8
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_004_250.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_005_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_005_250.png
new file mode 100644
index 0000000..9813888
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_005_250.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_006_500.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_006_500.png
new file mode 100644
index 0000000..f7da879
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_006_500.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png
new file mode 100644
index 0000000..ed54f75
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_007_250.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_008_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_008_250.png
new file mode 100644
index 0000000..93700b8
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/B_Nomal/低头打呼朝左_008_250.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/C_Nomal/低头打呼噜_000_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/C_Nomal/低头打呼噜_000_125.png
new file mode 100644
index 0000000..60ebcdd
Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Boring/C_Nomal/低头打呼噜_000_125.png differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_000_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_000_250.png
deleted file mode 100644
index 04303cd..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_000_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_001_125.png
deleted file mode 100644
index 853e75a..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_001_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_002_125.png
deleted file mode 100644
index 3da319c..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_002_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_003_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_003_250.png
deleted file mode 100644
index 4b4fc8d..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_003_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_004_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_004_250.png
deleted file mode 100644
index 3e22f86..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_004_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_005_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_005_250.png
deleted file mode 100644
index 4b4fc8d..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_005_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_006_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_006_125.png
deleted file mode 100644
index 3da319c..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_006_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_007_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_007_125.png
deleted file mode 100644
index 853e75a..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_007_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_008_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_008_250.png
deleted file mode 100644
index 04303cd..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Left/Nomal/爬行向左_008_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_000_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_000_250.png
deleted file mode 100644
index c485f21..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_000_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_001_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_001_125.png
deleted file mode 100644
index c6764a2..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_001_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_002_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_002_125.png
deleted file mode 100644
index 326a39a..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_002_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_003_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_003_250.png
deleted file mode 100644
index b54588c..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_003_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_004_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_004_250.png
deleted file mode 100644
index 2befbe1..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_004_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_005_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_005_250.png
deleted file mode 100644
index b54588c..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_005_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_006_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_006_125.png
deleted file mode 100644
index 326a39a..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_006_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_007_125.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_007_125.png
deleted file mode 100644
index c6764a2..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_007_125.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_008_250.png b/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_008_250.png
deleted file mode 100644
index c485f21..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/Climb_Bottom_Right/Nomal/向右爬行_008_250.png and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/低头打呼朝左.rar b/VPet-Simulator.Windows/mod/0000_core/pet/vup/低头打呼朝左.rar
deleted file mode 100644
index 031ab4a..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/低头打呼朝左.rar and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬起向右.rar b/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬起向右.rar
deleted file mode 100644
index 4baf87b..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬起向右.rar and /dev/null differ
diff --git a/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬起向左.rar b/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬起向左.rar
deleted file mode 100644
index b54b6ef..0000000
Binary files a/VPet-Simulator.Windows/mod/0000_core/pet/vup/爬起向左.rar and /dev/null differ