Merge pull request #286 from cc004/dev

Dev

Author: Lanly109

autopcr/module/modules/caravan.py

@@ -319,6 +319,8 @@ def is_block_skip(self, block_type: int) -> bool:
                 return True
             elif (val & 2) and block_type == eBlockType.TREASURE:
                 return True
+            elif (val & 4) and block_type == eBlockType.DISH:
+                return True
         return False
 
     def get_block_change(self) -> Dict[eBlockType, eBlockType]:

autopcr/module/modules/story.py

@@ -154,6 +154,7 @@ async def do_task(self, client: pcrclient):
         for story in db.event_story_detail:
             if story.story_id not in read_story and story.story_id in unlock_story:
                 if (story.visible_type == eStoryVisibleType.EVENT_SPECIAL_STORY or 
+                    story.visible_type == eStoryVisibleType.EVENT_SPECIAL_EPISODE or 
                     story.visible_type == eStoryVisibleType.HIDDEN_BY_READ_CONDITION or 
                     story.visible_type == eStoryVisibleType.PRE_RELEASE_STORY or 
                     story.visible_type == eStoryVisibleType.PRE_STORYID_AND_LOVE_LEVEL) and \
@@ -288,4 +289,4 @@ async def do_task(self, client: pcrclient):
         rewards.extend(resp.reward_list)
 
         self._log(f"阅读了{db.alces_story[top.appear_story_id].title}，获得了：")
-        self._log(await client.serialize_reward_summary(rewards))
+        self._log(await client.serialize_reward_summary(rewards))