🍱 Update 5.0 pool

This commit is contained in:
xtaodada 2024-08-27 11:58:27 +08:00
parent f67c16d290
commit 71267bb247
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
6 changed files with 30 additions and 3 deletions

View File

@ -1,4 +1,11 @@
POOL_301 = [ POOL_301 = [
{
"five": ["玛拉妮", "枫原万叶"],
"four": ["卡齐娜", "辛焱", "班尼特"],
"name": "鲨鲨逐浪游|叶落风随",
"from": "2024-08-28 06:00:00",
"to": "2024-09-17 17:59:59",
},
{ {
"five": ["艾梅莉埃", "夜兰"], "five": ["艾梅莉埃", "夜兰"],
"four": ["烟绯", "香菱", "雷泽"], "four": ["烟绯", "香菱", "雷泽"],

View File

@ -1,4 +1,11 @@
POOL_302 = [ POOL_302 = [
{
"five": ["冲浪时光", "苍古自由之誓"],
"four": ["西风剑", "西风大剑", "匣里灭辰", "祭礼残章", "绝弦"],
"name": "神铸赋形",
"from": "2024-08-28 06:00:00",
"to": "2024-09-17 17:59:59",
},
{ {
"five": ["柔灯挽歌", "若水"], "five": ["柔灯挽歌", "若水"],
"four": ["玛海菈的水色", "流浪的晚星", "笛剑", "西风长枪", "西风猎弓"], "four": ["玛海菈的水色", "流浪的晚星", "笛剑", "西风长枪", "西风猎弓"],

View File

@ -768,16 +768,19 @@ roles = {
], ],
10000090: ["夏沃蕾", "chevreuse"], 10000090: ["夏沃蕾", "chevreuse"],
10000091: ["娜维娅", "navia", "黄豆姐"], 10000091: ["娜维娅", "navia", "黄豆姐"],
10000092: ["嘉明", "gaming", "广东仔", "嘉明仔"], 10000092: ["嘉明", "gaming", "广东仔", "嘉明仔", "叶嘉明", "骏猊頕首"],
10000093: ["闲云", "xianyun"], 10000093: ["闲云", "xianyun"],
10000094: ["千织", "chiori"], 10000094: ["千织", "chiori"],
10000095: ["希格雯", "sigewinne", "护士长", "龙女"], 10000095: ["希格雯", "sigewinne", "护士长", "龙女"],
10000096: ["阿蕾奇诺", "arlecchino", "仆人", "父亲"], 10000096: ["阿蕾奇诺", "arlecchino", "仆人", "父亲"],
10000097: ["赛索斯", "sethos", "金沙行者", "sss"], 10000097: ["赛索斯", "sethos", "金沙行者", "sss", "衡明知度", "沙原的使者"],
10000098: ["克洛琳德", "clorinde"], 10000098: ["克洛琳德", "clorinde"],
10000099: ["艾梅莉埃", "emilie", "调香师"], 10000099: ["艾梅莉埃", "emilie", "调香师"],
10000100: ["卡齐娜", "kachina", "斑金矿朴", "乌沙博蒂", "小哭包"],
10000101: ["基尼奇", "kinich", "佐助", "猎龙人", "回火之狩"],
10000102: ["玛拉妮", "mualani", "鲨鱼妹", "哗啦啦逐浪客"],
} }
not_real_roles = [] not_real_roles = [10000101]
weapons = { weapons = {
# 1.x # 1.x
"决斗之枪": ["决斗枪", "决斗", "月卡枪"], "决斗之枪": ["决斗枪", "决斗", "月卡枪"],
@ -910,6 +913,9 @@ weapons = {
"筑云": ["筑云"], "筑云": ["筑云"],
"白雨心弦": ["心弦"], "白雨心弦": ["心弦"],
"柔灯挽歌": ["挽歌"], "柔灯挽歌": ["挽歌"],
# 5.x
"冲浪时光": ["冲浪"],
"山王长牙": ["长牙"],
} }
elements = { elements = {
"pyro": [""], "pyro": [""],

View File

@ -161,6 +161,8 @@ class WikiModel(Model):
# 包装的爬虫任务 # 包装的爬虫任务
try: try:
await queue.put(await cls._scrape(u)) # 爬取一条数据,并将其放入队列中 await queue.put(await cls._scrape(u)) # 爬取一条数据,并将其放入队列中
except NotImplementedError as exc:
logger.warning("爬取数据出现测试服数据 %s", str(exc))
except Exception as exc: # pylint: disable=W0703 except Exception as exc: # pylint: disable=W0703
logger.error("爬取数据出现异常 %s", str(exc)) logger.error("爬取数据出现异常 %s", str(exc))
logger.debug("异常信息", exc_info=exc) logger.debug("异常信息", exc_info=exc)

View File

@ -111,6 +111,8 @@ class Character(WikiModel):
id_ = re.findall(r"img/(.*?_\d+)_.*", table_rows[0].find("img").attrs["src"])[0] id_ = re.findall(r"img/(.*?_\d+)_.*", table_rows[0].find("img").attrs["src"])[0]
name = get_table_text(0) name = get_table_text(0)
if "测试" in name:
raise NotImplementedError(f"测试服数据 {name} 暂不支持")
if name != "旅行者": # 如果角色名不是 旅行者 if name != "旅行者": # 如果角色名不是 旅行者
title = get_table_text(1) title = get_table_text(1)
occupation = get_table_text(2) occupation = get_table_text(2)

View File

@ -112,6 +112,8 @@ _ASSOCIATION_MAP = {
"Inazuma": [], "Inazuma": [],
"Liyue": [], "Liyue": [],
"Mondstadt": [], "Mondstadt": [],
"Fontaine": [],
"Natlan": [],
} }
@ -125,6 +127,7 @@ class Association(Enum):
Liyue = "璃月" Liyue = "璃月"
Mondstadt = "蒙德" Mondstadt = "蒙德"
Fontaine = "枫丹" Fontaine = "枫丹"
Natlan = "纳塔"
@classmethod @classmethod
def convert(cls, string: str) -> Optional[Self]: def convert(cls, string: str) -> Optional[Self]: