sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-21 09:40:56 +08:00
Code Activity

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/shop/shop_reward.py
View File

@@ -1,7 +1,4 @@
<<<<<<< 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
@@ -21,7 +18,6 @@ class RewardShop(ShopUI):
self.config.task_delay(server_update=True)
<<<<<<< HEAD
@Config.when(SERVER='tw')
def run_once(self):
# Munitions shops
@@ -47,8 +43,6 @@ 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()