sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 11:37:54 +08:00
Code Activity

Fix: Getting index of a digit chapter when looking for a non-digit chapter (#4504)

Browse Source
This commit is contained in:
LmeSzinc
2025-01-10 02:27:51 +08:00
parent 40a9e901e2
commit 2176fdf803
18 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
campaign/event_20200917_cn/campaign_base.py
View File

@@ -27,7 +27,7 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
@@ -39,11 +39,11 @@ class CampaignBase(CampaignBase_):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in ['t', 'ts', 'ht', 'hts']:
self.ui_goto_event()
@@ -60,7 +60,7 @@ class CampaignBase(CampaignBase_):
if chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
# Get stage
self.campaign_ensure_chapter(index=1)
self.campaign_ensure_chapter(1)
else:
logger.warning(f'Unknown campaign chapter: {name}')

8
campaign/event_20201029_cn/campaign_base.py
View File

@@ -44,10 +44,10 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in 'abcd' or chapter == 'ex_sp':
self.ui_goto_event()
@@ -57,11 +57,11 @@ class CampaignBase(CampaignBase_):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
pass # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
self.ui_goto_event() # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
else:
logger.warning(f'Unknown campaign chapter: {name}')

2
campaign/event_20201126_cn/campaign_base.py
View File

@@ -54,7 +54,7 @@ class CampaignBase(CampaignBase_):
def campaign_set_chapter_event(self, chapter, mode='normal'):
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
def campaign_get_entrance(self, name):

8
campaign/event_20210121_cn/campaign_base.py
View File

@@ -15,10 +15,10 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_weigh_anchor()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in 'abcd' or chapter == 'ex_sp' or chapter in ['as', 'cs']:
self.ui_goto_event()
@@ -28,11 +28,11 @@ class CampaignBase(CampaignBase_):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
else:
logger.warning(f'Unknown campaign chapter: {name}')

8
campaign/event_20210722_cn/campaign_base.py
View File

@@ -72,10 +72,10 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in ['a', 'b', 'c', 'd', 'ex_sp', 'as', 'bs', 'cs', 'ds']:
self.ui_goto_event()
@@ -86,12 +86,12 @@ class CampaignBase(CampaignBase_):
elif chapter == 'ex_sp':
# self.campaign_ensure_mode('ex')
pass # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
# self.ui_goto_sp()
self.ui_goto_event() # Difference
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
else:
logger.warning(f'Unknown campaign chapter: {name}')

2
campaign/event_20220324_cn/campaign_base.py
View File

@@ -5,7 +5,7 @@ class CampaignBase(CampaignBase_):
def campaign_set_chapter_sp(self, chapter, mode='normal'):
if chapter == 'sp':
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
else:
return False

2
campaign/event_20220818_cn/campaign_base.py
View File

@@ -8,7 +8,7 @@ class CampaignBase(CampaignBase_):
logger.info('Set chapter SP')
if chapter in ['sp', 'sp_sp']:
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
else:
return False

2
campaign/event_20221124_cn/campaign_base.py
View File

@@ -15,7 +15,7 @@ class CampaignBase(CampaignBase_):
def campaign_set_chapter_event(self, chapter, mode='normal'):
if chapter.startswith('t'):
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
return super().campaign_set_chapter_event(chapter, mode=mode)

8
campaign/event_20230525_cn/campaign_base.py
View File

@@ -29,7 +29,7 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
@@ -41,11 +41,11 @@ class CampaignBase(CampaignBase_):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in ['t', 'ts', 'ht', 'hts']:
self.ui_goto_event()
@@ -68,7 +68,7 @@ class CampaignBase(CampaignBase_):
else:
self._campaign_ball_set('red')
# Get stage
self.campaign_ensure_chapter(index=1)
self.campaign_ensure_chapter(1)
else:
logger.warning(f'Unknown campaign chapter: {name}')

2
campaign/event_20231026_cn/campaign_base.py
View File

@@ -13,7 +13,7 @@ class CampaignBase(CampaignBase_):
def campaign_set_chapter_event(self, chapter, mode='normal'):
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
def _campaign_get_chapter_index(self, name):

2
campaign/event_20231123_cn/campaign_base.py
View File

@@ -13,7 +13,7 @@ class CampaignBase(CampaignBase_):
def campaign_set_chapter_event(self, chapter, mode='normal'):
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
def _campaign_get_chapter_index(self, name):

2
campaign/event_20240425_cn/campaign_base.py
View File

@@ -14,7 +14,7 @@ class CampaignBase(CampaignBase_):
def campaign_set_chapter_event(self, chapter, mode='normal'):
self.ui_goto_event()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return True
def _campaign_get_chapter_index(self, name):

2
campaign/event_20241024_cn/campaign_base.py
View File

@@ -42,6 +42,6 @@ class CampaignBase(CampaignBase_):
ASIDE_SWITCH_20241219.set('part2', main=self)
else:
logger.warning(f'Stage {chapter}{stage} is not in event_20241024')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return super().campaign_set_chapter_20241219(chapter, stage, mode)

4
campaign/event_20241121_cn/campaign_base.py
View File

@@ -26,11 +26,11 @@ class CampaignBase(CampaignBase_):
self.ui_goto_event()
MODE_SWITCH_20241219.set('combat', main=self)
ASIDE_SWITCH_20241219.set('part1', main=self)
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if chapter == 'ttl':
self.ui_goto_event()
MODE_SWITCH_20241219.set('combat', main=self)
ASIDE_SWITCH_20241219.set('part2', main=self)
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
return super().campaign_set_chapter_20241219(chapter, stage, mode)

8
campaign/war_archives_20190911_cn/campaign_base.py
View File

@@ -25,10 +25,10 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in 'abcd' or chapter == 'ex_sp' or chapter in ['as', 'cs']:
self.ui_goto_event()
@@ -38,11 +38,11 @@ class CampaignBase(CampaignBase_):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
else:
logger.warning(f'Unknown campaign chapter: {name}')

8
campaign/war_archives_20200917_cn/campaign_base.py
View File

@@ -27,7 +27,7 @@ class CampaignBase(CampaignBase_):
if chapter.isdigit():
self.ui_goto_campaign()
self.campaign_ensure_mode('normal')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
if mode == 'hard':
self.campaign_ensure_mode('hard')
@@ -39,11 +39,11 @@ class CampaignBase(CampaignBase_):
self.campaign_ensure_mode('hard')
elif chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter == 'sp':
self.ui_goto_sp()
self.campaign_ensure_chapter(index=chapter)
self.campaign_ensure_chapter(chapter)
elif chapter in ['t', 'ts', 'ht', 'hts']:
self.ui_goto_event()
@@ -60,7 +60,7 @@ class CampaignBase(CampaignBase_):
if chapter == 'ex_sp':
self.campaign_ensure_mode('ex')
# Get stage
self.campaign_ensure_chapter(index=1)
self.campaign_ensure_chapter(1)
else:
logger.warning(f'Unknown campaign chapter: {name}')