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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2024-12-11 05:20:35 +00:00
parent e269cd5ea8 c483cd55a6
commit 387658fe45
20 changed files with 211 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/campaign/campaign_ui.py
View File

@@ -18,11 +18,11 @@ class ModeSwitch(Switch):
MODE_SWITCH_1 = ModeSwitch('Mode_switch_1', offset=(30, 10))
MODE_SWITCH_1.add_status('normal', SWITCH_1_NORMAL)
MODE_SWITCH_1.add_status('hard', SWITCH_1_HARD)
MODE_SWITCH_1.add_state('normal', SWITCH_1_NORMAL)
MODE_SWITCH_1.add_state('hard', SWITCH_1_HARD)
MODE_SWITCH_2 = ModeSwitch('Mode_switch_2', offset=(30, 10))
MODE_SWITCH_2.add_status('hard', SWITCH_2_HARD)
MODE_SWITCH_2.add_status('ex', SWITCH_2_EX)
MODE_SWITCH_2.add_state('hard', SWITCH_2_HARD)
MODE_SWITCH_2.add_state('ex', SWITCH_2_EX)
class CampaignUI(MapOperation, CampaignEvent, CampaignOcr):

2
module/campaign/run.py
View File

@@ -2,7 +2,6 @@ import copy
import importlib
import os
import random
import re
from module.campaign.campaign_base import CampaignBase
from module.campaign.campaign_event import CampaignEvent
@@ -171,7 +170,6 @@ class CampaignRun(CampaignEvent, ShopStatus):
Returns:
str, str: name, folder
"""
name = re.sub('[ \t\n]', '', str(name)).lower()
name = to_map_file_name(name)
# For GemsFarming, auto choose events or main chapters
if self.config.task.command == 'GemsFarming':