diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/Panuon.WPF.UI.dll b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/Panuon.WPF.UI.dll
index 3e155b4..fee5279 100644
Binary files a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/Panuon.WPF.UI.dll and b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/Panuon.WPF.UI.dll differ
diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.dll b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.dll
index 0321bab..1bf2100 100644
Binary files a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.dll and b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.dll differ
diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.xml b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.xml
index 87cced2..6176599 100644
--- a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.xml
+++ b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.xml
@@ -4,6 +4,48 @@
VPet-Simulator.Core
+
+
+ WorkTimer.xaml 的交互逻辑
+
+
+ WorkTimer
+
+
+
+
+ 显示模式
+ 0 = 默认
+ 1 = 剩余时间
+ 2 = 已获取(金钱/等级)
+
+
+
+
+ 累计获得的钱/经验值
+
+
+
+
+ 开始时间
+
+
+
+
+ 最大时间(分钟)
+
+
+
+
+ UI相关显示
+
+
+
+
+
+ InitializeComponent
+
+
Main.xaml 的交互逻辑
@@ -24,7 +66,12 @@
- 菜单栏
+ 消息栏
+
+
+
+
+ 工作显示栏
@@ -47,6 +94,12 @@
自动加载触摸事件
+
+
+ 播放语音
+
+ 语音位置
+
清理所有状态
@@ -62,6 +115,11 @@
默认循环次数
+
+
+ 以标准形式显示当前默认状态
+
+
显示默认情况
@@ -144,6 +202,46 @@
显示睡觉情况 (强制)
+
+
+ 显示工作情况
+
+
+
+
+ 显示工作情况结束
+
+
+
+
+ 显示工作情况循环
+
+
+
+
+ 显示工作情况
+
+
+
+
+ 显示工作情况循环
+
+
+
+
+ 显示工作情况结束
+
+
+
+
+ 显示学习情况
+
+
+
+
+ 显示学习情况
+
+
显示拖拽情况
@@ -284,13 +382,12 @@
显示掉落向右
-
+
显示动画
动画类型
动画结束后操作
- 是否储存随机数字典
@@ -350,6 +447,41 @@
启用智能移动
智能移动周期
+
+
+ 当前状态
+
+
+
+
+ 当前正在的状态
+
+
+
+
+ 默认:啥都没干
+
+
+
+
+ 正在干活1
+
+
+
+
+ 正在干活1
+
+
+
+
+ 学习中
+
+
+
+
+ 睡觉
+
+
MainGrid Name Field
@@ -799,6 +931,51 @@
关机
+
+
+ 学习 (开始)
+
+
+
+
+ 学习 (循环)
+
+
+
+
+ 学习 (结束)
+
+
+
+
+ 工作 (开始)
+
+
+
+
+ 工作 (循环)
+
+
+
+
+ 工作 (结束)
+
+
+
+
+ 直播 (开始)
+
+
+
+
+ 直播 (循环)
+
+
+
+
+ 直播 (结束)
+
+
图像字典
@@ -834,13 +1011,7 @@
随机数字典(用于确保随机动画不会错位)
-
-
- 查找动画
-
- 动画类型
- 状态类型,找不到就找相同动画类型
- 是否储存随机数字典
+
@@ -1404,31 +1575,6 @@
存档行
-
-
- 当前正在的状态
-
-
-
-
- 默认:啥都没干
-
-
-
-
- 正在干活, workingobj指示正在干啥活
-
-
-
-
- 学习中
-
-
-
-
- 玩耍中
-
-
强类型资源类，用于查找本地化字符串等。
diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.dll b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.dll
index 3418a7b..27ca326 100644
Binary files a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.dll and b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.dll differ
diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.xml b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.xml
index c5a25b9..7a9db3f 100644
--- a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.xml
+++ b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.xml
@@ -108,7 +108,7 @@
- 储存游戏 (可以写 Save.Other 储存设置和数据等)
+ 储存游戏 (可以写 GameSave.Other 储存设置和数据等)
diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet.Plugin.DemoClock.dll b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet.Plugin.DemoClock.dll
index 592ab96..60c98d6 100644
Binary files a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet.Plugin.DemoClock.dll and b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet.Plugin.DemoClock.dll differ
diff --git a/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj b/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj
index 507f76d..ac6db55 100644
--- a/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj
+++ b/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj
@@ -38,8 +38,8 @@
..\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll
-
- ..\packages\Panuon.WPF.UI.1.1.11-beta\lib\net462\Panuon.WPF.UI.dll
+
+ ..\packages\Panuon.WPF.UI.1.1.11.8\lib\net462\Panuon.WPF.UI.dll
@@ -53,10 +53,10 @@
4.0
- ..\packages\VPet-Simulator.Core.0.1.3\lib\net462\VPet-Simulator.Core.dll
+ ..\packages\VPet-Simulator.Core.0.1.6\lib\net462\VPet-Simulator.Core.dll
- ..\packages\VPet-Simulator.Windows.Interface.0.1.2\lib\net462\VPet-Simulator.Windows.Interface.dll
+ ..\packages\VPet-Simulator.Windows.Interface.0.1.4\lib\net462\VPet-Simulator.Windows.Interface.dll
diff --git a/VPet.Plugin.DemoClock/packages.config b/VPet.Plugin.DemoClock/packages.config
index b26047b..7476ba6 100644
--- a/VPet.Plugin.DemoClock/packages.config
+++ b/VPet.Plugin.DemoClock/packages.config
@@ -2,7 +2,7 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.dll b/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.dll
index 1bf2100..947cda9 100644
Binary files a/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.dll and b/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.dll differ
diff --git a/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.xml b/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.xml
index 6176599..209a2e4 100644
--- a/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.xml
+++ b/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.xml
@@ -96,10 +96,20 @@
- 播放语音
+ 播放语音 语音播放时不会停止播放说话表情
语音位置
+
+
+ 声音音量
+
+
+
+
+ 当前是否正在播放
+
+
清理所有状态
diff --git a/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet.Plugin.VPetTTS.dll b/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet.Plugin.VPetTTS.dll
index 045b72e..43cad12 100644
Binary files a/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet.Plugin.VPetTTS.dll and b/VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet.Plugin.VPetTTS.dll differ
diff --git a/VPet.Plugin.EdgeTTS/EdgeTTS.cs b/VPet.Plugin.EdgeTTS/EdgeTTS.cs
index ce8d36f..aef8e03 100644
--- a/VPet.Plugin.EdgeTTS/EdgeTTS.cs
+++ b/VPet.Plugin.EdgeTTS/EdgeTTS.cs
@@ -40,7 +40,7 @@ namespace VPet.Plugin.VPetTTS
}
public override void LoadDIY()
{
- MW.Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.Setting, "EdgeTTS", Setting);
+ MW.Main.ToolBar.AddMenuButton(VPet_Simulator.Core.ToolBar.MenuType.DIY, "EdgeTTS", Setting);
}
private void Main_OnSay(string saythings)
{//说话语音
diff --git a/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj b/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj
index d185e2b..45f2201 100644
--- a/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj
+++ b/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj
@@ -61,7 +61,7 @@
- ..\packages\VPet-Simulator.Core.0.1.5\lib\net462\VPet-Simulator.Core.dll
+ ..\packages\VPet-Simulator.Core.0.1.7\lib\net462\VPet-Simulator.Core.dll
..\packages\VPet-Simulator.Windows.Interface.0.1.4\lib\net462\VPet-Simulator.Windows.Interface.dll
diff --git a/VPet.Plugin.EdgeTTS/packages.config b/VPet.Plugin.EdgeTTS/packages.config
index 7461ece..fc0e791 100644
--- a/VPet.Plugin.EdgeTTS/packages.config
+++ b/VPet.Plugin.EdgeTTS/packages.config
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/VPet.Plugin.EdgeTTS/winSetting.xaml.cs b/VPet.Plugin.EdgeTTS/winSetting.xaml.cs
index 39b9f32..0d6644e 100644
--- a/VPet.Plugin.EdgeTTS/winSetting.xaml.cs
+++ b/VPet.Plugin.EdgeTTS/winSetting.xaml.cs
@@ -29,7 +29,7 @@ namespace VPet.Plugin.VPetTTS
InitializeComponent();
this.vts = vts;
SwitchOn.IsChecked = vts.Set.Enable;
- //TODO VolumeSilder
+ VolumeSilder.Value = vts.MW.Main.PlayVoiceVolume * 100;
PitchSilder.Value = vts.Set.Pitch;
RateSilder.Value = vts.Set.Rate;
CombSpeaker.Text = vts.Set.Speaker;
@@ -41,6 +41,7 @@ namespace VPet.Plugin.VPetTTS
vts.Set.Pitch = PitchSilder.Value;
vts.Set.Rate = RateSilder.Value;
vts.Set.Speaker = CombSpeaker.Text;
+ vts.MW.Main.PlayVoiceVolume = VolumeSilder.Value / 100;
vts.MW.Set.Remove("DemoClock");
vts.MW.Set.Add(LPSConvert.SerializeObject(vts.Set, "DemoClock"));
foreach (var tmpfile in Directory.GetFiles(GraphCore.CachePath + @"\voice"))
@@ -52,7 +53,7 @@ namespace VPet.Plugin.VPetTTS
finally
{
- }
+ }
}
Close();
}