From 83eeb604b61ce230074e850c0e68542a3050ba1e Mon Sep 17 00:00:00 2001 From: anoyetta Date: Sat, 25 Sep 2021 23:34:38 +0900 Subject: [PATCH 1/4] added ignore .lnk --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a4c47da7..783052d7 100644 --- a/.gitignore +++ b/.gitignore @@ -314,3 +314,5 @@ Advanced Combat Tracker.exe source_dotnet5/ resources/desktop.ini + +*.lnk From a5b60191395ae513f3eefa1aa931552ca9abf836 Mon Sep 17 00:00:00 2001 From: anoyetta Date: Sun, 7 Nov 2021 19:58:20 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Discord=E6=A9=9F=E8=83=BD=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=ABYukkuri=E3=81=AE=E7=B5=82=E4=BA=86=E6=99=82=E3=81=ABDi?= =?UTF-8?q?scord=E3=81=AEDisconnect=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA?= =?UTF-8?q?=E3=81=95=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Discord/Models/DiscordNetModel.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs index e4b79623..bb99d5a4 100644 --- a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs +++ b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs @@ -171,9 +171,14 @@ public void Dispose() DiscordBridge.Instance.SendMessageDelegate = null; DiscordBridge.Instance.SendSpeakingDelegate = null; - this.Disconnect(); + if (this.isConnected) + { + this.Disconnect(); + } } + private bool isConnected; + public async void Connect( bool isInitialize = false) { @@ -207,6 +212,8 @@ public async void Connect( await this.discordClient.LoginAsync(TokenType.Bot, this.Config.Token); await Task.Delay(TimeSpan.FromSeconds(0.25)); await this.discordClient.StartAsync(); + + this.isConnected = true; } catch (Exception ex) { @@ -246,6 +253,8 @@ public async void Disconnect() this.discordClient?.Dispose(); this.discordClient = null; } + + this.isConnected = false; } public async void JoinVoiceChannel() From baf679c436594f6e0c44b5383ef81cde200ba60b Mon Sep 17 00:00:00 2001 From: anoyetta Date: Sun, 7 Nov 2021 20:06:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?CeVIO=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E5=8C=96=E3=81=AE=E5=87=A6=E7=90=86=E3=81=AB=E3=81=A4?= =?UTF-8?q?=E3=81=84=E3=81=A6=E5=BF=85=E8=A6=81=E3=81=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=AF=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=95?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ACT.TTSYukkuri.Core/PluginCore.cs | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs index 9df1132a..1fa8cdbd 100644 --- a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs +++ b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs @@ -1,3 +1,12 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Windows.Forms.Integration; using ACT.TTSYukkuri.Config; using ACT.TTSYukkuri.Config.Views; using ACT.TTSYukkuri.Discord.Models; @@ -10,15 +19,6 @@ using FFXIV.Framework.WPF; using FFXIV.Framework.WPF.Views; using NLog; -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Windows.Forms; -using System.Windows.Forms.Integration; namespace ACT.TTSYukkuri { @@ -474,8 +474,11 @@ await Task.Run(() => // CeVIOをアイコン化する if (Settings.Default.TTS == TTSType.Sasara) { - CevioTrayManager.Start(); - CevioTrayManager.ToIcon(); + if (Settings.Default.SasaraSettings.IsHideCevioWindow) + { + CevioTrayManager.Start(); + CevioTrayManager.ToIcon(); + } } if (this.PluginStatusLabel != null) @@ -521,8 +524,11 @@ public void DeInitPlugin() try { // CeVIO のアイコン化を解除する - CevioTrayManager.RestoreWindow(); - CevioTrayManager.End(); + if (Settings.Default.SasaraSettings.IsHideCevioWindow) + { + CevioTrayManager.RestoreWindow(); + CevioTrayManager.End(); + } // 設定を保存する Settings.Default.Save(); From d225301e86d9af41ce2a9ce672d677aa7902b4eb Mon Sep 17 00:00:00 2001 From: anoyetta Date: Sun, 7 Nov 2021 20:04:33 +0900 Subject: [PATCH 4/4] release v9.3.7-211107.2014 --- source/@MasterVersion.txt | 2 +- source/ACT.Hojoring.Common/Version.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt index 9443cc45..6caae592 100644 --- a/source/@MasterVersion.txt +++ b/source/@MasterVersion.txt @@ -1 +1 @@ -v9.3.6 +v9.3.7 diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs index f285eff2..69d70b31 100644 --- a/source/ACT.Hojoring.Common/Version.cs +++ b/source/ACT.Hojoring.Common/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("9.3.0.6")] -[assembly: AssemblyFileVersion("9.3.0.6")] +[assembly: AssemblyVersion("9.3.0.7")] +[assembly: AssemblyFileVersion("9.3.0.7")]