Merge pull request #225 from cc004/dev

Dev

Author: Lanly109

autopcr/core/pcrclient.py

@@ -79,6 +79,19 @@ async def caravan_dish_sell(self, season_id: int, block_id: int, dish_list: List
         req.surplus_dish_list = surplus_dish_list
         return await self.request(req)
 
+    async def caravan_spots_choice(self, season_id: int, choice: int):
+        req = CaravanSpotsChoiceRequest()
+        req.season_id = season_id
+        req.choice = choice
+        return await self.request(req)
+
+    async def caravan_dice_reroll(self, season_id: int, current_count: int, roll_num: int):
+        req = CaravanDiceRerollRequest()
+        req.season_id = season_id
+        req.current_count = current_count
+        req.roll_num = roll_num
+        return await self.request(req)
+
     async def caravan_dice_roll(self, season_id: int, current_num: int, roll_num: int):
         req = CaravanDiceRollRequest()
         req.season_id = season_id
@@ -135,6 +148,18 @@ async def caravan_gacha_block_exec(self, season_id: int, block_id: int, gacha_ty
         req.current_currency_num = current_currency_num
         return await self.request(req)
 
+    async def caravan_minigame_bs_start(self, season_id: int):
+        req = CaravanMinigameCccBsStartRequest()
+        req.season_id = season_id
+        return await self.request(req)
+
+    async def caravan_minigame_bs_finish(self, season_id: int, play_id: int, items: Dict[int, int]):
+        req = CaravanMinigameCccBsFinishRequest()
+        req.season_id = season_id
+        req.play_id = play_id
+        req.object_list = [CccFinishItemCountInfo(ccc_object_id=item_id, count=count) for item_id, count in items.items()]
+        return await self.request(req)
+
     async def caravan_minigame_start(self):
         req = CaravanMinigameCccStartRequest()
         return await self.request(req)
@@ -609,6 +634,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_xac_story(self, sub_story_id: int):
+        req = SubStoryXacReadStoryRequest()
+        req.sub_story_id = sub_story_id
+        await self.request(req)
+
     async def read_asb_story(self, sub_story_id: int):
         req = SubStoryAsbReadStoryRequest()
         req.sub_story_id = sub_story_id
@@ -1202,6 +1232,8 @@ async def unlock_quest_id(self, quest: int):
     async def quest_skip_aware(self, quest: int, times: int, recover: bool = False, is_total: bool = False):
         name = db.get_quest_name(quest)
         if db.is_hatsune_quest(quest):
+            if not quest in db.quest_to_event:
+                raise AbortError(f"任务{name}不存在")
             event = db.quest_to_event[quest].event_id
             if not quest in self.data.hatsune_quest_dict[event]:
                 raise AbortError(f"任务{name}未通关或不存在")

autopcr/db/database.py

@@ -66,6 +66,14 @@ def redeem_unit(self) -> Dict[int, Dict[int, RedeemUnit]]:
                 .to_dict(lambda x: x.key, lambda x: x.to_dict(lambda x: x.slot_id, lambda x: x))
             )
 
+    @lazy_property
+    def caravan_buddy(self) -> Dict[int, CaravanBuddy]:
+        with self.dbmgr.session() as db:
+            return (
+                CaravanBuddy.query(db)
+                .to_dict(lambda x: x.buddy_id, lambda x: x)
+            )
+
     @lazy_property
     def caravan_dish(self) -> Dict[int, CaravanDish]:
         with self.dbmgr.session() as db:
@@ -1192,6 +1200,14 @@ def hatsune_item(self) -> Dict[int, HatsuneItem]:
                 .to_dict(lambda x: x.event_id, lambda x: x)
             )
 
+    @lazy_property
+    def xac_story_data(self) -> Dict[int, XacStoryDatum]:
+        with self.dbmgr.session() as db:
+            return (
+                XacStoryDatum.query(db)
+                .to_dict(lambda x: x.sub_story_id, lambda x: x)
+            )
+
     @lazy_property
     def asb_story_data(self) -> Dict[int, AsbStoryDatum]:
         with self.dbmgr.session() as db:

autopcr/db/methods.py

@@ -112,6 +112,14 @@ def get_effect_desc(self, lasting = True) -> str:
             lasting_msg = ""
         return lasting_msg
 
+@method
+class CaravanBuddy(models.CaravanBuddy):
+    def get_effect_desc(self, lasting = True) -> str:
+        lasting_msg = f"持续{self.effect_turn}回合" if self.effect_turn > 0 else "一次性"
+        if not lasting:
+            lasting_msg = ""
+        return f"{self.description.format(self.effect_value_1, self.effect_value_2)} {lasting_msg}"
+
 @method
 class EnemyRewardDatum(models.EnemyRewardDatum):
     def get_rewards(self) -> Iterator[Reward]:

autopcr/model/handlers.py

@@ -73,6 +73,13 @@ async def update(self, mgr: datamgr, request):
             for item in self.reward_list:
                 mgr.update_inventory(item)
 
+@handles
+class CaravanMinigameCccBsFinishResponse(responses.CaravanMinigameCccBsFinishResponse):
+    async def update(self, mgr: datamgr, request):
+        if self.reward_list:
+            for item in self.reward_list:
+                mgr.update_inventory(item)
+
 @handles
 class CaravanDishUseResponse(responses.CaravanDishUseResponse):
     async def update(self, mgr: datamgr, request):
@@ -83,6 +90,20 @@ async def update(self, mgr: datamgr, request):
             for item in self.sub_reward_list:
                 mgr.update_inventory(item)
 
+@handles
+class CaravanDiceRollResponse(responses.CaravanDiceRollResponse):
+    async def update(self, mgr: datamgr, request):
+        if self.buddy_reward_list:
+            for item in self.buddy_reward_list:
+                mgr.update_inventory(item)
+
+@handles
+class CaravanProgressTurnResponse(responses.CaravanProgressTurnResponse):
+    async def update(self, mgr: datamgr, request):
+        if self.buddy_reward_list:
+            for item in self.buddy_reward_list:
+                mgr.update_inventory(item)
+
 @handles
 class CaravanGachaBlockExecResponse(responses.CaravanGachaBlockExecResponse):
     async def update(self, mgr: datamgr, request):
@@ -674,6 +695,13 @@ async def update(self, mgr: datamgr, request):
             for reward in self.rewards:
                 mgr.update_inventory(reward)
 
+@handles
+class SubStoryXacReadStoryResponse(responses.SubStoryXacReadStoryResponse):
+    async def update(self, mgr: datamgr, request):
+        if self.reward_info:
+            for reward in self.reward_info:
+                mgr.update_inventory(reward)
+
 @handles
 class SubStoryAsbReadStoryResponse(responses.SubStoryAsbReadStoryResponse):
     async def update(self, mgr: datamgr, request):

autopcr/module/modules/autosweep.py

@@ -288,6 +288,8 @@ def get_max_times(self, client: pcrclient, quest_id: int) -> int:
         113301, # 水七七香
         117001, # 水娇
         117101, # 水姐姐
+        113401, # 水星
+        113601, # 水黑骑
 ]
 @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))