fix some script bug

babalae · Jan 14, 2024 · d888a5f · d888a5f
1 parent 4b5b8f9
commit d888a5f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs
@@ -454,11 +454,12 @@ public void Charge(int ms = 0)
                 {
                     return;
                 }
+
                 Simulation.SendInputEx.Mouse.MoveMouseBy(1000, 0);
                 ms -= 50;
                 Sleep(50, Cts);
             }
-            
+
             AutoFightContext.Instance().Simulator.LeftButtonUp();
         }
         else

diff --git a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
@@ -70,7 +70,19 @@ public void Execute(CombatScenes combatScenes)
             return;
         }
 
-        avatar.Switch();
+        // 非宏类脚本，等待切换角色成功
+        if (Method != Method.Wait
+            && Method != Method.MouseDown
+            && Method != Method.MouseUp
+            && Method != Method.Click
+            && Method != Method.MoveBy
+            && Method != Method.KeyDown
+            && Method != Method.KeyUp
+            && Method != Method.KeyPress)
+        {
+            avatar.Switch();
+        }
+
         if (Method == Method.Skill)
         {
             var hold = Args != null && Args.Contains("hold");