From 370a62ce275df24164d19438755cfb1aaf56407c Mon Sep 17 00:00:00 2001 From: ZouJin Date: Fri, 26 May 2023 03:50:18 +1000 Subject: [PATCH] =?UTF-8?q?EdgeTTS=20=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPet.Plugin.DemoClock/1100_DemoClock/info.lps | 4 +- .../plugin/VPet.Plugin.DemoClock.dll | Bin 38400 -> 38400 bytes VPet.Plugin.DemoClock/DemoClock.cs | 11 ++- VPet.Plugin.DemoClock/winSetting.xaml | 2 +- VPet.Plugin.DemoClock/winSetting.xaml.cs | 5 ++ .../plugin/VPet.Plugin.VPetTTS.dll | Bin 7168 -> 14336 bytes .../{VPETTTS.cs => EdgeTTS.cs} | 51 +++++++----- VPet.Plugin.EdgeTTS/Setting.cs | 11 ++- .../VPet.Plugin.VPetTTS.csproj | 12 ++- VPet.Plugin.EdgeTTS/winSetting.xaml | 74 ++++++++++++++++++ VPet.Plugin.EdgeTTS/winSetting.xaml.cs | 65 +++++++++++++++ 11 files changed, 206 insertions(+), 29 deletions(-) rename VPet.Plugin.EdgeTTS/{VPETTTS.cs => EdgeTTS.cs} (61%) create mode 100644 VPet.Plugin.EdgeTTS/winSetting.xaml create mode 100644 VPet.Plugin.EdgeTTS/winSetting.xaml.cs diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/info.lps b/VPet.Plugin.DemoClock/1100_DemoClock/info.lps index 575978c..214c468 100644 --- a/VPet.Plugin.DemoClock/1100_DemoClock/info.lps +++ b/VPet.Plugin.DemoClock/1100_DemoClock/info.lps @@ -1,2 +1,4 @@ vupmod#DemoClock:|author#lorisyounger:|gamever#100:|ver#100:| -intro#给桌宠添加一个时钟显示的功能,这算是代码嵌入类型MOD的DEMO:| \ No newline at end of file +intro#给桌宠添加一个时钟显示的功能/com这算是代码嵌入类型MOD的DEMO:| +authorid#253101309:| +itemid#2980456794:| \ No newline at end of file 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 1da3639b018a5700aa4ecfb39ff206e86663e8dc..592ab96ef623a79207e2688028f36881284933cc 100644 GIT binary patch delta 13168 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 delta 13076 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 diff --git a/VPet.Plugin.DemoClock/DemoClock.cs b/VPet.Plugin.DemoClock/DemoClock.cs index 6a653a0..954069e 100644 --- a/VPet.Plugin.DemoClock/DemoClock.cs +++ b/VPet.Plugin.DemoClock/DemoClock.cs @@ -62,6 +62,7 @@ namespace VPet.Plugin.DemoClock public MenuItem mTiming; public long CountDownLength; + public winSetting winSetting; public DemoClock(IMainWindow mainwin) : base(mainwin) { } @@ -140,7 +141,15 @@ namespace VPet.Plugin.DemoClock public override void Setting() { - new winSetting(this).Show(); + if (winSetting == null) + { + winSetting = new winSetting(this); + winSetting.Show(); + } + else + { + winSetting.Topmost = true; + } } } } diff --git a/VPet.Plugin.DemoClock/winSetting.xaml b/VPet.Plugin.DemoClock/winSetting.xaml index ae7b68e..afa7837 100644 --- a/VPet.Plugin.DemoClock/winSetting.xaml +++ b/VPet.Plugin.DemoClock/winSetting.xaml @@ -5,7 +5,7 @@ xmlns:local="clr-namespace:VPet.Plugin.DemoClock" mc:Ignorable="d" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Title="Demo Clock 设置" Width="450" FontSize="16" Height="Auto" ResizeMode="NoResize" WindowState="Normal" SizeToContent="Height" - Background="{DynamicResource PrimaryLighter}"> + Background="{DynamicResource PrimaryLighter}" Closed="Window_Closed"> diff --git a/VPet.Plugin.DemoClock/winSetting.xaml.cs b/VPet.Plugin.DemoClock/winSetting.xaml.cs index 3861057..7f26d46 100644 --- a/VPet.Plugin.DemoClock/winSetting.xaml.cs +++ b/VPet.Plugin.DemoClock/winSetting.xaml.cs @@ -169,5 +169,10 @@ namespace VPet.Plugin.DemoClock break; } } + + private void Window_Closed(object sender, EventArgs e) + { + Master.winSetting = null; + } } } 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 d4954bede48ee7b592fd44009a564383f6dda7df..045b72e4cde53504106a3203cdbc2ac73361cded 100644 GIT binary patch literal 14336 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 K<@x{Tf&T>!e50oT delta 3225 zcmaJ^3v5)!6+QEQ`!Qa2*B|f)SlfKo#$Fo;2>}EKY!W9B?AkzGNXlZrn2kTr?5=T* zW!6p`CO{l6wq-s%=NEB$*lvJrugqniXCbX%VL_m9Hb|FMc zI;%Nz?wvdL-ub+FZ^sA6mpt|D2ijKt>l$+95-KBkq5&wR!pbUZ7O{=6HnIXi#WlcC z;%zfveDXpp@b*GrgY0Pp-q0s23Z`rWrcgH6vBX`_Q0sPzdH#k1sv@j~?g3HdYb2BY zirtsREZ;UV20*F%7g1S~C*!l+&#J-1A1Z-{sequfdon9DJsJZ1nm#7zqo$z2z(HD4 z2x-%bBY)F@RG0>1GG%R)as3Ww=TFjN&?zGGTXp$bicYLC8XNPcXjYV+^Odw`nzW_a zV01cJw1iMsbX%LrsY|JztBuMOoHBClrbS;?s+`=JL11DQ&ZsFMlpS70r+RcII}grg z!qHh|Du~~TM#yWY-QmzmRZ!({?*1BWRL(`$Ms;Kuk85E`PMZH2^^qo<}CBaLWSp+KS{LY zSk51(CCisP4A7x_!Khk!Q=8STveS~^G*71;^V_UVc9p&7Ipyc;$Y-wU!OWEL_RjuxG zwo{gcqS#z?#OGr;d@2^9SRGn$Ex^45LxX1$vYQEj=Om+^3JwIb1$`=+XHGq;vIQ>d z+1A2`n$NWGur9G!d)t_bYNl^tg|^zT@Oy?lB8F`0v7JhOtrGXZUeMzfQ{^nu^seKj9G@%dr?TsZdzIyE{HVREFvhySv5dlH3Kgf zGVpa>4!)1Q7V=dR9)+!qs$`IFNhi}#j4xV5q&8-c?X%)yk*uBx0!z>?l-Rz zhw%?$<~?zZ%};n03B0CD{<`AdA+|=O^S#p#8>Q55Q_>mCX1W?aR?-A6n?Xu%R!GY; z-mT&z?(}&j?e+GGk11WuNxOug^j=OnC$2NKtC^g5ky9{GQ7PT*_5R5Ch*?)FX~KKl z2vS;@>-#B}+``hF^pXxP=+2ztoWj$@%uR7g3DA@&cJnmLbE@%NY!jvcb_*ZzU6D`xg&{Skbji;u zo+N5K$#R6L9yN=o@!)yr$4k_BvV7!zqQ+IpBcDRlc-`e^CG$Ob?Y~~SAz4b<(r(op?8~rTjnrqfWnE&x#@fU{H;H>Fe3$!vc#az_sCS<%C_H(ppiLON z;(bGIw5ZB`sHpPpHSw+;c56Jn0~?cxTbabxCgc6~u#@clqMTygeeS1474Gcfd5d$C z`HKB$pWT&CI0I-(B*~oQNXx*Z4rG$;gLb^vPO2;wcNb5Kxx>@GRorB6AL`+3d)7PM zb_%KZNO}je?w?+|p!pk#R5}GaO<3a$bj8zH>m>WxG}$RTnTYo#cH0}aKgL+uAZ~3* z^<2)qbtv85l}rq#v97h9BX`-!H2R0pvOb;|*vxfthTStI^#v$sf{lJS+?hUN7kXX2 zbVXolGhZw{?CRjJ-CbEa*a7XviqNcq%Z&$KozwYY9#+7J2;tQu5GF||B*lOPP0HbB z!z04$t%xo(&8u6KBM95<3a<}%fb}}g_Tr7F-KP3|;s3J# xRw "EdgeTTS"; } } diff --git a/VPet.Plugin.EdgeTTS/Setting.cs b/VPet.Plugin.EdgeTTS/Setting.cs index e664099..79010fe 100644 --- a/VPet.Plugin.EdgeTTS/Setting.cs +++ b/VPet.Plugin.EdgeTTS/Setting.cs @@ -9,12 +9,6 @@ namespace VPet.Plugin.VPetTTS { public class Setting { - /// - /// 音量大小 - /// - [Line] - public int Volume { get; set; } = 100; - /// /// 语速 /// @@ -54,5 +48,10 @@ namespace VPet.Plugin.VPetTTS /// [Line] public string Speaker { get; set; } = "zh-CN-XiaoyiNeural"; + /// + /// 启用EdgeTTS + /// + [Line] + public bool Enable { get; set; } = true; } } diff --git a/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj b/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj index 8b6269b..d185e2b 100644 --- a/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj +++ b/VPet.Plugin.EdgeTTS/VPet.Plugin.VPetTTS.csproj @@ -53,6 +53,7 @@ + @@ -68,12 +69,21 @@ - + + + winSetting.xaml + + + + Designer + MSBuild:Compile + + \ No newline at end of file diff --git a/VPet.Plugin.EdgeTTS/winSetting.xaml b/VPet.Plugin.EdgeTTS/winSetting.xaml new file mode 100644 index 0000000..196a0a9 --- /dev/null +++ b/VPet.Plugin.EdgeTTS/winSetting.xaml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + zh-CN-XiaoxiaoNeural + zh-CN-XiaoyiNeural + zh-CN-YunjianNeural + zh-CN-YunxiNeural + zh-CN-YunxiaNeural + zh-CN-YunyangNeural + zh-CN-liaoning-XiaobeiNeural + zh-CN-shaanxi-XiaoniNeural + zh-HK-HiuGaaiNeural + zh-HK-HiuMaanNeural + zh-HK-WanLungNeural + zh-TW-HsiaoChenNeural + zh-TW-HsiaoYuNeural + zh-TW-YunJheNeural + +