mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-04-01 18:26:21 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
<<<<<<< HEAD
|
||||
from module.base.decorator import Config
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
from module.shop.shop_core import CoreShop
|
||||
from module.shop.shop_general import GeneralShop
|
||||
from module.shop.shop_guild import GuildShop
|
||||
@@ -18,6 +21,7 @@ class RewardShop(ShopUI):
|
||||
|
||||
self.config.task_delay(server_update=True)
|
||||
|
||||
<<<<<<< HEAD
|
||||
@Config.when(SERVER='tw')
|
||||
def run_once(self):
|
||||
# Munitions shops
|
||||
@@ -43,6 +47,8 @@ class RewardShop(ShopUI):
|
||||
self.config.task_delay(server_update=True)
|
||||
|
||||
@Config.when(SERVER=None)
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
def run_once(self):
|
||||
# Munitions shops
|
||||
self.ui_goto_shop()
|
||||
|
||||
Reference in New Issue
Block a user