Просмотр исходного кода

Merge pull request #952 from yEs1do/fix(gb_reward)

修改紫蛇皮额外掉落图片,修复活动副本卡结算
huangrunheng 1 год назад
Родитель
Сommit
f28ec4c662

+ 1 - 1
tasks/ActivityShikigami/script_task.py

@@ -299,7 +299,7 @@ class ScriptTask(GameUi, BaseActivity, SwitchSoul, ActivityShikigamiAssets):
             if self.appear_then_click(self.I_WIN, interval=2.3):
             if self.appear_then_click(self.I_WIN, interval=2.3):
                 logger.info("Win")
                 logger.info("Win")
                 continue
                 continue
-            #  出现 “魂” 和 紫色皮
+            #  出现 “魂” 和 紫蛇皮
             if self.appear(self.I_REWARD):
             if self.appear(self.I_REWARD):
                 logger.info('Win battle')
                 logger.info('Win battle')
                 self.wait_until_appear(self.I_REWARD_PURPLE_SNAKE_SKIN, wait_time=5)
                 self.wait_until_appear(self.I_REWARD_PURPLE_SNAKE_SKIN, wait_time=5)

+ 1 - 1
tasks/Component/GeneralBattle/assets.py

@@ -110,7 +110,7 @@ class GeneralBattleAssets:
 	# 结算金币 
 	# 结算金币 
 	I_REWARD_GOLD = RuleImage(roi_front=(268,178,97,69), roi_back=(254,163,797,261), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward_gold.png")
 	I_REWARD_GOLD = RuleImage(roi_front=(268,178,97,69), roi_back=(254,163,797,261), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward_gold.png")
 	# 结算紫蛇皮 
 	# 结算紫蛇皮 
-	I_REWARD_PURPLE_SNAKE_SKIN = RuleImage(roi_front=(403,177,97,73), roi_back=(254,163,797,261), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward_purple_snake_skin.png")
+	I_REWARD_PURPLE_SNAKE_SKIN = RuleImage(roi_front=(604,213,67,37), roi_back=(108,163,1070,261), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward_purple_snake_skin.png")
 	# 结算金蛇皮 
 	# 结算金蛇皮 
 	I_REWARD_GOLD_SNAKE_SKIN = RuleImage(roi_front=(537,176,97,75), roi_back=(254,163,797,261), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward_gold_snake_skin.png")
 	I_REWARD_GOLD_SNAKE_SKIN = RuleImage(roi_front=(537,176,97,75), roi_back=(254,163,797,261), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralBattle/gb/gb_reward_gold_snake_skin.png")
 	# 结算四星青吉鬼 
 	# 结算四星青吉鬼 

BIN
tasks/Component/GeneralBattle/gb/gb_reward_purple_snake_skin.png


+ 2 - 2
tasks/Component/GeneralBattle/gb/image.json

@@ -191,8 +191,8 @@
   {
   {
     "itemName": "reward_purple_snake_skin",
     "itemName": "reward_purple_snake_skin",
     "imageName": "gb_reward_purple_snake_skin.png",
     "imageName": "gb_reward_purple_snake_skin.png",
-    "roiFront": "403,177,97,73",
-    "roiBack": "254,163,797,261",
+    "roiFront": "604,213,67,37",
+    "roiBack": "108,163,1070,261",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "结算紫蛇皮"
     "description": "结算紫蛇皮"