減算カウンタが正しく動作していなかったのを修正

TORISOUP · May 24, 2017 · 6f5aee9 · 6f5aee9
1 parent ad27d6e
commit 6f5aee9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Inferno/InfernoScripts/InfernoCore/InfernoScript.cs b/Inferno/InfernoScripts/InfernoCore/InfernoScript.cs
@@ -318,7 +318,7 @@ protected InfernoScript()
                 {
                     foreach (var c in _counterList)
                     {
-                        c.Update(Interval);
+                        c.Update(100);
                     }
                     //完了状態にあるタイマを全て削除
                     _counterList.RemoveAll(x => x.IsCompleted);

diff --git a/Inferno/InfernoScripts/Parupunte/ParupunteCore.cs b/Inferno/InfernoScripts/Parupunte/ParupunteCore.cs
@@ -116,9 +116,10 @@ protected override void Setup()
 
             OnRecievedInfernoEvent
                 .OfType<IEventMessage, IsonoMessage>()
+                .Where(c => IsonoMethod(c.Command, true))
                 .ThrottleFirst(TimeSpan.FromSeconds(5), InfernoScriptScheduler)
                 .Retry()
-                .Subscribe();
+                .Subscribe(c => IsonoMethod(c.Command, false));
 
             #endregion EventHook
 
@@ -156,27 +157,27 @@ protected override void Setup()
 
         }
 
-        private bool IsonoMethod(string command)
+        private bool IsonoMethod(string command, bool isDryRun)
         {
             var c = command;
 
             if (c.Contains("とまれ"))
             {
-                ParupunteStop();
+                if (isDryRun) ParupunteStop();
                 return true;
             }
 
             if (IsActive) return false;
 
             if (c.Contains("ぱるぷんて"))
             {
-                ParupunteStart(ChooseParupounteScript());
+                if (isDryRun) ParupunteStart(ChooseParupounteScript());
                 return true;
             }
 
             var result = IsonoParupunteScripts.Keys.FirstOrDefault(x => command.Contains(x));
             if (string.IsNullOrEmpty(result) || !IsonoParupunteScripts.ContainsKey(result)) return false;
-            ParupunteStart(IsonoParupunteScripts[result]);
+            if (isDryRun) ParupunteStart(IsonoParupunteScripts[result]);
             return true;
         }