角色改为使用梦魇脱手声骸

config.py

@@ -85,11 +85,6 @@ def calculate_pc_exe_path(running_path):
         },
     },
     'about': """
-    <h3>OK-WW</h3>
-    <p>GitHub <a href="https://github.com/ok-oldking/ok-wuthering-waves">https://github.com/ok-oldking/ok-wuthering-waves</></p>
-    <p>Report a BUG <a href="https://github.com/ok-oldking/ok-wuthering-waves/issues/new?assignees=ok-oldking&labels=bug&projects=&template=%E6%8A%A5%E5%91%8Abug-.md&title=%5BBUG%5D">https://github.com/ok-oldking/ok-wuthering-waves/issues/new?assignees=ok-oldking&labels=bug&projects=&template=%E6%8A%A5%E5%91%8Abug-.md&title=%5BBUG%5D</></p>
-    <p>QQ群:<a href="https://qm.qq.com/q/qMezq2IDGU">970523295</a></p>
-    <p>QQ频道:<a href="https://pd.qq.com/s/75758wrmp">OK-WW</a></p>
     <p style="color:red;">
     <strong>本软件是免费开源的。</strong> 如果你被收费，请立即退款。请访问QQ频道或GitHub下载最新的官方版本。
     </p>

requirements.txt

@@ -37,7 +37,7 @@ numpy==1.26.4
     #   openvino
     #   rapidocr-openvino
     #   shapely
-ok-script==0.0.431
+ok-script==0.0.432
     # via -r .\requirements.in
 opencv-contrib-python==4.10.0.84
     # via -r .\requirements.in

src/char/Changli.py

@@ -34,7 +34,7 @@ def do_perform(self):
             self.send_resonance_key()
             self.enhanced_normal = True
             self.normal_attack()
-        elif self.click_echo(1.5):
+        elif self.click_echo():
             self.logger.debug('Changli click echo success')
             pass
         else:

src/char/Encore.py

@@ -38,7 +38,7 @@ def do_perform(self):
             self.logger.info('Encore nothing is available')
         if self.echo_available():
             self.logger.debug('click_echo')
-            self.click_echo(duration=1.5)
+            self.click_echo()
             return self.switch_next_char()
         self.switch_next_char()
 

src/char/Jianxin.py

@@ -11,5 +11,5 @@ def do_perform(self):
         if self.resonance_available():
             self.click_resonance()
         if self.echo_available():
-            self.click_echo(duration=0.8)
+            self.click_echo()
         self.switch_next_char()

src/char/Jiyan.py

@@ -30,5 +30,5 @@ def do_perform(self):
         if not self.is_forte_full() and self.resonance_available():
             self.click_resonance(post_sleep=1.0)
         if self.echo_available():
-            self.click_echo(duration=1.0)
+            self.click_echo()
         self.switch_next_char()

src/char/Xiangliyao.py

@@ -17,7 +17,7 @@ def do_perform(self):
                 self.continues_normal_attack(1)
         elif self.echo_available():
             self.logger.debug('click_echo')
-            self.click_echo(duration=1.5)
+            self.click_echo()
         else:
             self.click_resonance(send_click=True)
         self.switch_next_char()

src/char/Yinlin.py

@@ -14,11 +14,7 @@ def do_perform(self):
         elif self.click_resonance(send_click=False)[0]:
             self.sleep(0.1)
         elif self.echo_available():
-            echo_key = self.get_echo_key()
-            self.sleep(0.1)
-            self.task.send_key_down(echo_key)
-            self.sleep(.6)
-            return self.switch_next_char(post_action=self.echo_post_action)
+            self.click_echo()
         else:
             self.heavy_attack()
         self.switch_next_char()

src/task/BaseWWTask.py

@@ -217,6 +217,8 @@ def run_until(self, condiction, direction, time_out, raise_if_not_found=False, r
             return
         self.send_key_down(direction)
         if running:
+            self.sleep(0.5)
+            logger.debug(f'run_until condiction {condiction} direction {direction}')
             self.mouse_down(key='right')
         self.sleep(1)
         result = self.wait_until(condiction, time_out=time_out,