Преглед изворни кода

feat(RichMan): 秘卷屋海汐御魂支持自动选择御魂购买方式

- 新增 enable_book_auto 配置项, 控制永生之海是否使用自动选择
- _scales_sea 根据配置分支: 开启时使用 _scales_buy_more(自动选择),
  关闭时使用原 _scales_buy_sea_more(手动选魂)
- 补充 zh-CN 国际化文案
yuyuyuyuyu пре 3 месеци
родитељ
комит
684890908d

+ 3 - 1
assets/i18n/zh-CN.json

@@ -43,5 +43,7 @@
   "exit_four_help": "支持打九退四,保证稳定57级,要求设置好战斗主题,即 脚本->全局配置->游戏装饰自定义->战斗主题",
   "costume_main_15": "茨心乐园",
   "check_true_orochi_enable": "是否在结束后检测真蛇",
-  "check_true_orochi_enable_help": "开启后会在任务结束后检测是否出现真蛇, 若出现则自动拉起真蛇"
+  "check_true_orochi_enable_help": "开启后会在任务结束后检测是否出现真蛇, 若出现则自动拉起真蛇",
+  "enable_book_auto": "自动选择",
+  "enable_book_auto_help": "游戏内是否开启自动选择御魂"
 }

+ 2 - 2
tasks/Component/Buy/assets.py

@@ -14,7 +14,7 @@ class BuyAssets:
 	# description 
 	C_BUY_ONE = RuleClick(roi_front=(551,506,174,36), roi_back=(551,506,174,36), name="buy_one")
 	# description 
-	C_BUY_MORE = RuleClick(roi_front=(551,540,174,40), roi_back=(551,540,174,40), name="buy_more")
+	C_BUY_MORE = RuleClick(roi_front=(551,563,174,17), roi_back=(551,563,174,17), name="buy_more")
 	# 取消购买 
 	C_BUY_CANCEL = RuleClick(roi_front=(121,2,100,22), roi_back=(121,2,100,22), name="buy_cancel")
 
@@ -34,6 +34,6 @@ class BuyAssets:
 
 	# Ocr Rule Assets
 	# Ocr-description 
-	O_BUY_NUMBER = RuleOcr(roi=(578,416,52,46), area=(578,416,52,46), mode="Digit", method="Default", keyword="", name="buy_number")
+	O_BUY_NUMBER = RuleOcr(roi=(578,416,52,71), area=(578,416,52,71), mode="Digit", method="Default", keyword="", name="buy_number")
 
 

+ 2 - 2
tasks/Component/Buy/buy/click.json

@@ -7,8 +7,8 @@
   },
   {
     "itemName": "buy_more",
-    "roiFront": "551,540,174,40",
-    "roiBack": "551,540,174,40",
+    "roiFront": "551,563,174,17",
+    "roiBack": "551,563,174,17",
     "description": "description"
   },
   {

+ 2 - 2
tasks/Component/Buy/buy/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "buy_number",
-    "roiFront": "578,416,52,46",
-    "roiBack": "578,416,52,46",
+    "roiFront": "578,416,52,71",
+    "roiBack": "578,416,52,71",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

+ 3 - 3
tasks/RichMan/assets.py

@@ -282,7 +282,7 @@ class RichManAssets:
 	# description 
 	I_SCA_SELECT_3 = RuleImage(roi_front=(972,517,123,50), roi_back=(972,517,123,50), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_select_3.png")
 	# 获得的六星 
-	I_SCA_SIX_STAR = RuleImage(roi_front=(120,216,97,22), roi_back=(113,102,1057,157), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_six_star.png")
+	I_SCA_SIX_STAR = RuleImage(roi_front=(120,216,97,22), roi_back=(113,102,1056,257), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_six_star.png")
 	# 点击屏幕继续 
 	I_SCA_REWARD = RuleImage(roi_front=(584,503,100,100), roi_back=(584,503,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/scales/scales_sca_reward.png")
 	# 点击兑换 
@@ -297,7 +297,7 @@ class RichManAssets:
 	# 首领御魂剩余可买的 
 	O_SCA_NUMBER_DEMON = RuleOcr(roi=(627,319,30,25), area=(627,319,30,25), mode="Quantity", method="Default", keyword="", name="sca_number_demon")
 	# 永生之海 
-	O_SCA_NUMBER_SEA = RuleOcr(roi=(926,321,30,23), area=(926,321,30,23), mode="Quantity", method="Default", keyword="", name="sca_number_sea")
+	O_SCA_NUMBER_SEA = RuleOcr(roi=(920,320,36,22), area=(920,320,36,22), mode="Quantity", method="Default", keyword="", name="sca_number_sea")
 	# 多少号位 
 	O_SCA_DEMON_POSTION = RuleOcr(roi=(960,244,88,41), area=(960,244,88,41), mode="Single", method="Default", keyword="", name="sca_demon_postion")
 	# 朴素的御魂 
@@ -305,7 +305,7 @@ class RichManAssets:
 	# 首领御魂数量 
 	O_SCA_RES_DEMON = RuleOcr(roi=(968,11,102,35), area=(968,11,102,35), mode="Digit", method="Default", keyword="", name="sca_res_demon")
 	# 永生之海 
-	O_SCA_RES_SEA = RuleOcr(roi=(1136,11,88,38), area=(1136,11,88,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
+	O_SCA_RES_SEA = RuleOcr(roi=(1134,11,100,38), area=(1134,11,100,38), mode="Digit", method="Default", keyword="", name="sca_res_sea")
 
 
 	# Image Rule Assets

+ 1 - 0
tasks/RichMan/config.py

@@ -29,6 +29,7 @@ class Scales(BaseModel):
     demon_class: DemonClass = Field(title='DemonClass', default=DemonClass.TSUCHIGUMO, description='demon_class_help')
     demon_position: int = Field(title='Demon Position', default=1, description='demon_position_help')
     picture_book_scrap: int = Field(title='Picture Book Scrap', default=30, description='picture_book_scrap_help')
+    enable_book_auto: bool = Field(title='Enable Book Auto', default=False, description='enable_book_auto_help')
     picture_book_rule: str = Field(title='Picture Book Rule', default='auto', description='picture_book_rule_help')
 
 

+ 8 - 2
tasks/RichMan/mall/scales.py

@@ -340,10 +340,16 @@ class Scales(Buy, MallNavbar):
             buy_res_number = buy_number
         if buy_cycles_number:
             for i in range(buy_cycles_number):
-                self._scales_buy_sea_more(self.I_SCA_PICTURE_BOOK)
+                if self.config.rich_man.scales.enable_book_auto:
+                    self._scales_buy_more(self.I_SCA_PICTURE_BOOK)
+                else:
+                    self._scales_buy_sea_more(self.I_SCA_PICTURE_BOOK)
                 time.sleep(0.5)
         if buy_res_number and buy_res_number >= 2:
-            self._scales_buy_sea_more(self.I_SCA_PICTURE_BOOK, buy_res_number)
+            if self.config.rich_man.scales.enable_book_auto:
+                self._scales_buy_more(self.I_SCA_PICTURE_BOOK, buy_res_number)
+            else:
+                self._scales_buy_sea_more(self.I_SCA_PICTURE_BOOK, buy_res_number)
             time.sleep(0.5)
 
 

+ 1 - 1
tasks/RichMan/mall/scales/image.json

@@ -111,7 +111,7 @@
     "itemName": "sca_six_star",
     "imageName": "scales_sca_six_star.png",
     "roiFront": "120,216,97,22",
-    "roiBack": "113,102,1057,157",
+    "roiBack": "113,102,1056,257",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "获得的六星"

+ 4 - 4
tasks/RichMan/mall/scales/ocr.json

@@ -19,8 +19,8 @@
   },
   {
     "itemName": "sca_number_sea",
-    "roiFront": "926,321,30,23",
-    "roiBack": "926,321,30,23",
+    "roiFront": "920,320,36,22",
+    "roiBack": "920,320,36,22",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -55,8 +55,8 @@
   },
   {
     "itemName": "sca_res_sea",
-    "roiFront": "1136,11,88,38",
-    "roiBack": "1136,11,88,38",
+    "roiFront": "1134,11,100,38",
+    "roiBack": "1134,11,100,38",
     "mode": "Digit",
     "method": "Default",
     "keyword": "",

BIN
tasks/RichMan/mall/scales/scales_sca_picture_book.png