Skip to content

Commit 1bd330f

Browse files
committed
Upd: EventShop scroll
1 parent 005c3f0 commit 1bd330f

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed
8.59 KB
Loading

module/shop_event/assets.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# This file was automatically generated by dev_tools/button_extract.py.
55
# Don't modify it manually.
66

7+
EVENT_SHOP_SCROLL_AREA = Button(area={'cn': (1064, 201, 1065, 623), 'en': (1064, 201, 1065, 623), 'jp': (1064, 201, 1065, 623), 'tw': (1064, 201, 1065, 623)}, color={'cn': (130, 130, 141), 'en': (130, 130, 141), 'jp': (130, 130, 141), 'tw': (130, 130, 141)}, button={'cn': (1064, 201, 1065, 623), 'en': (1064, 201, 1065, 623), 'jp': (1064, 201, 1065, 623), 'tw': (1064, 201, 1065, 623)}, file={'cn': './assets/cn/shop_event/EVENT_SHOP_SCROLL_AREA.png', 'en': './assets/cn/shop_event/EVENT_SHOP_SCROLL_AREA.png', 'jp': './assets/cn/shop_event/EVENT_SHOP_SCROLL_AREA.png', 'tw': './assets/cn/shop_event/EVENT_SHOP_SCROLL_AREA.png'})
78
SHOP_EVENT_DEADLINE = Button(area={'cn': (217, 161, 751, 186), 'en': (217, 161, 751, 186), 'jp': (217, 161, 751, 186), 'tw': (217, 161, 751, 186)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (217, 161, 751, 186), 'en': (217, 161, 751, 186), 'jp': (217, 161, 751, 186), 'tw': (217, 161, 751, 186)}, file={'cn': './assets/cn/shop_event/SHOP_EVENT_DEADLINE.png', 'en': './assets/cn/shop_event/SHOP_EVENT_DEADLINE.png', 'jp': './assets/cn/shop_event/SHOP_EVENT_DEADLINE.png', 'tw': './assets/cn/shop_event/SHOP_EVENT_DEADLINE.png'})
89
SHOP_OCR_BALANCE_SECOND = Button(area={'cn': (845, 164, 927, 189), 'en': (845, 164, 927, 189), 'jp': (845, 164, 927, 189), 'tw': (845, 164, 927, 189)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (845, 164, 927, 189), 'en': (845, 164, 927, 189), 'jp': (845, 164, 927, 189), 'tw': (845, 164, 927, 189)}, file={'cn': './assets/cn/shop_event/SHOP_OCR_BALANCE_SECOND.png', 'en': './assets/cn/shop_event/SHOP_OCR_BALANCE_SECOND.png', 'jp': './assets/cn/shop_event/SHOP_OCR_BALANCE_SECOND.png', 'tw': './assets/cn/shop_event/SHOP_OCR_BALANCE_SECOND.png'})
910
TEMPLATE_COST_PRICE_BACKGROUND = Template(file={'cn': './assets/cn/shop_event/TEMPLATE_COST_PRICE_BACKGROUND.png', 'en': './assets/cn/shop_event/TEMPLATE_COST_PRICE_BACKGROUND.png', 'jp': './assets/cn/shop_event/TEMPLATE_COST_PRICE_BACKGROUND.png', 'tw': './assets/cn/shop_event/TEMPLATE_COST_PRICE_BACKGROUND.png'})

module/shop_event/ui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
from module.exception import GameStuckError
99
from module.logger import logger
1010
from module.ocr.ocr import Ocr, Digit
11-
from module.shop.assets import MEDAL_SHOP_SCROLL_AREA_250814, SHOP_OCR_BALANCE, SHOP_OCR_OIL_CHECK, SHOP_OCR_OIL
11+
from module.shop.assets import SHOP_OCR_BALANCE, SHOP_OCR_OIL_CHECK, SHOP_OCR_OIL
1212
from module.shop.shop_medal import ShopAdaptiveScroll
1313
from module.shop_event.assets import *
1414
from module.ui.ui import UI
1515

1616

1717
EVENT_SHOP_SCROLL = ShopAdaptiveScroll(
18-
MEDAL_SHOP_SCROLL_AREA_250814.button,
18+
EVENT_SHOP_SCROLL_AREA.button,
1919
background=1,
2020
name="EVENT_SHOP_SCROLL"
2121
)

0 commit comments

Comments
 (0)