1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 01:38:21 +08:00

Add: shop_core config and gui

This commit is contained in:
nEEtdo0d
2021-12-24 12:35:34 -05:00
parent 0872634740
commit 605ba2f3d7
9 changed files with 63 additions and 3 deletions

View File

@@ -3394,6 +3394,12 @@
"type": "textarea",
"value": "Cube"
}
},
"CoreShop": {
"Filter": {
"type": "textarea",
"value": "Array"
}
}
},
"Meowfficer": {

View File

@@ -159,7 +159,7 @@ HpControl:
RepairUseMultiThreshold: 0.6
LowHpRetreatThreshold: 0.3
EnemyPriority:
EnemyScaleBalanceWeight:
EnemyScaleBalanceWeight:
value: default_mode
option: [default_mode, S3_enemy_first, S1_enemy_first]
Raid:
@@ -331,6 +331,9 @@ MeritShop:
Refresh: false
Filter: |-
Cube
CoreShop:
Filter: |-
Array
Shipyard:
ResearchSeries: 1
ShipIndex: 0

View File

@@ -116,6 +116,7 @@ ShopOnce:
- GuildShop
- MedalShop
- MeritShop
- CoreShop
Meowfficer:
- Scheduler
- Meowfficer

View File

@@ -223,6 +223,9 @@ class GeneratedConfig:
MeritShop_Refresh = False
MeritShop_Filter = 'Cube'
# Group `CoreShop`
CoreShop_Filter = 'Array'
# Group `Shipyard`
Shipyard_ResearchSeries = 1
Shipyard_ShipIndex = 0

View File

@@ -1238,6 +1238,16 @@
"help": "All options have been defined at <https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string>"
}
},
"CoreShop": {
"_info": {
"name": "Core Shop Settings",
"help": ""
},
"Filter": {
"name": "Item Filter",
"help": "All options have been defined at <https://github.com/LmeSzinc/AzurLaneAutoScript/wiki/reward_shop_filter_string>\nHowever unlike other shops, only Chip and Array are supported\nALAS does not browse, scroll, or recognize any other items displayed besides those two"
}
},
"Shipyard": {
"_info": {
"name": "Shipyard Settings",

View File

@@ -426,6 +426,7 @@
"name": "Campaign.Event.name",
"help": "Campaign.Event.help",
"campaign_main": "campaign_main",
"event_20200603_cn": "峡湾間の反撃",
"event_20211125_cn": "弧光は交わる世界にて",
"event_20211111_cn": "燈火のシニエ",
"event_20211028_tw": "復刻光與影的鳶尾之華",
@@ -461,7 +462,6 @@
"raid_20200624": "特別演習超空強襲波(復刻)",
"event_20200611_en": "Skybound Oratorio",
"event_20200603_en": "Prelude under the Moon Rerun",
"event_20200603_cn": "峡湾間の反撃",
"event_20200521_en": "Iris of Light and Dark Rerun",
"event_20200521_cn": "神穹を衝く聖歌",
"event_20200507_cn": "帰路は海色の陰りへと",
@@ -1238,6 +1238,16 @@
"help": "MeritShop.Filter.help"
}
},
"CoreShop": {
"_info": {
"name": "CoreShop._info.name",
"help": "CoreShop._info.help"
},
"Filter": {
"name": "CoreShop.Filter.name",
"help": "CoreShop.Filter.help"
}
},
"Shipyard": {
"_info": {
"name": "Shipyard._info.name",

View File

@@ -1238,6 +1238,16 @@
"help": ""
}
},
"CoreShop": {
"_info": {
"name": "CoreShop._info.name",
"help": "CoreShop._info.help"
},
"Filter": {
"name": "CoreShop.Filter.name",
"help": "CoreShop.Filter.help"
}
},
"Shipyard": {
"_info": {
"name": "开发船坞",

View File

@@ -1238,6 +1238,16 @@
"help": "MeritShop.Filter.help"
}
},
"CoreShop": {
"_info": {
"name": "CoreShop._info.name",
"help": "CoreShop._info.help"
},
"Filter": {
"name": "CoreShop.Filter.name",
"help": "CoreShop.Filter.help"
}
},
"Shipyard": {
"_info": {
"name": "開發船塢",

View File

@@ -1,6 +1,7 @@
from module.config.utils import get_server_last_update
from module.gacha.ui import GachaUI
from module.logger import logger
from module.shop.shop_core import CoreShop
from module.shop.shop_general import GeneralShop
from module.shop.shop_guild import GuildShop
from module.shop.shop_medal import MedalShop
@@ -8,7 +9,7 @@ from module.shop.shop_merit import MeritShop
from module.shop.ui import ShopUI
class RewardShop(GachaUI, ShopUI, GeneralShop, GuildShop, MedalShop, MeritShop):
class RewardShop(GachaUI, ShopUI, CoreShop, GeneralShop, GuildShop, MedalShop, MeritShop):
def _shop_visit(self, shop_type='general'):
"""
Helper func to determine whether worth visiting and browsing the shop
@@ -66,6 +67,12 @@ class RewardShop(GachaUI, ShopUI, GeneralShop, GuildShop, MedalShop, MeritShop):
if self.shop_bottom_navbar_ensure(left=4):
self._shop_repeat(shop_type='merit')
if self._shop_visit('core'):
logger.hr('Core shop', level=1)
if self.shop_bottom_navbar_ensure(left=3):
self.shop_buy(shop_type='core',
selection=self.config.CoreShop_Filter)
if self._shop_visit('guild'):
logger.hr('Guild shop', level=1)
if self.shop_bottom_navbar_ensure(left=1):