From 9f6dfd1bf3c96eb104e1535827b0e0051c33f445 Mon Sep 17 00:00:00 2001
From: sui_feng <115386623+sui-feng-cb@users.noreply.github.com>
Date: Wed, 1 Oct 2025 02:42:59 +0800
Subject: [PATCH] Fix: OCR_COIN from page_main in shipyard_reward (#5176)

---
 assets/cn/shipyard/MAIN_OCR_COIN.png | Bin 0 -> 6935 bytes
 module/shipyard/assets.py            |   1 +
 module/shipyard/shipyard_reward.py   |  19 +++++++++----------
 module/shipyard/ui.py                |  12 ++++++++++++
 module/shipyard/ui_globals.py        |   2 ++
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 assets/cn/shipyard/MAIN_OCR_COIN.png

diff --git a/assets/cn/shipyard/MAIN_OCR_COIN.png b/assets/cn/shipyard/MAIN_OCR_COIN.png
new file mode 100644
index 0000000000000000000000000000000000000000..44da378e102b3a5f90cd66d335960c2aedf8b4c9
GIT binary patch
literal 6935
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

literal 0
HcmV?d00001

diff --git a/module/shipyard/assets.py b/module/shipyard/assets.py
index b777c4858..108b20043 100644
--- a/module/shipyard/assets.py
+++ b/module/shipyard/assets.py
@@ -4,6 +4,7 @@ from module.base.template import Template
 # This file was automatically generated by dev_tools/button_extract.py.
 # Don't modify it manually.
 
+MAIN_OCR_COIN = Button(area={'cn': (716, 24, 780, 49), 'en': (716, 24, 780, 49), 'jp': (716, 24, 780, 49), 'tw': (716, 24, 780, 49)}, color={'cn': (119, 126, 145), 'en': (119, 126, 145), 'jp': (119, 126, 145), 'tw': (119, 126, 145)}, button={'cn': (716, 24, 780, 49), 'en': (716, 24, 780, 49), 'jp': (716, 24, 780, 49), 'tw': (716, 24, 780, 49)}, file={'cn': './assets/cn/shipyard/MAIN_OCR_COIN.png', 'en': './assets/cn/shipyard/MAIN_OCR_COIN.png', 'jp': './assets/cn/shipyard/MAIN_OCR_COIN.png', 'tw': './assets/cn/shipyard/MAIN_OCR_COIN.png'})
 SHIPYARD_CONFIRM_DEV = Button(area={'cn': (1074, 497, 1152, 524), 'en': (1067, 492, 1163, 518), 'jp': (1058, 497, 1169, 534), 'tw': (1084, 495, 1144, 523)}, color={'cn': (106, 144, 211), 'en': (102, 140, 209), 'jp': (79, 122, 195), 'tw': (112, 148, 213)}, button={'cn': (1074, 497, 1152, 524), 'en': (1067, 492, 1163, 518), 'jp': (1058, 497, 1169, 534), 'tw': (1084, 495, 1144, 523)}, file={'cn': './assets/cn/shipyard/SHIPYARD_CONFIRM_DEV.png', 'en': './assets/en/shipyard/SHIPYARD_CONFIRM_DEV.png', 'jp': './assets/jp/shipyard/SHIPYARD_CONFIRM_DEV.png', 'tw': './assets/tw/shipyard/SHIPYARD_CONFIRM_DEV.png'})
 SHIPYARD_CONFIRM_FATE = Button(area={'cn': (1145, 523, 1221, 558), 'en': (1145, 522, 1242, 555), 'jp': (1137, 525, 1231, 556), 'tw': (1153, 521, 1215, 559)}, color={'cn': (109, 149, 203), 'en': (145, 173, 214), 'jp': (104, 144, 198), 'tw': (121, 159, 208)}, button={'cn': (1145, 523, 1221, 558), 'en': (1145, 522, 1242, 555), 'jp': (1137, 525, 1231, 556), 'tw': (1153, 521, 1215, 559)}, file={'cn': './assets/cn/shipyard/SHIPYARD_CONFIRM_FATE.png', 'en': './assets/en/shipyard/SHIPYARD_CONFIRM_FATE.png', 'jp': './assets/jp/shipyard/SHIPYARD_CONFIRM_FATE.png', 'tw': './assets/tw/shipyard/SHIPYARD_CONFIRM_FATE.png'})
 SHIPYARD_GO_FATE = Button(area={'cn': (943, 508, 1031, 531), 'en': (943, 508, 1018, 531), 'jp': (944, 509, 1029, 530), 'tw': (943, 507, 1030, 531)}, color={'cn': (169, 165, 54), 'en': (181, 177, 58), 'jp': (146, 143, 46), 'tw': (160, 156, 50)}, button={'cn': (1080, 415, 1147, 505), 'en': (1080, 415, 1147, 505), 'jp': (1078, 414, 1149, 506), 'tw': (1080, 415, 1147, 505)}, file={'cn': './assets/cn/shipyard/SHIPYARD_GO_FATE.png', 'en': './assets/en/shipyard/SHIPYARD_GO_FATE.png', 'jp': './assets/jp/shipyard/SHIPYARD_GO_FATE.png', 'tw': './assets/tw/shipyard/SHIPYARD_GO_FATE.png'})
diff --git a/module/shipyard/shipyard_reward.py b/module/shipyard/shipyard_reward.py
index a2febfb52..9cb098b88 100644
--- a/module/shipyard/shipyard_reward.py
+++ b/module/shipyard/shipyard_reward.py
@@ -1,13 +1,11 @@
 from datetime import datetime
-from module.base.timer import Timer
-from module.campaign.assets import OCR_OIL_CHECK
-from module.campaign.campaign_status import OCR_COIN
 
+from module.base.timer import Timer
+from module.config.utils import get_server_last_update
 from module.exception import ScriptError
 from module.logger import logger
 from module.shipyard.ui import ShipyardUI
-from module.ui.page import page_reshmenu, page_shipyard
-from module.config.utils import get_server_last_update
+from module.ui.page import page_main, page_shipyard
 
 PRBP_BUY_PRIZE = {
     (1, 2):               0,
@@ -188,8 +186,8 @@ class RewardShipyard(ShipyardUI):
         # Gold difficult to Ocr in page_shipyard
         # due to both text and number being
         # right-aligned together
-        # Retrieve information from page_reshmenu instead
-        self.ui_ensure(page_reshmenu)
+        # Retrieve information from page_main instead
+        self.ui_ensure(page_main)
         timeout = Timer(1, count=1).start()
         skip_first_screenshot = True
         while True:
@@ -197,14 +195,15 @@ class RewardShipyard(ShipyardUI):
                 skip_first_screenshot = False
             else:
                 self.device.screenshot()
-            if self.appear(OCR_OIL_CHECK, offset=(5, 2)):
+
+            self._coin_count = self._shipyard_get_coin()
+
+            if self._coin_count > 0:
                 break
             if timeout.reached():
                 logger.warning('Assumes that OCR_COIN is in the right place')
                 break
 
-        self._coin_count = OCR_COIN.ocr(self.device.image)
-
         self.ui_goto(page_shipyard)
         if not self.shipyard_set_focus(series=series, index=index) \
                 or not self._shipyard_buy_enter() \
diff --git a/module/shipyard/ui.py b/module/shipyard/ui.py
index 758891326..abb6c7877 100644
--- a/module/shipyard/ui.py
+++ b/module/shipyard/ui.py
@@ -1,11 +1,13 @@
 from module.base.decorator import cached_property
 from module.base.timer import Timer
 from module.base.utils import area_pad
+from module.campaign.campaign_status import OCR_COIN
 from module.handler.assets import LOGIN_ANNOUNCE
 from module.logger import logger
 from module.shipyard.ui_globals import *
 from module.ui.assets import SHIPYARD_CHECK
 from module.ui.navbar import Navbar
+from module.ui.page import page_main_white
 from module.ui.ui import UI
 
 
@@ -371,3 +373,13 @@ class ShipyardUI(UI):
             self.wait_until_appear(SHIPYARD_IN_FATE, offset=(20, 20))
 
         return True
+
+    def _shipyard_get_coin(self):
+        """
+        Returns:
+            int: Coin amount
+        """
+        if self.ui_page_appear(page_main_white):
+            return MAIN_OCR_COIN.ocr(self.device.image)
+        else:
+            return OCR_COIN.ocr(self.device.image)
diff --git a/module/shipyard/ui_globals.py b/module/shipyard/ui_globals.py
index 3c2301ca3..ef619247a 100644
--- a/module/shipyard/ui_globals.py
+++ b/module/shipyard/ui_globals.py
@@ -23,3 +23,5 @@ OCR_SHIPYARD_TOTAL_DEV = Digit(SHIPYARD_TOTAL_DEV, letter=(255, 247, 247),
 
 OCR_SHIPYARD_TOTAL_FATE = Digit(SHIPYARD_TOTAL_FATE, letter=(255, 247, 247),
                                 threshold=64)
+
+MAIN_OCR_COIN = Digit(MAIN_OCR_COIN, letter=(255, 255, 255), threshold=128, name='MAIN_OCR_COIN')
\ No newline at end of file