From 985ecf7e6e6939777fd6a6ff51324b93509a6d7f Mon Sep 17 00:00:00 2001 From: Ice-Cirno <438971718@qq.com> Date: Sat, 22 Aug 2020 01:11:31 +0800 Subject: [PATCH] data update --- hoshino/modules/priconne/_pcr_data.py | 2 +- hoshino/modules/priconne/gacha/config.json | 13 +++++++------ hoshino/modules/priconne/query/query.py | 14 +++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/hoshino/modules/priconne/_pcr_data.py b/hoshino/modules/priconne/_pcr_data.py index dc76f4b30..fd9462652 100644 --- a/hoshino/modules/priconne/_pcr_data.py +++ b/hoshino/modules/priconne/_pcr_data.py @@ -143,7 +143,7 @@ 1133: ["七七香(夏日)", "ナナカ(サマー)", "Nanaka(Summer)", "泳装娜娜卡", "泳装77k", "泳装77香", "水娜娜卡", "水77k", "水77香"], 1134: ["初音(夏日)", "ハツネ(サマー)", "Hatsune(Summer)", "水星", "海星", "水hego", "水星法", "泳装星法", "水⭐法", "水睡法", "湦"], 1135: ["美里(夏日)", "ミサト(サマー)", "Misato(Summer)", "水母", "泳装圣母", "水圣母"], - + 1136: ["纯(夏日)", "ジュン(サマー)", "Jun(Summer)", "泳装黑骑", "水黑骑", "泳装纯", "水纯", "小次郎"], diff --git a/hoshino/modules/priconne/gacha/config.json b/hoshino/modules/priconne/gacha/config.json index 01a17ef77..9e7737a22 100644 --- a/hoshino/modules/priconne/gacha/config.json +++ b/hoshino/modules/priconne/gacha/config.json @@ -3,7 +3,7 @@ "up_prob": 14, "s3_prob": 50, "s2_prob": 180, - "up": [ "铃(游侠)", "初音(夏日)" ], + "up": [ "真阳(游侠)", "纯(夏日)" ], "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高", "star3": [ "杏奈","真步","璃乃","初音","霞","伊绪", @@ -30,7 +30,7 @@ "up_prob": 7, "s3_prob": 25, "s2_prob": 180, - "up": [ "铃(游侠)" ], + "up": [ "真阳(游侠)" ], "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高", "star3": [ "杏奈","真步","璃乃","初音","霞","伊绪", @@ -56,7 +56,7 @@ "up_prob": 7, "s3_prob": 25, "s2_prob": 180, - "up": [ "初音(夏日)" ], + "up": [ "纯(夏日)" ], "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高", "star3": [ "杏奈","真步","璃乃","初音","霞","伊绪", @@ -65,9 +65,10 @@ "亚里莎","安","古蕾娅", "空花(大江户)", "妮诺(大江户)", "克萝依", "碧(插班生)", "美美(万圣节)", "露娜", "伊莉亚(圣诞节)", "霞(魔法少女)", "优妮", "琪爱儿", - "リン(レンジャー)", "マヒル(レンジャー)", "璃乃(奇境)", "祈梨" + "リン(レンジャー)", "マヒル(レンジャー)", "璃乃(奇境)", "祈梨", + "七七香(夏日)" ], - "other_normal_star3": [ "七七香(夏日)" ], + "other_normal_star3": [ ], "star2": [ "茉莉","茜里","宫子","雪","七七香","美里", "铃奈","香织","美美","绫音","铃","惠理子", @@ -83,7 +84,7 @@ "up_prob": 7, "s3_prob": 25, "s2_prob": 180, - "up": [ "佩可莉姆(夏日)" ], + "up": [ "铃莓(夏日)" ], "_comment": "star3 仅填3星常驻角色。不要填UP角，否则出率会偏高", "star3": [ "杏奈","璃乃","初音","伊绪", diff --git a/hoshino/modules/priconne/query/query.py b/hoshino/modules/priconne/query/query.py index 40bdaf615..9ca35cb9d 100644 --- a/hoshino/modules/priconne/query/query.py +++ b/hoshino/modules/priconne/query/query.py @@ -3,11 +3,11 @@ from hoshino.typing import CQEvent from . import sv -p1 = R.img('priconne/quick/r16-5-tw-0.png').cqcode -p2 = R.img('priconne/quick/r16-5-tw-1.png').cqcode -p4 = R.img('priconne/quick/r17-5-jp-1.png').cqcode -p5 = R.img('priconne/quick/r17-5-jp-2.png').cqcode -p6 = R.img('priconne/quick/r17-5-jp-3.png').cqcode +p1 = R.img('priconne/quick/r17-3-tw-0.png').cqcode +p2 = R.img('priconne/quick/r17-3-tw-1.png').cqcode +p4 = R.img('priconne/quick/r18-3-jp-1.png').cqcode +p5 = R.img('priconne/quick/r18-3-jp-2.png').cqcode +p6 = R.img('priconne/quick/r18-3-jp-3.png').cqcode p7 = R.img('priconne/quick/r9-5-cn.png').cqcode @sv.on_rex(r'^(\*?([日台国陆b])服?([前中后]*)卫?)?rank(表|推荐|指南)?$') @@ -23,7 +23,7 @@ async def rank_sheet(bot, ev): '\n※表格仅供参考，升r有风险，强化需谨慎\n※一切以会长要求为准——', ] if is_jp: - msg.append('※不定期搬运自图中Q群\n※广告为原作者推广，与本bot无关\nR17-5 rank表：') + msg.append('※不定期搬运自图中Q群\n※广告为原作者推广，与本bot无关\nR18-3 rank表：') pos = match.group(3) if not pos or '前' in pos: msg.append(str(p4)) @@ -34,7 +34,7 @@ async def rank_sheet(bot, ev): await bot.send(ev, '\n'.join(msg), at_sender=True) await util.silence(ev, 60) elif is_tw: - msg.append(f'※不定期搬运自漪夢奈特\n※油管频道有介绍视频及原文档\nR16-5 rank表：\n{p1} {p2}') + msg.append(f'※不定期搬运自漪夢奈特\n※油管频道有介绍视频及原文档\nR17-3 rank表：\n{p1} {p2}') await bot.send(ev, '\n'.join(msg), at_sender=True) await util.silence(ev, 60) elif is_cn: