Merge pull request #223 from cc004/dev

Dev

Author: Lanly109

autopcr/core/pcrclient.py

@@ -609,6 +609,11 @@ async def read_story(self, story_id: int):
         await self.story_check(story_id)
         return await self.story_view(story_id)
 
+    async def read_asb_story(self, sub_story_id: int):
+        req = SubStoryAsbReadStoryRequest()
+        req.sub_story_id = sub_story_id
+        await self.request(req)
+
     async def read_wtm_story(self, sub_story_id: int):
         req = SubStoryWtmReadStoryRequest()
         req.sub_story_id = sub_story_id

autopcr/db/database.py

@@ -1192,6 +1192,14 @@ def hatsune_item(self) -> Dict[int, HatsuneItem]:
                 .to_dict(lambda x: x.event_id, lambda x: x)
             )
 
+    @lazy_property
+    def asb_story_data(self) -> Dict[int, AsbStoryDatum]:
+        with self.dbmgr.session() as db:
+            return (
+                AsbStoryDatum.query(db)
+                .to_dict(lambda x: x.sub_story_id, lambda x: x)
+            )
+
     @lazy_property
     def wtm_story_data(self) -> Dict[int, WtmStoryDatum]:
         with self.dbmgr.session() as db:

autopcr/model/handlers.py

@@ -674,6 +674,13 @@ async def update(self, mgr: datamgr, request):
             for reward in self.rewards:
                 mgr.update_inventory(reward)
 
+@handles
+class SubStoryAsbReadStoryResponse(responses.SubStoryAsbReadStoryResponse):
+    async def update(self, mgr: datamgr, request):
+        if self.reward_info:
+            for reward in self.reward_info:
+                mgr.update_inventory(reward)
+
 @handles
 class SubStoryWtmReadStoryResponse(responses.SubStoryWtmReadStoryResponse):
     async def update(self, mgr: datamgr, request):

autopcr/module/config.py

@@ -271,26 +271,12 @@ class LimitUnitListConfig(UnitConfigMixin, MultiSearchConfig):
     def __init__(self, key: str, desc: str):
         super().__init__(key, desc, [], db.limit_unit_condition_candidate)
 
-class ConditionalExecutionMixin:
-    """Mixin for conditional execution configs."""
-    async def check_campaigns(self, campaign_list, client_data):
-        """Check if any campaign in the list is active."""
-        hit = [campaign for campaign in campaign_list if client_data.is_campaign(campaign)]
-        return hit
-
-class ConditionalExecution1Config(ConditionalExecutionMixin, MultiChoiceConfig):
-    def __init__(self, key: str, desc: str = "执行条件", default=[], check: bool = True):
-        super().__init__(key, desc, default, ['无庆典', 'n庆典', 'h庆典', 'vh庆典', '总是执行'])
+class ConditionalExecutionWrapper(Config):
+    def __init__(self, key: str, desc: str, default: Any, candidates: Union[Callable, List], check: bool):
+        super().__init__(key, desc, default, candidates)
         self.check_enabled = check
-    
-    async def do_check(self, client: pcrclient) -> Tuple[bool, str]:
-            
-        run_time = self.get_value()
-        hit = await self.check_campaigns(run_time, client.data)
-        
-        if hit:
-            return True, "今日" + ','.join(hit) + "，执行"
-        return False, "今日不符合执行条件"
+
+    async def do_check(self, client: Union[pcrclient, None] = None) -> Tuple[bool, str]: ...
 
     def wrap_init(self, cls: Type, sself: Type):
         super().wrap_init(cls, sself)
@@ -309,68 +295,45 @@ async def new_do_check(*args, **kwargs):
 
             cls.do_check = new_do_check
 
+class ConditionalExecutionClient(ConditionalExecutionWrapper):
+    async def do_check(self, client: pcrclient) -> Tuple[bool, str]:
+        run_time = self.get_value()
+        hit = [campaign for campaign in run_time if client.data.is_campaign(campaign)]
+        if hit:
+            return True, "今日" + ','.join(hit) + "，执行"
+        return False, "今日不符合执行条件"
 
-class ConditionalExecution2Config(ConditionalExecutionMixin, MultiChoiceConfig):
-    def __init__(self, key: str, desc: str = "执行条件", default=[], check: bool = True):
-        super().__init__(key, desc, default, ['n3以上前夕', 'n3以上首日午前', 'h3以上前夕', '会战前夕', '会战期间', '总是执行'])
-        self.check_enabled = check
-    
+class ConditionalExecutionDB(ConditionalExecutionWrapper, MultiChoiceConfig):
     async def do_check(self) -> Tuple[bool, str]:
-            
         run_time = self.get_value()
         hit = [campaign for campaign in run_time if db.is_campaign(campaign)]
-        
         if hit:
             return True, "今日" + ','.join(hit) + "，执行"
         return False, "今日不符合执行条件"
-    
-    def wrap_init(self, cls: Type, sself: Type):
-        super().wrap_init(cls, sself)
-        if sself.check_enabled and hasattr(cls, 'do_check'):
-            old_do_check = cls.do_check
 
-            async def new_do_check(*args, **kwargs):
-                ok, msg = await old_do_check(*args, **kwargs)
-                if not ok:
-                    return False, msg
-
-                ok, msg2 = await sself.do_check(*args, **kwargs)
-                if not ok:
-                    return False, msg + msg2
-                return True, msg + msg2
-
-            cls.do_check = new_do_check
-
-
-class ConditionalNotExecutionConfig(ConditionalExecutionMixin, MultiChoiceConfig):
-    def __init__(self, key: str, desc: str = "不执行条件", default=[], check: bool = True):
-        super().__init__(key, desc, default, ['n2', 'n3', 'n4及以上', 'h2', 'h3及以上', 'vh2', 'vh3及以上'])
-        self.check_enabled = check
-    
+class ConditionalNotExecutionClient(ConditionalExecutionWrapper):
     async def do_check(self, client: pcrclient) -> Tuple[bool, str]:
         run_time = self.get_value()
-        hit = await self.check_campaigns(run_time, client.data)
-        
+        hit = [campaign for campaign in run_time if client.data.is_campaign(campaign)]
         if hit:
             return False, "今日" + ','.join(hit) + "，不执行"
         return True, ""
-        
-    def wrap_init(self, cls: Type, sself: Type):
-        super().wrap_init(cls, sself)
-        if sself.check_enabled and hasattr(cls, 'do_check'):
-            old_do_check = cls.do_check
 
-            async def new_do_check(*args, **kwargs):
-                ok, msg = await old_do_check(*args, **kwargs)
-                if not ok:
-                    return False, msg
+class ConditionalExecution1Config(ConditionalExecutionClient, MultiChoiceConfig):
+    def __init__(self, key: str, desc: str = "执行条件", default=[], check: bool = True):
+        super().__init__(key, desc, default, ['无庆典', 'n庆典', 'h庆典', 'vh庆典', '总是执行'], check)
 
-                ok, msg2 = await sself.do_check(*args, **kwargs)
-                if not ok:
-                    return False, msg + msg2
-                return True, msg + msg2
+class ConditionalExecution2Config(ConditionalExecutionDB, MultiChoiceConfig):
+    def __init__(self, key: str, desc: str = "执行条件", default=[], check: bool = True):
+        super().__init__(key, desc, default, ['n3以上前夕', 'n3以上首日午前', 'h3以上前夕', '会战前夕', '会战期间', '总是执行'], check)
 
-            cls.do_check = new_do_check
+class ConditionalExecution3Config(ConditionalExecutionClient, MultiChoiceConfig):
+    def __init__(self, key: str, desc: str = "执行条件", default=[], check: bool = True):
+        super().__init__(key, desc, default, ['n2', 'n3', 'n4及以上', 'h2', 'h3及以上', 'vh2', 'vh3及以上', '总是执行'], check)
+
+class ConditionalNotExecutionConfig(ConditionalNotExecutionClient, MultiChoiceConfig):
+    def __init__(self, key: str, desc: str = "不执行条件", default=[], check: bool = True):
+        super().__init__(key, desc, default, ['n2', 'n3', 'n4及以上', 'h2', 'h3及以上', 'vh2', 'vh3及以上'], check)
 
 class TravelQuestConfig(MultiChoiceConfig):
     """Configuration for travel quests."""

autopcr/module/modules/autosweep.py

@@ -215,6 +215,7 @@ def get_max_times(self, client: pcrclient, quest_id: int) -> int:
         return 3
 
 @singlechoice('shiori_sweep_gap_limit', "盈余阈值", 10, [0, 5, 10])
+@conditional_not_execution("shiori_sweep_not_run_time", ["n3", 'n4及以上'])
 @conditional_execution1("shiori_sweep_run_time", ["无庆典"])
 @singlechoice('shiori_sweep_consider_unit_order', "刷取顺序", "缺口少优先", ["缺口少优先", "缺口大优先"])
 @description('根据记忆碎片缺口刷外传图，直到盈余超过阈值')
@@ -285,6 +286,8 @@ def get_max_times(self, client: pcrclient, quest_id: int) -> int:
         107501, # 水吃
         113101, # 水流夏
         113301, # 水七七香
+        117001, # 水娇
+        117101, # 水姐姐
 ]
 @conditional_execution1("very_hard_sweep_run_time", ["vh庆典"])
 @description('储备专二需求的150碎片，包括' + ','.join(db.get_unit_name(unit_id) for unit_id in unique_equip_2_pure_memory_id))

autopcr/module/modules/daily.py

@@ -204,7 +204,9 @@ async def check_reward(reward: seasonpass_reward.Reward, full_reward: seasonpass
             else:
                 raise SkipError("没有可领取的女神祭奖励")
 
-@singlechoice("present_receive_stamina_strategy", "体力", "不领取", ["所有", "有限期", "一天到期", "不领取"])
+@ConditionalExecution3Config('present_receive_unlimit_stamina_strategy', "无限期体力", [], check = False)
+@ConditionalExecution3Config('present_receive_limit_stamina_strategy', "有限期体力", ["n3", "n4及以上"], check = False)
+@ConditionalExecution3Config('present_receive_one_day_limit_stamina_strategy', "一天到期体力", ["总是执行"], check = False)
 @description('领取非体力的所有东西以及符合条件的体力')
 @name('领取礼物箱')
 @default(True)
@@ -214,9 +216,16 @@ async def do_task(self, client: pcrclient):
         received = False
         result = []
         stop = False
-        present_strategy = self.get_config('present_receive_stamina_strategy')
+        gets = []
+        for conf in ['present_receive_unlimit_stamina_strategy', 'present_receive_limit_stamina_strategy', 'present_receive_one_day_limit_stamina_strategy']:
+            config = self.get_config_instance(conf)
+            get, msg = await config.do_check(client)
+            gets.append(get)
+            if get:
+                self._log(msg + config.desc + "领取")
+        unlimit_stamina_get, limit_stamina_get, one_day_limit_stamina_get = gets
         while not stop:
-            is_exclude_stamina = False if present_strategy == "所有" else True
+            is_exclude_stamina = False if unlimit_stamina_get and limit_stamina_get else True
             present_index = await client.present_index()
             for present in present_index.present_info_list:
                 if not is_exclude_stamina or not (present.reward_type == eInventoryType.Stamina and present.reward_id == 93001):
@@ -234,15 +243,15 @@ async def do_task(self, client: pcrclient):
             else:
                 stop = True
 
-        if present_strategy != "所有" and present_strategy != "不领取":
+        if unlimit_stamina_get or limit_stamina_get or one_day_limit_stamina_get:
             stop = False
-            limit_stamina = present_strategy == "有限期"
             while not stop:
                 present = await client.present_index()
                 for present in present.present_info_list:
                     if present.reward_type == eInventoryType.Stamina and present.reward_id == 93001 \
-                    and present.reward_limit_flag \
-                    and (limit_stamina or present.reward_limit_time <= apiclient.time + 24 * 3600):
+                    and ((not present.reward_limit_flag and unlimit_stamina_get) or
+                        (present.reward_limit_flag and limit_stamina_get) or
+                        (present.reward_limit_flag and one_day_limit_stamina_get and present.reward_limit_time <= apiclient.time + 24 * 3600)):
                         res = await client.present_receive(present.present_id)
                         if not res.rewards:
                             self._warn("体力满了，无法继续领取礼物箱的体力")

autopcr/module/modules/travel.py

@@ -310,9 +310,9 @@ def get_strategy(event_id: int) -> str:
 
 @inttype("travel_speed_up_paper_threshold", "加速阈值", 12, list(range(13)))
 @inttype("travel_target_day", "轮转天数", 7, list(range(1, 31)))
-@TravelQuestConfig("travel_target_quest3", "轮转目标3", [11002002, 11002003, 11002005])
-@TravelQuestConfig("travel_target_quest2", "轮转目标2", [11002004])
-@TravelQuestConfig("travel_target_quest1", "轮转目标1", [11002001])
+@TravelQuestConfig("travel_target_quest3", "轮转目标3", [11003002, 11003003])
+@TravelQuestConfig("travel_target_quest2", "轮转目标2", [11003004])
+@TravelQuestConfig("travel_target_quest1", "轮转目标1", [11003001])
 @name('探险轮转')
 @description('''
 自动根据轮转进行探险，按轮转时间进行目标切换，需保持三支队探险。