Merge pull request #233 from cc004/dev

Dev

Author: Lanly109

autopcr/core/pcrclient.py

@@ -617,10 +617,10 @@ async def prepare_mana(self, mana: int):
         else:
             return False
 
-    async def exec_gacha_aware(self, target_gacha: GachaParameter, gacha_times: int, draw_type: eGachaDrawType, current_cost_num: int, campaign_id: int, auto_select_pickup: bool = True) -> GachaReward:
+    async def exec_gacha_aware(self, target_gacha: GachaParameter, gacha_times: int, draw_type: eGachaDrawType, current_cost_num: int, campaign_id: int, auto_select_pickup: bool = True, pickup_min_first: bool = False) -> GachaReward:
 
-        if draw_type == eGachaDrawType.Payment and current_cost_num < 1500:
-            raise AbortError(f"宝石{current_cost_num}不足1500")
+        if draw_type == eGachaDrawType.Payment and current_cost_num < 150 * gacha_times:
+            raise AbortError(f"宝石{current_cost_num}不足{150 * gacha_times}")
 
         if draw_type == eGachaDrawType.Ticket and current_cost_num < 1:
             raise AbortError(f"单抽券{current_cost_num}不足")
@@ -642,8 +642,9 @@ async def exec_gacha_aware(self, target_gacha: GachaParameter, gacha_times: int,
             if target_gacha.select_pickup_slot_num == len(target_gacha.priority_list) and all(db.gacha_pickup[pickup_id][u].reward_id not in self.data.unit for u in target_gacha.priority_list):
                 pass
             elif auto_select_pickup or target_gacha.select_pickup_slot_num > len(target_gacha.priority_list):
+                sign = -1 if pickup_min_first else 1
                 pickup_units = [u for u in db.gacha_pickup[pickup_id].values()]
-                pickup_units.sort(key = lambda x: (x.reward_id not in self.data.unit, -x.reward_id), reverse = True)
+                pickup_units.sort(key = lambda x: (x.reward_id not in self.data.unit, x.reward_id * sign), reverse = True)
                 pickup_units = pickup_units[:target_gacha.select_pickup_slot_num]
                 pickup_units = [u.priority for u in pickup_units]
                 if set(pickup_units) != set(target_gacha.priority_list):
@@ -655,7 +656,7 @@ async def exec_gacha_aware(self, target_gacha: GachaParameter, gacha_times: int,
             raise AbortError(f"已达到天井{self.data.gacha_point[target_gacha.exchange_id].current_point}pt，请上号兑换角色") 
 
         if draw_type == eGachaDrawType.Payment: # 怎么回传没有宝石数
-            tot = 1500
+            tot = 150 * gacha_times
             mine = min(tot, self.data.jewel.free_jewel)
 
             tot -= mine
@@ -713,6 +714,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_ais_story(self, sub_story_id: int):
+        req = SubStoryAisReadStoryRequest()
+        req.sub_story_id = sub_story_id
+        await self.request(req)
+
     async def read_nyd_story(self, sub_story_id: int):
         req = SubStoryNydReadStoryRequest()
         req.sub_story_id = sub_story_id

autopcr/db/database.py

@@ -52,6 +52,7 @@ class database():
     jewel: ItemType = (eInventoryType.Jewel, 91002)
     travel_speed_up_paper: ItemType = (eInventoryType.Item, 23002)
     gacha_single_ticket: ItemType = (eInventoryType.Item, 24001)
+    gacha_ten_tickets: List[ItemType] = [(eInventoryType.Item, 24002), (eInventoryType.Item, 24004)]
     dice: ItemType = (eInventoryType.Item, 99009)
     ex_pt: ItemType = (eInventoryType.Item, 26201)
 
@@ -1201,6 +1202,14 @@ def hatsune_item(self) -> Dict[int, HatsuneItem]:
                 .to_dict(lambda x: x.event_id, lambda x: x)
             )
 
+    @lazy_property
+    def ais_story_data(self) -> Dict[int, AisStoryDatum]:
+        with self.dbmgr.session() as db:
+            return (
+                AisStoryDatum.query(db)
+                .to_dict(lambda x: x.sub_story_id, lambda x: x)
+            )
+
     @lazy_property
     def nyd_story_data(self) -> Dict[int, NydStoryDatum]:
         with self.dbmgr.session() as db:

autopcr/model/handlers.py

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

autopcr/module/modules/autosweep.py

@@ -219,15 +219,19 @@ def get_max_times(self, client: pcrclient, quest_id: int) -> int:
 @conditional_not_execution("shiori_sweep_not_run_time", ["n3", 'n4及以上'])
 @conditional_execution1("shiori_sweep_run_time", ["无庆典"])
 @singlechoice('shiori_sweep_consider_unit_order', "刷取顺序", "缺口少优先", ["缺口少优先", "缺口大优先"])
-@description('根据记忆碎片缺口刷外传图，直到盈余超过阈值')
+@booltype('shiori_sweep_only_consider_limit_unit', "仅限定角色", True)
+@description('根据记忆碎片缺口刷外传图，直到盈余超过阈值，仅限定角色指只考虑活动赠送角色，不考虑常驻角色')
 @name('智能刷外传图')
 @default(False)
 @tag_stamina_consume
 class smart_shiori_sweep(simple_demand_sweep_base):
 
     async def get_need_list(self, client: pcrclient) -> List[Tuple[ItemType, int]]:
         gap_limit = self.get_config('shiori_sweep_gap_limit')
+        consider_limit = self.get_config('shiori_sweep_only_consider_limit_unit')
         need_list = client.data.get_memory_demand_gap()
+        if consider_limit:
+            need_list = {token: need for token, need in need_list.items() if db.unit_data[db.memory_to_unit[token[1]]].is_limited}
         need_list = [(token, need) for token, need in need_list.items() if need > -gap_limit]
         if not need_list:
             raise SkipError("所有记忆碎片均已盈余")

autopcr/module/modules/gacha.py

@@ -69,6 +69,7 @@ async def do_task(self, client: pcrclient):
 @description('有免费十连时自动抽取，附奖池自动选择缺口最多的碎片，多卡池可抽取则选择编号大的。卡池编号名字可于“危险”栏查看。智能pickup指当抽出pickup角色后自动切换未拥有的pickup角色，有多个则选角色编号大的。未选够pickup角色会自动选。')
 @name('免费十连')
 @booltype('today_end_gacha_no_do', "当日切卡池前不抽取", True)
+@booltype('free_gacha_start_auto_select_pickup_min_first', "PickUp编号小优先", False)
 @booltype('free_gacha_auto_select_pickup', "智能pickup", True)
 @multichoice('free_gacha_select_ids', "抽取卡池", db.free_gacha_ids_candidate, db.free_gacha_ids_candidate)
 @default(False)
@@ -79,6 +80,7 @@ async def do_task(self, client: pcrclient):
             raise SkipError("免费十连已结束")
         free_gacha_select_ids: List[str] = self.get_config("free_gacha_select_ids")
         free_gacha_auto_select_pickup: bool = self.get_config("free_gacha_auto_select_pickup")
+        pickup_min_first: bool = self.get_config("free_gacha_start_auto_select_pickup_min_first")
         schedule = db.campaign_gacha[res.campaign_info.campaign_id]
         gacha_list = db.campaign_free_gacha_data[schedule.campaign_id]
         start_time = db.parse_time(schedule.start_time)
@@ -122,7 +124,7 @@ async def do_task(self, client: pcrclient):
         self._log(f"抽取卡池：{db.gacha_data[target_gacha.id].gacha_name}")
 
         while cnt > 0:
-            gacha_reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Campaign10Shot, cnt, res.campaign_info.campaign_id, free_gacha_auto_select_pickup)
+            gacha_reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Campaign10Shot, cnt, res.campaign_info.campaign_id, free_gacha_auto_select_pickup, pickup_min_first)
             cnt -= 1
 
         self._log(await client.serlize_gacha_reward(gacha_reward, target_gacha.id))

autopcr/module/modules/tools.py

@@ -246,11 +246,12 @@ async def do_task(self, client: pcrclient):
                 self._log(f"==常驻角色==" )
                 self._log('\n'.join(db.get_unit_name(id) for id in resident_unit))
 
-@description('警告！真抽！\n抽到出指NEW出保底角色，或达天井停下来，如果已有保底角色，就不会NEW！意味着就是一井！\n智能pickup指当前pickup角色为已拥有角色时会自动切换成未拥有的角色。\n附奖池自动选择缺口最多的碎片，pickup池未选满角色自动选择未拥有角色，有多个则按角色编号大到小选取\n先免费十连->限定十连券->钻石')
+@description('警告！真抽！\n抽到出指NEW出保底角色，或达天井停下来，如果已有保底角色，就不会NEW！意味着就是一井！\n智能pickup指当前pickup角色为已拥有角色时会自动切换成未拥有的角色。\n附奖池自动选择缺口最多的碎片，pickup池未选满角色自动选择未拥有角色，有多个则按角色编号大到小或小到大选取\n先免费十连->限定十连券->钻石')
 @name('抽卡')
-@booltype("single_ticket", "用单抽券", False)
+@singlechoice("gacha_method", "抽取方式", '十连', ['十连', '单抽', '单抽券'])
 @singlechoice("pool_id", "池子", "", db.get_cur_gacha)
-@booltype('gacha_start_auto_select_pickup', "智能pickup", True)
+@booltype('gacha_start_auto_select_pickup_min_first', "PickUp编号小优先", False)
+@booltype('gacha_start_auto_select_pickup', "智能PickUp", True)
 @booltype("cc_until_get", "抽到出", False)
 @default(True)
 class gacha_start(Module):
@@ -262,7 +263,8 @@ async def do_task(self, client: pcrclient):
         if ':' not in self.get_config('pool_id'):
             raise ValueError("配置格式不正确")
         gacha_id = int(self.get_config('pool_id').split(':')[0])
-        single_ticket = self.get_config('single_ticket')
+        gacha_method = self.get_config('gacha_method')
+        pickup_min_first = self.get_config('gacha_start_auto_select_pickup_min_first')
         real_exchange_id = 0
         if gacha_id == 120001:
             if not client.data.return_fes_info_list or all(item.end_time <= client.time for item in client.data.return_fes_info_list):
@@ -287,26 +289,36 @@ async def do_task(self, client: pcrclient):
         gacha_start_auto_select_pickup: bool = self.get_config('gacha_start_auto_select_pickup')
         try:
             while True:
-                if single_ticket:
-                    reward += await client.exec_gacha_aware(target_gacha, 1, eGachaDrawType.Ticket, client.data.get_inventory(db.gacha_single_ticket), 0)
-                else:
+                if gacha_method == '单抽券':
+                    reward += await client.exec_gacha_aware(target_gacha, 1, eGachaDrawType.Ticket, client.data.get_inventory(db.gacha_single_ticket), 0, gacha_start_auto_select_pickup, pickup_min_first)
+                elif gacha_method == '单抽':
+                    reward += await client.exec_gacha_aware(target_gacha, 1, eGachaDrawType.Payment, client.data.jewel.free_jewel + client.data.jewel.jewel, 0, gacha_start_auto_select_pickup, pickup_min_first)
+                elif gacha_method == '十连':
                     if isinstance(resp, GachaIndexResponse) and resp.campaign_info and resp.campaign_info.fg10_exec_cnt and target_gacha.id in db.campaign_free_gacha_data[resp.campaign_info.campaign_id]:
-                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Campaign10Shot, cnt, resp.campaign_info.campaign_id, gacha_start_auto_select_pickup)
+                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Campaign10Shot, cnt, resp.campaign_info.campaign_id, gacha_start_auto_select_pickup, pickup_min_first)
                         resp.campaign_info.campaign_id -= 1
                     elif any(client.data.get_inventory(temp_ticket) > 0 for temp_ticket in temp_tickets):
                         # find first ticket
                         ticket = next((temp_ticket for temp_ticket in temp_tickets if client.data.get_inventory(temp_ticket)))
                         num = client.data.get_inventory(ticket)
-                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Temp_Ticket_10, num, 0, gacha_start_auto_select_pickup)
+                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Temp_Ticket_10, num, 0, gacha_start_auto_select_pickup, pickup_min_first)
+                    elif any(client.data.get_inventory(gacha_ten_ticket) > 0 for gacha_ten_ticket in db.gacha_ten_tickets):
+                        ticket = next((gacha_ten_ticket for gacha_ten_ticket in db.gacha_ten_tickets if client.data.get_inventory(gacha_ten_ticket)))
+                        num = client.data.get_inventory(ticket)
+                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Ticket, num, 0, gacha_start_auto_select_pickup, pickup_min_first) # real ticket ?
                     else:
-                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Payment, client.data.jewel.free_jewel + client.data.jewel.jewel, 0, gacha_start_auto_select_pickup)
+                        reward += await client.exec_gacha_aware(target_gacha, 10, eGachaDrawType.Payment, client.data.jewel.free_jewel + client.data.jewel.jewel, 0, gacha_start_auto_select_pickup, pickup_min_first)
+                else:
+                    raise ValueError("未知的抽卡方式")
+
                 cnt += 1
                 if not always or self.can_stop(reward.new_unit, db.gacha_exchange_chara[target_gacha.exchange_id if not real_exchange_id else real_exchange_id]):
                     break
+
         except:
             raise 
         finally:
-            self._log(f"抽取了{cnt}次{'十连' if not single_ticket else '单抽'}")
+            self._log(f"抽取了{cnt}次{gacha_method}")
             self._log(await client.serlize_gacha_reward(reward, target_gacha.id))
             point = client.data.gacha_point[target_gacha.exchange_id].current_point if target_gacha.exchange_id in client.data.gacha_point else 0
             self._log(f"当前pt为{point}")

autopcr/util/substory.py

@@ -35,6 +35,16 @@ def GetSubStoryReader(sub_story_data: EventSubStory, client: pcrclient) -> Union
         return constructor[sub_story_data.event_id](client)
     return None
 
+@EventId(10137)
+@EventId(10136)
+class ais_substory(SubStoryReader):
+
+    def title(self, sub_story_id: int) -> str:
+        return db.ais_story_data[sub_story_id].title
+
+    async def read(self, sub_story_id: int):
+        await self.client.read_ais_story(sub_story_id)
+
 @EventId(10134)
 class nyd_substory(SubStoryReader):
 

server.py

@@ -61,7 +61,7 @@
 - {prefix}卡池 查看当前卡池
 - {prefix}编队 1 1 春妈 蝶妈 狗妈 水妈 礼妈 便捷设置编队
 - {prefix}免费十连 <卡池id> 卡池id来自【{prefix}卡池】
-- {prefix}来发十连 <卡池id> [抽到出] [单抽券] [开抽] 赛博抽卡，谨慎使用。卡池id来自【{prefix}卡池】，[抽到出]表示抽到出货或达天井，[单抽券]表示仅用厕纸，[开抽]表示确认抽卡。已有up也可再次触发。
+- {prefix}来发十连 <卡池id> [抽到出] [单抽券|单抽] [编号小优先] [开抽] 赛博抽卡，谨慎使用。卡池id来自【{prefix}卡池】，[抽到出]表示抽到出货或达天井，默认十连，[单抽券]表示仅用厕纸，[单抽]表示宝石单抽，[标号小优先]指智能pickup时优先选择编号小的角色，[开抽]表示确认抽卡。已有up也可再次触发。
 """.strip()
 
 if address is None:
@@ -667,7 +667,9 @@ async def shilian(botev: BotEvent):
     cc_until_get = False
     pool_id = ""
     really_do = False
-    ticket = False
+    single_ticket = False
+    single = False
+    small_first = False
     msg = await botev.message()
     try:
         pool_id = msg[0]
@@ -686,7 +688,17 @@ async def shilian(botev: BotEvent):
         pass
 
     try:
-        ticket = is_args_exist(msg, '单抽券')
+        single_ticket = is_args_exist(msg, '单抽券')
+    except:
+        pass
+
+    try:
+        single = is_args_exist(msg, '单抽')
+    except:
+        pass
+
+    try:
+        small_first = is_args_exist(msg, '编号小优先')
     except:
         pass
 
@@ -697,19 +709,30 @@ async def shilian(botev: BotEvent):
 
     pool_id = current_gacha[pool_id]
 
+    if single_ticket and single:
+        await botev.finish("单抽券和单抽只能选一个")
+
+    gacha_method = "十连"
+    if single_ticket:
+        gacha_method = "单抽券"
+    elif single:
+        gacha_method = "单抽"
+
     if not really_do:
         msg = f"卡池{pool_id}\n"
         if cc_until_get:
             msg += "抽到出\n"
-        if ticket:
-            msg += "单抽券\n"
+        if small_first:
+            msg += "编号小优先\n"
+        msg += f"{gacha_method}\n"
         msg += "确认无误，消息末尾加上【开抽】即可开始抽卡"
         await botev.finish(msg)
 
     config = {
         "pool_id": pool_id,
         "cc_until_get": cc_until_get,
-        "single_ticket": ticket,
+        "gacha_method": gacha_method,
+        "gacha_start_auto_select_pickup_min_first": small_first,
     }
     return config