Maa信用作战总开关

ArkMowers · Jul 16, 2023 · 7d97f9f · 7d97f9f
1 parent 8fbb4d5
commit 7d97f9f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/arknights_mower/__main__.py b/arknights_mower/__main__.py
@@ -125,6 +125,7 @@ def initialize(tasks, scheduler=None):
         maa_config['conn_preset'] = conf['maa_conn_preset']
         maa_config['touch_option'] = conf['maa_touch_option']
         maa_config['mall_ignore_when_full'] = conf['maa_mall_ignore_blacklist_when_full']
+        maa_config['credit_fight'] = conf['maa_credit_fight']
         base_scheduler.maa_config = maa_config
         base_scheduler.ADB_CONNECT = config.ADB_CONNECT[0]
         base_scheduler.error = False

diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py
@@ -1872,7 +1872,7 @@ def append_maa_task(self, type):
                 'shopping': True,
                 'buy_first': self.maa_config['buy_first'].split(","),
                 'blacklist': self.maa_config['blacklist'].split(","),
-                'credit_fight': '' not in self.stages and self.credit_fight is None,
+                'credit_fight': self.maa_config['credit_fight'] and '' not in self.stages and self.credit_fight is None,
                 "force_shopping_if_credit_full": self.maa_config['mall_ignore_when_full']
             })
 

diff --git a/arknights_mower/templates/conf.yml b/arknights_mower/templates/conf.yml
@@ -69,3 +69,4 @@ resting_threshold: 0.5
 theme: light
 maa_conn_preset: General
 maa_touch_option: maatouch
+maa_credit_fight: true