Merge branch develop v0.1.1.3200-Beta

anoyetta-academy · Jul 5, 2019 · 6fdef7a · 6fdef7a
2 parents 985263c + 47e3fa2
commit 6fdef7a
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/CURRENT_VERSION b/CURRENT_VERSION
@@ -1 +1 @@
-v0.1.0.3116-Beta
+v0.1.1.3200-Beta
diff --git a/RELEASE_NOTES.xml b/RELEASE_NOTES.xml
@@ -29,4 +29,15 @@
     * PCをターゲットまたはフォーカスターゲットしたときそのPCのアクションをキャプチャーするようにした
     </description>
   </note>
+
+  <note>
+    <version>0.1.1.3200</version>
+    <channel>Beta</channel>
+    <timestamp>2019-07-06T00:39:55.4393806+09:00</timestamp>
+    <uri>https://github.com/anoyetta-academy/kagami/releases/download/v0.1.1.3200-Beta/kagami_v0_1_1_3200_Beta.zip</uri>
+    <description>
+    * Beta1.1
+    * ターゲット, フォーカスターゲットのキャプチャーをOFFに出来ない不具合を修正した
+    </description>
+  </note>
 </release_notes>
diff --git a/source/kagami.Core/Helpers/FFXIVPluginHelper.cs b/source/kagami.Core/Helpers/FFXIVPluginHelper.cs
@@ -37,6 +37,8 @@ private FFXIVPluginHelper()
         private static readonly double AttachSubscribeInterval = 3000;
         private static readonly double CombatantSubscribeInterval = 500;
 
+        private KagamiOverlayConfig Config => KagamiAddonCore.Current.Config as KagamiOverlayConfig;
+
         public void Start()
         {
             this.pluginSubscriber = new ThreadWorker(() =>
@@ -111,8 +113,24 @@ public void Stop()
         private void DoRefreshCombatant()
         {
             this.CurrentPlayer = this.DataRepository?.GetCombatantList().FirstOrDefault();
-            this.CurrentTarget = this.DataRepository?.GetCombatantByOverlayType(OverlayType.Target);
-            this.CurrentFocusTarget = this.DataRepository?.GetCombatantByOverlayType(OverlayType.FocusTarget);
+
+            if (Config.IsEnableTargetCapture)
+            {
+                this.CurrentTarget = this.DataRepository?.GetCombatantByOverlayType(OverlayType.Target);
+            }
+            else
+            {
+                this.CurrentTarget = null;
+            }
+
+            if (Config.IsEnableFocusTargetCapture)
+            {
+                this.CurrentFocusTarget = this.DataRepository?.GetCombatantByOverlayType(OverlayType.FocusTarget);
+            }
+            else
+            {
+                this.CurrentFocusTarget = null;
+            }
         }
     }
 

diff --git a/source/kagami.Core/Version.cs b/source/kagami.Core/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.1.0.3116")]
+[assembly: AssemblyVersion("0.1.1.3200")]
 [assembly: AssemblyConfiguration("Beta")]
diff --git a/source/kagami/Version.cs b/source/kagami/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.1.0.3116")]
+[assembly: AssemblyVersion("0.1.1.3200")]
 [assembly: AssemblyConfiguration("Beta")]