Merge pull request #271 from cc004/dev

Author: Lanly109

autopcr/core/pcrclient.py

@@ -739,6 +739,15 @@ async def tpr_register_success(self, panel_id: int, correct_type: int, parts_id_
         req.parts_id_list = parts_id_list
         return await self.request(req)
 
+    async def read_lss_story(self, sub_story_id: int):
+        req = SubStoryLssReadStoryRequest()
+        req.sub_story_id = sub_story_id
+        req.skip_info = StorySkipInfo(
+                skip_type = eStorySkipType.MENU_SKIP,
+                scroll_coordinate = ""
+        )
+        return await self.request(req)
+
     async def read_tpr_story(self, sub_story_id: int):
         req = SubStoryTprReadStoryRequest()
         req.sub_story_id = sub_story_id

autopcr/db/database.py

@@ -1263,6 +1263,14 @@ def hatsune_item(self) -> Dict[int, HatsuneItem]:
                 .to_dict(lambda x: x.event_id, lambda x: x)
             )
 
+    @lazy_property
+    def lss_story_data(self) -> Dict[int, LssStoryDatum]:
+        with self.dbmgr.session() as db:
+            return (
+                LssStoryDatum.query(db)
+                .to_dict(lambda x: x.sub_story_id, lambda x: x)
+            )
+
     @lazy_property
     def tpr_story_data(self) -> Dict[int, TprStoryDatum]:
         with self.dbmgr.session() as db:

autopcr/model/custom.py

@@ -239,6 +239,18 @@ class ArenaQueryResponse(BaseModel):
     data: Optional[ArenaQueryData]
     version: str
 
+class eRedeemUnitUnlockCondition(IntEnum):
+    NONE = 0
+    UNLOCK_UNIT = 1
+    VIEWED_STORY = 2
+    GOLD = 3
+    CURRENCY = 4
+    MEMORY_PIECE = 5
+    SUPER_MEMORY_PIECE = 6
+    JEWEL = 7
+    EQUIP = 8
+    EQUIP_MATERIAL = 9
+
 class TalentQuestData(BaseModel):
     talent_id: int = None
     clear_count: int = None

autopcr/model/handlers.py

@@ -784,6 +784,17 @@ async def update(self, mgr: datamgr, request):
                 mgr.update_inventory(reward)
 
 @handles
+class SubStoryLssReadStoryResponse(responses.SubStoryLssReadStoryResponse):
+    async def update(self, mgr: datamgr, request):
+        if self.reward_info:
+            for reward in self.reward_info:
+                mgr.update_inventory(reward)
+        if self.special_reward_list:
+            for reward in self.special_reward_list:
+                mgr.update_inventory(reward)
+        if self.user_jewel:
+            mgr.jewel = self.user_jewel
+@handles
 class SubStoryNydReadStoryResponse(responses.SubStoryNydReadStoryResponse):
     async def update(self, mgr: datamgr, request):
         if self.reward_info:

autopcr/module/modules/story.py

@@ -199,7 +199,7 @@ async def do_task(self, client: pcrclient):
 
             if any(sub_story.status == eEventSubStoryStatus.ADDED for sub_story in sub_storys.sub_story_info_list):
                 await reader.confirm()
-            for sub_story in sub_storys.sub_story_info_list:
+            for sub_story in await reader.sort_by_time(sub_storys.sub_story_info_list):
                 if sub_story.status == eEventSubStoryStatus.UNREAD and reader.is_readable(sub_story.sub_story_id):
                     await reader.read(sub_story.sub_story_id)
                     self._log(f"阅读了{reader.title(sub_story.sub_story_id)}")

autopcr/module/modules/tools.py

@@ -5,7 +5,7 @@
 from ...model.common import ChangeRarityUnit, DeckListData, GachaPointInfo, GrandArenaHistoryDetailInfo, GrandArenaHistoryInfo, GrandArenaSearchOpponent, ProfileUserInfo, RankingSearchOpponent, RedeemUnitInfo, RedeemUnitSlotInfo, UnitData, UnitDataLight, VersusResult, VersusResultDetail
 from ...model.responses import GachaIndexResponse, PsyTopResponse
 from ...db.models import GachaExchangeLineup
-from ...model.custom import ArenaQueryResult, GachaReward, ItemType
+from ...model.custom import ArenaQueryResult, GachaReward, ItemType, eRedeemUnitUnlockCondition
 from ..modulebase import *
 from ..config import *
 from ...core.pcrclient import pcrclient
@@ -37,6 +37,7 @@ async def do_task(self, client: pcrclient):
 @booltype('redeem_unit_swap_do', '开换', False)
 @description('计算兑换对应角色所需的3000碎片的最优使用方案，使得剩余碎片的盈余值的最大值最小')
 class redeem_unit_swap(Module):
+
     async def do_task(self, client: pcrclient):
         do = self.get_config('redeem_unit_swap_do')
 
@@ -57,17 +58,27 @@ async def do_task(self, client: pcrclient):
 
             for slot_info in info.slot_info:
                 db_info = db.get_redeem_unit_slot_info(unit_id,slot_info.slot_id)
-                if slot_info.slot_id == 1:
-                    self._log(f"已使用{slot_info.register_num}碎片")
-                    use_piece = int(db_info.consume_num) - slot_info.register_num
-                elif slot_info.slot_id == 2:
-                    self._log(f"已使用{slot_info.register_num}玛那")
-                elif slot_info.slot_id == 3:
+                if db_info.condition_category == eRedeemUnitUnlockCondition.UNLOCK_UNIT:
                     if db_info.condition_id not in client.data.unit:
                         raise AbortError(f"未解锁{db.get_unit_name(db_info.condition_id)}，无法兑换{db.get_unit_name(unit_id)}")
-                elif slot_info.slot_id == 4:
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.VIEWED_STORY:
                     if db_info.condition_id not in client.data.read_story_ids:
                         raise AbortError(f"未阅读{db_info.condition_id}，无法兑换{db.get_unit_name(unit_id)}")
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.GOLD:
+                    self._log(f"已使用{slot_info.register_num}玛那")
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.CURRENCY:
+                    self._log(f"已使用{slot_info.register_num}??")
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.MEMORY_PIECE:
+                    self._log(f"已使用{slot_info.register_num}碎片")
+                    use_piece = int(db_info.consume_num) - slot_info.register_num
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.SUPER_MEMORY_PIECE:
+                    self._log(f"已使用{slot_info.register_num}纯净碎片")
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.JEWEL:
+                    self._log(f"已使用{slot_info.register_num}宝石")
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.EQUIP:
+                    self._log(f"已使用{slot_info.register_num}装备")
+                elif db_info.condition_category == eRedeemUnitUnlockCondition.EQUIP_MATERIAL:
+                    self._log(f"已使用{slot_info.register_num}装备碎片")
                 else:
                     raise ValueError(f"未知的兑换条件{slot_info.slot_id}")
 
@@ -90,13 +101,14 @@ async def do_task(self, client: pcrclient):
 
             if do:
                 for slot_info in info.slot_info:
-                    if slot_info.slot_id == 1:
+                    db_info = db.get_redeem_unit_slot_info(unit_id,slot_info.slot_id)
+                    if db_info.condition_category == eRedeemUnitUnlockCondition.MEMORY_PIECE:
                         memory_use = Counter({item[i]: res[i] for i in id if res[i] > 0})
                         if memory_use:
                             self._log(f"使用了角色碎片")
                             ret = await client.unit_register_item(unit_id, slot_info.slot_id, memory_use, slot_info.register_num)
                             slot_info.register_num = ret.register_num
-                    elif slot_info.slot_id == 2:
+                    elif db_info.condition_category == eRedeemUnitUnlockCondition.GOLD:
                         info = db.get_redeem_unit_slot_info(unit_id,slot_info.slot_id)
                         total_mana = int(info.consume_num) - slot_info.register_num
                         if not (await client.prepare_mana(total_mana)):
@@ -107,6 +119,11 @@ async def do_task(self, client: pcrclient):
                             ret = await client.unit_register_item(unit_id, slot_info.slot_id, Counter({(eInventoryType.Gold, info.condition_id): mana}), slot_info.register_num)
                             slot_info.register_num = ret.register_num
                             total_mana -= mana
+                    else:
+                        if db_info.condition_category in [eRedeemUnitUnlockCondition.UNLOCK_UNIT,
+                                                        eRedeemUnitUnlockCondition.VIEWED_STORY]:
+                            continue
+                        raise AbortError(f"未实现的兑换条件{db_info.condition_category}")
 
                 self._log(f"兑换{db.get_unit_name(unit_id)}")
                 await client.unit_unlock_redeem_unit(unit_id)

autopcr/util/substory.py

@@ -36,6 +36,8 @@ async def special_read(self, sub_storys: List[EventSubStory], _log: Callable): .
     async def confirm(self): ...
     async def prepare(self):
         pass
+    async def sort_by_time(self, sub_story_ids: List[EventSubStory]) -> List[EventSubStory]:
+        return sub_story_ids
 
     def __init__(self, client: pcrclient):
         self.client = client
@@ -45,6 +47,16 @@ def GetSubStoryReader(sub_story_data: EventSubStory, client: pcrclient) -> Union
         return constructor[sub_story_data.event_id](client)
     return None
 
+@EventId(10150)
+class lss_substory(SubStoryReader):
+
+    def title(self, sub_story_id: int) -> str:
+        return db.lss_story_data[sub_story_id].title
+
+    async def read(self, sub_story_id: int):
+        await self.client.story_check(sub_story_id)
+        await self.client.read_lss_story(sub_story_id)
+
 @EventId(10148)
 class tpr_substory(SubStoryReader):
     special = True
@@ -98,6 +110,9 @@ async def prepare(self):
     async def read(self, sub_story_id: int):
         await self.client.read_apg_story(sub_story_id)
 
+    async def sort_by_time(self, sub_story_ids: List[EventSubStory]) -> List[EventSubStory]:
+        return sorted(sub_story_ids, key=lambda s: db.parse_time(db.apg_story_data[s.sub_story_id].condition_time))
+
 @EventId(10140)
 class fpc_substory(SubStoryReader):
     special = True