sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 18:07:23 +08:00
Code Activity

Fix: Resolve merge conflict, buttons() to buttons

Browse Source
This commit is contained in:
nEEtdo0d
2021-08-05 23:24:42 -04:00
parent 9b6a997de4 060bae3d18
commit 10c14e2160
15 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/shop/shop_reward.py
View File

@@ -1,4 +1,4 @@
from module.build.ui import BuildUI
from module.gacha.ui import GachaUI
from module.logger import logger
from module.shop.assets import SHOP_REFRESH
from module.shop.shop_general import GeneralShop
@@ -17,7 +17,7 @@ RECORD_SHOP_MERIT_OPTION = ('RewardRecord', 'shop_merit')
RECORD_SHOP_MERIT_SINCE = (0,)
class RewardShop(BuildUI, ShopUI, GeneralShop, GuildShop, MedalShop, MeritShop):
class RewardShop(GachaUI, ShopUI, GeneralShop, GuildShop, MedalShop, MeritShop):
def _shop_visit(self, shop_type='general'):
"""
Helper func to determine whether worth visiting and browsing the shop
@@ -126,14 +126,14 @@ class RewardShop(BuildUI, ShopUI, GeneralShop, GuildShop, MedalShop, MeritShop):
if any(shop_records.values()):
shop_ran = True
if shop_records['medal']:
self.ui_goto_build()
self.ui_goto_gacha()
record_save = True
if not self.build_side_navbar_ensure(bottom=2):
if not self.gacha_side_navbar_ensure(bottom=2):
return shop_ran
for _ in range(1, 3):
if self.build_bottom_navbar_ensure(left=_, is_construct=False):
if self.gacha_bottom_navbar_ensure(left=_, is_build=False):
self.shop_buy(shop_type='medal',
selection=self.config.SHOP_MEDAL_SELECTION)
else: