EdgeTTS 支持设置功能

VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Core.xml

@@ -4,6 +4,48 @@
         <name>VPet-Simulator.Core</name>
     </assembly>
     <members>
+        <member name="T:VPet_Simulator.Core.WorkTimer">
+            <summary>
+            WorkTimer.xaml 的交互逻辑
+            </summary>
+            <summary>
+            WorkTimer
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.WorkTimer.DisplayType">
+            <summary>
+            显示模式
+            0 = 默认
+            1 = 剩余时间
+            2 = 已获取(金钱/等级)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.WorkTimer.GetCount">
+            <summary>
+            累计获得的钱/经验值
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.WorkTimer.StartTime">
+            <summary>
+            开始时间
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.WorkTimer.MaxTime">
+            <summary>
+            最大时间(分钟)
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.WorkTimer.M_TimeUIHandle(VPet_Simulator.Core.Main)">
+            <summary>
+            UI相关显示
+            </summary>
+            <param name="m"></param>
+        </member>
+        <member name="M:VPet_Simulator.Core.WorkTimer.InitializeComponent">
+            <summary>
+            InitializeComponent
+            </summary>
+        </member>
         <member name="T:VPet_Simulator.Core.Main">
             <summary>
             Main.xaml 的交互逻辑
@@ -24,7 +66,12 @@
         </member>
         <member name="F:VPet_Simulator.Core.Main.MsgBar">
             <summary>
-            菜单栏
+            消息栏
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.WorkTimer">
+            <summary>
+            工作显示栏
             </summary>
         </member>
         <member name="E:VPet_Simulator.Core.Main.TimeHandle">
@@ -47,6 +94,12 @@
             自动加载触摸事件
             </summary>
         </member>
+        <member name="M:VPet_Simulator.Core.Main.PlayVoice(System.Uri)">
+            <summary>
+            播放语音
+            </summary>
+            <param name="VoicePath">语音位置</param>
+        </member>
         <member name="M:VPet_Simulator.Core.Main.CleanState">
             <summary>
             清理所有状态
@@ -62,6 +115,11 @@
             默认循环次数
             </summary>
         </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayToNomal">
+            <summary>
+            以标准形式显示当前默认状态
+            </summary>
+        </member>
         <member name="M:VPet_Simulator.Core.Main.DisplayNomal">
             <summary>
             显示默认情况
@@ -144,6 +202,46 @@
             显示睡觉情况 (强制)
             </summary>
         </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayWorkONE">
+            <summary>
+            显示工作情况
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayWorkONEend">
+            <summary>
+            显示工作情况结束
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayWorkONEing">
+            <summary>
+            显示工作情况循环
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayWorkTWO">
+            <summary>
+            显示工作情况
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayWorkTWOing">
+            <summary>
+            显示工作情况循环
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayWorkTWOend">
+            <summary>
+            显示工作情况结束
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayStudy">
+            <summary>
+            显示学习情况
+            </summary>
+        </member>
+        <member name="M:VPet_Simulator.Core.Main.DisplayStudying">
+            <summary>
+            显示学习情况
+            </summary>
+        </member>
         <member name="M:VPet_Simulator.Core.Main.DisplayRaised">
             <summary>
             显示拖拽情况
@@ -284,13 +382,12 @@
             显示掉落向右
             </summary>
         </member>
-        <member name="M:VPet_Simulator.Core.Main.Display(VPet_Simulator.Core.GraphCore.GraphType,System.Action,System.Boolean)">
+        <member name="M:VPet_Simulator.Core.Main.Display(VPet_Simulator.Core.GraphCore.GraphType,System.Action)">
             <summary>
             显示动画 
             </summary>
             <param name="Type">动画类型</param>
             <param name="EndAction">动画结束后操作</param>
-            <param name="storernd">是否储存随机数字典</param>
         </member>
         <member name="M:VPet_Simulator.Core.Main.Display(VPet_Simulator.Core.IGraph,System.Action)">
             <summary>
@@ -350,6 +447,41 @@
             <param name="smartMove">启用智能移动</param>
             <param name="SmartMoveInterval">智能移动周期</param>
         </member>
+        <member name="F:VPet_Simulator.Core.Main.State">
+            <summary>
+            当前状态
+            </summary>
+        </member>
+        <member name="T:VPet_Simulator.Core.Main.WorkingState">
+            <summary>
+            当前正在的状态
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.WorkingState.Nomal">
+            <summary>
+            默认:啥都没干
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.WorkingState.WorkONE">
+            <summary>
+            正在干活1
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.WorkingState.WorkTWO">
+            <summary>
+            正在干活1
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.WorkingState.Study">
+            <summary>
+            学习中 
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.WorkingState.Sleep">
+            <summary>
+            睡觉
+            </summary>
+        </member>
         <member name="F:VPet_Simulator.Core.Main.MainGrid">
             <summary>
             MainGrid Name Field
@@ -799,6 +931,51 @@
             关机
             </summary>
         </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.Study_A_Start">
+            <summary>
+            学习 (开始)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.Study_B_Loop">
+            <summary>
+            学习 (循环)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.Study_C_End">
+            <summary>
+            学习 (结束)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.WorkONE_A_Start">
+            <summary>
+            工作 (开始)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.WorkONE_B_Loop">
+            <summary>
+            工作 (循环)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.WorkONE_C_End">
+            <summary>
+            工作 (结束)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.WorkTWO_A_Start">
+            <summary>
+            直播 (开始)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.WorkTWO_B_Loop">
+            <summary>
+            直播 (循环)
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.GraphCore.GraphType.WorkTWO_C_End">
+            <summary>
+            直播 (结束)
+            </summary>
+        </member>
         <member name="F:VPet_Simulator.Core.GraphCore.Graphs">
             <summary>
             图像字典
@@ -834,13 +1011,7 @@
             随机数字典(用于确保随机动画不会错位)
             </summary>
         </member>
-        <member name="M:VPet_Simulator.Core.GraphCore.FindGraph(VPet_Simulator.Core.GraphCore.GraphType,VPet_Simulator.Core.GameSave.ModeType,System.Boolean)">
+        <member name="M:VPet_Simulator.Core.GraphCore.FindGraph(VPet_Simulator.Core.GraphCore.GraphType,VPet_Simulator.Core.GameSave.ModeType)">
-            <summary>
-            查找动画
-            </summary>
-            <param name="type">动画类型</param>
-            <param name="mode">状态类型,找不到就找相同动画类型</param>
-            <param name="storernd">是否储存随机数字典</param>
             <returns></returns>
         </member>
         <member name="P:VPet_Simulator.Core.GraphCore.GraphTypeValue">
@@ -1404,31 +1575,6 @@
             </summary>
             <returns>存档行</returns>
         </member>
-        <member name="T:VPet_Simulator.Core.GameSave.WorkingState">
-            <summary>
-            当前正在的状态
-            </summary>
-        </member>
-        <member name="F:VPet_Simulator.Core.GameSave.WorkingState.Nomal">
-            <summary>
-            默认:啥都没干
-            </summary>
-        </member>
-        <member name="F:VPet_Simulator.Core.GameSave.WorkingState.Working">
-            <summary>
-            正在干活, workingobj指示正在干啥活
-            </summary>
-        </member>
-        <member name="F:VPet_Simulator.Core.GameSave.WorkingState.Studying">
-            <summary>
-            学习中 
-            </summary>
-        </member>
-        <member name="F:VPet_Simulator.Core.GameSave.WorkingState.Playing">
-            <summary>
-            玩耍中
-            </summary>
-        </member>
         <member name="T:VPet_Simulator.Core.Properties.Resources">
             <summary>
               强类型资源类，用于查找本地化字符串等。

VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet-Simulator.Windows.Interface.xml

@@ -108,7 +108,7 @@
         </member>
         <member name="M:VPet_Simulator.Windows.Interface.MainPlugin.Save">
             <summary>
-            储存游戏 (可以写 Save.Other 储存设置和数据等)
+            储存游戏 (可以写 GameSave.Other 储存设置和数据等)
             </summary>
         </member>
         <member name="M:VPet_Simulator.Windows.Interface.MainPlugin.Setting">

VPet.Plugin.DemoClock/VPet.Plugin.DemoClock.csproj

@@ -38,8 +38,8 @@
     <Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Panuon.WPF.UI, Version=1.1.11.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Panuon.WPF.UI, Version=1.1.11.8, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Panuon.WPF.UI.1.1.11-beta\lib\net462\Panuon.WPF.UI.dll</HintPath>
+      <HintPath>..\packages\Panuon.WPF.UI.1.1.11.8\lib\net462\Panuon.WPF.UI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -53,10 +53,10 @@
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="VPet-Simulator.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VPet-Simulator.Core.0.1.3\lib\net462\VPet-Simulator.Core.dll</HintPath>
+      <HintPath>..\packages\VPet-Simulator.Core.0.1.6\lib\net462\VPet-Simulator.Core.dll</HintPath>
     </Reference>
     <Reference Include="VPet-Simulator.Windows.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VPet-Simulator.Windows.Interface.0.1.2\lib\net462\VPet-Simulator.Windows.Interface.dll</HintPath>
+      <HintPath>..\packages\VPet-Simulator.Windows.Interface.0.1.4\lib\net462\VPet-Simulator.Windows.Interface.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />

VPet.Plugin.DemoClock/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="LinePutScript" version="1.8.0" targetFramework="net462" />
   <package id="Panuon.WPF" version="1.0.1" targetFramework="net462" />
-  <package id="Panuon.WPF.UI" version="1.1.11-beta" targetFramework="net462" />
+  <package id="Panuon.WPF.UI" version="1.1.11.8" targetFramework="net462" />
-  <package id="VPet-Simulator.Core" version="0.1.3" targetFramework="net462" />
+  <package id="VPet-Simulator.Core" version="0.1.6" targetFramework="net462" />
-  <package id="VPet-Simulator.Windows.Interface" version="0.1.2" targetFramework="net462" />
+  <package id="VPet-Simulator.Windows.Interface" version="0.1.4" targetFramework="net462" />
 </packages>

VPet.Plugin.EdgeTTS/1101_EdgeTTS/plugin/VPet-Simulator.Core.xml

@@ -96,10 +96,20 @@
         </member>
         <member name="M:VPet_Simulator.Core.Main.PlayVoice(System.Uri)">
             <summary>
-            播放语音
+            播放语音 语音播放时不会停止播放说话表情
             </summary>
             <param name="VoicePath">语音位置</param>
         </member>
+        <member name="P:VPet_Simulator.Core.Main.PlayVoiceVolume">
+            <summary>
+            声音音量
+            </summary>
+        </member>
+        <member name="F:VPet_Simulator.Core.Main.PlayingVoice">
+            <summary>
+            当前是否正在播放
+            </summary>
+        </member>
         <member name="M:VPet_Simulator.Core.Main.CleanState">
             <summary>
             清理所有状态

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)
         {//说话语音

VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj

@@ -61,7 +61,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="VPet-Simulator.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VPet-Simulator.Core.0.1.5\lib\net462\VPet-Simulator.Core.dll</HintPath>
+      <HintPath>..\packages\VPet-Simulator.Core.0.1.7\lib\net462\VPet-Simulator.Core.dll</HintPath>
     </Reference>
     <Reference Include="VPet-Simulator.Windows.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\VPet-Simulator.Windows.Interface.0.1.4\lib\net462\VPet-Simulator.Windows.Interface.dll</HintPath>

VPet.Plugin.EdgeTTS/packages.config

@@ -6,6 +6,6 @@
   <package id="Panuon.WPF" version="1.0.1" targetFramework="net462" />
   <package id="Panuon.WPF.UI" version="1.1.11.8" targetFramework="net462" />
   <package id="Serilog" version="2.12.0" targetFramework="net462" />
-  <package id="VPet-Simulator.Core" version="0.1.5" targetFramework="net462" />
+  <package id="VPet-Simulator.Core" version="0.1.7" targetFramework="net462" />
   <package id="VPet-Simulator.Windows.Interface" version="0.1.4" targetFramework="net462" />
 </packages>

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();
         }