Skip to content

Commit

Permalink
🍱 更新v5.2版本的metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
KimigaiiWuyi committed Nov 20, 2024
1 parent 7a5ec0a commit eeba069
Show file tree
Hide file tree
Showing 32 changed files with 9,438 additions and 6,029 deletions.
1,130 changes: 774 additions & 356 deletions GenshinUID/genshinuid_enka/effect/char_action.json

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions GenshinUID/genshinuid_enka/effect/char_effect.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,88 @@
{
"恰斯卡": {
"normal": {
"normal_skill": {
"50": "",
"70": ""
},
"normal_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
}
},
"fight": {
"fight_skill": {
"50": "追影弹:dmgBonus+65",
"70": ""
},
"fight_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": "追影弹:critDmg+120"
},
"group_skill": {
"50": "",
"70": ""
},
"group_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
}
}
},
"欧洛伦": {
"normal": {
"normal_skill": {
"50": "",
"70": ""
},
"normal_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
}
},
"fight": {
"fight_skill": {
"50": "",
"70": ""
},
"fight_talent": {
"1": "",
"2": "ElectroDmgBonus+32",
"3": "",
"4": "",
"5": "",
"6": "addAtk+30"
},
"group_skill": {
"50": "",
"70": ""
},
"group_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": "addAtk+30"
}
}
},
"希诺宁": {
"normal": {
"normal_skill": {
Expand Down
8 changes: 8 additions & 0 deletions GenshinUID/genshinuid_enka/effect/skill_add.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,5 +346,13 @@
"希诺宁": [
"E",
"Q"
],
"欧洛伦": [
"Q",
"E"
],
"恰斯卡": [
"E",
"Q"
]
}
124 changes: 124 additions & 0 deletions GenshinUID/genshinuid_enka/effect/weapon_effect.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,128 @@
{
"厄水之祸": {
"normal": {
"normal_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
}
},
"fight": {
"fight_effect": {
"1": "AB:dmgBonus+20;AB:critRate+8",
"2": "AB:dmgBonus+25;AB:critRate+10",
"3": "AB:dmgBonus+30;AB:critRate+12",
"4": "AB:dmgBonus+35;AB:critRate+14",
"5": "AB:dmgBonus+40;AB:critRate+16"
},
"group_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
},
"time": 7,
"extra": {

}
}
},
"乘浪的回旋": {
"normal": {
"normal_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
}
},
"fight": {
"fight_effect": {
"1": "addHp+44",
"2": "addHp+55",
"3": "addHp+66",
"4": "addHp+77",
"5": "addHp+88"
},
"group_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
},
"time": 7,
"extra": {

}
}
},
"缀花之翎": {
"normal": {
"normal_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
}
},
"fight": {
"fight_effect": {
"1": "B:dmgBonus+36",
"2": "B:dmgBonus+45",
"3": "B:dmgBonus+54",
"4": "B:dmgBonus+63",
"5": "B:dmgBonus+72"
},
"group_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
},
"time": 0,
"extra": {

}
}
},
"星鹫赤羽": {
"normal": {
"normal_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
}
},
"fight": {
"fight_effect": {
"1": "addAtk+24;B:dmgBonus+48;Q:dmgBonus+24",
"2": "addAtk+30;B:dmgBonus+60;Q:dmgBonus+30",
"3": "addAtk+36;B:dmgBonus+72;Q:dmgBonus+36",
"4": "addAtk+42;B:dmgBonus+84;Q:dmgBonus+42",
"5": "addAtk+48;B:dmgBonus+96;Q:dmgBonus+48"
},
"group_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
},
"time": 12,
"extra": {

}
}
},
"弥坚骨": {
"normal": {
"normal_effect": {
Expand Down
11 changes: 7 additions & 4 deletions GenshinUID/tools/data_to_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,13 @@ async def avatarName2ElementJson() -> None:
if _id in ['10000005', '10000007'] or int(_id) >= 11000000:
continue
name = avatarId2Name[_id]
data = httpx.get(
f'https://info.minigg.cn/characters?query={name}'
).json()
if 'retcode' in data:
try:
data = httpx.get(
f'https://info.minigg.cn/characters?query={name}'
).json()
if 'retcode' in data:
data = await convert_ambr_to_minigg(_id)
except json.decoder.JSONDecodeError:
data = await convert_ambr_to_minigg(_id)
if data is not None and 'code' not in data:
temp[name] = elementMap[data['elementText']]
Expand Down
44 changes: 32 additions & 12 deletions GenshinUID/tools/get_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from pathlib import Path
from copy import deepcopy

import httpx
# import httpx

sys.path.append(str(Path(__file__).parents[2]))
sys.path.append(str(Path(__file__).parents[5]))
Expand All @@ -18,7 +18,7 @@
)

char_list: List[str] = []
char_action = {}
# char_action = {}
INDEX_MAP = ['', 'A', 'E', 'Q']
attack_type_list = {
'普通攻击': 'A',
Expand Down Expand Up @@ -329,26 +329,46 @@ def find_tag(labels: List, index: int, char: str, parameters: dict) -> dict:


async def main():
with open(
str(
Path(__file__).parents[1]
/ 'genshinuid_enka'
/ 'effect'
/ 'char_action.json'
),
'r',
encoding='UTF-8',
) as file:
char_action = json.load(file)

for char_id in avatarId2Name:
char_list.append(avatarId2Name[char_id])
char_list.extend(['旅行者(风)', '旅行者(雷)', '旅行者(岩)', '旅行者(草)'])
for char in char_list:
print(char)
'''
talent_data = httpx.get(
f'https://info.minigg.cn/talents?query={char}'
).json()
if 'retcode' in talent_data:
for _id in avatarId2Name:
if avatarId2Name[_id] == char:
char_id = _id
break
else:
continue
if int(char_id) >= 11000000:
continue
'''
for _id in avatarId2Name:
if avatarId2Name[_id] == char:
char_id = _id
break
else:
continue
if int(char_id) >= 11000000:
continue

try:
talent_data = await convert_ambr_to_talent(char_id)
if talent_data is None:
continue
except Exception as e:
print(e)
continue

if talent_data is None:
continue
result = {}
for i in range(1, 4):
skill = talent_data['combat{}'.format(str(i))]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"10000001": "凯特", "10000002": "神里绫华", "10000003": "琴", "10000005": "旅行者", "10000006": "丽莎", "10000007": "旅行者", "10000014": "芭芭拉", "10000015": "凯亚", "10000016": "迪卢克", "10000020": "雷泽", "10000021": "安柏", "10000022": "温迪", "10000023": "香菱", "10000024": "北斗", "10000025": "行秋", "10000026": "魈", "10000027": "凝光", "10000029": "可莉", "10000030": "钟离", "10000031": "菲谢尔", "10000032": "班尼特", "10000033": "达达利亚", "10000034": "诺艾尔", "10000035": "七七", "10000036": "重云", "10000037": "甘雨", "10000038": "阿贝多", "10000039": "迪奥娜", "10000041": "莫娜", "10000042": "刻晴", "10000043": "砂糖", "10000044": "辛焱", "10000045": "罗莎莉亚", "10000046": "胡桃", "10000047": "枫原万叶", "10000048": "烟绯", "10000049": "宵宫", "10000050": "托马", "10000051": "优菈", "10000052": "雷电将军", "10000053": "早柚", "10000054": "珊瑚宫心海", "10000055": "五郎", "10000056": "九条裟罗", "10000057": "荒泷一斗", "10000058": "八重神子", "10000059": "鹿野院平藏", "10000060": "夜兰", "10000061": "绮良良", "10000062": "埃洛伊", "10000063": "申鹤", "10000064": "云堇", "10000065": "久岐忍", "10000066": "神里绫人", "10000067": "柯莱", "10000068": "多莉", "10000069": "提纳里", "10000070": "妮露", "10000071": "赛诺", "10000072": "坎蒂丝", "10000073": "纳西妲", "10000074": "莱依拉", "10000075": "流浪者", "10000076": "珐露珊", "10000077": "瑶瑶", "10000078": "艾尔海森", "10000079": "迪希雅", "10000080": "米卡", "10000081": "卡维", "10000082": "白术", "10000083": "琳妮特", "10000084": "林尼", "10000085": "菲米尼", "10000086": "莱欧斯利", "10000087": "那维莱特", "10000088": "夏洛蒂", "10000089": "芙宁娜", "10000090": "夏沃蕾", "10000091": "娜维娅", "10000092": "嘉明", "10000093": "闲云", "10000094": "千织", "10000095": "希格雯", "10000096": "阿蕾奇诺", "10000097": "赛索斯", "10000098": "克洛琳德", "10000099": "艾梅莉埃", "10000100": "卡齐娜", "10000101": "基尼奇", "10000102": "玛拉妮", "10000103": "希诺宁", "10000901": "玛薇卡(试用)"}
{"10000001": "凯特", "10000002": "神里绫华", "10000003": "琴", "10000005": "旅行者", "10000006": "丽莎", "10000007": "旅行者", "10000014": "芭芭拉", "10000015": "凯亚", "10000016": "迪卢克", "10000020": "雷泽", "10000021": "安柏", "10000022": "温迪", "10000023": "香菱", "10000024": "北斗", "10000025": "行秋", "10000026": "魈", "10000027": "凝光", "10000029": "可莉", "10000030": "钟离", "10000031": "菲谢尔", "10000032": "班尼特", "10000033": "达达利亚", "10000034": "诺艾尔", "10000035": "七七", "10000036": "重云", "10000037": "甘雨", "10000038": "阿贝多", "10000039": "迪奥娜", "10000041": "莫娜", "10000042": "刻晴", "10000043": "砂糖", "10000044": "辛焱", "10000045": "罗莎莉亚", "10000046": "胡桃", "10000047": "枫原万叶", "10000048": "烟绯", "10000049": "宵宫", "10000050": "托马", "10000051": "优菈", "10000052": "雷电将军", "10000053": "早柚", "10000054": "珊瑚宫心海", "10000055": "五郎", "10000056": "九条裟罗", "10000057": "荒泷一斗", "10000058": "八重神子", "10000059": "鹿野院平藏", "10000060": "夜兰", "10000061": "绮良良", "10000062": "埃洛伊", "10000063": "申鹤", "10000064": "云堇", "10000065": "久岐忍", "10000066": "神里绫人", "10000067": "柯莱", "10000068": "多莉", "10000069": "提纳里", "10000070": "妮露", "10000071": "赛诺", "10000072": "坎蒂丝", "10000073": "纳西妲", "10000074": "莱依拉", "10000075": "流浪者", "10000076": "珐露珊", "10000077": "瑶瑶", "10000078": "艾尔海森", "10000079": "迪希雅", "10000080": "米卡", "10000081": "卡维", "10000082": "白术", "10000083": "琳妮特", "10000084": "林尼", "10000085": "菲米尼", "10000086": "莱欧斯利", "10000087": "那维莱特", "10000088": "夏洛蒂", "10000089": "芙宁娜", "10000090": "夏沃蕾", "10000091": "娜维娅", "10000092": "嘉明", "10000093": "闲云", "10000094": "千织", "10000095": "希格雯", "10000096": "阿蕾奇诺", "10000097": "赛索斯", "10000098": "克洛琳德", "10000099": "艾梅莉埃", "10000100": "卡齐娜", "10000101": "基尼奇", "10000102": "玛拉妮", "10000103": "希诺宁", "10000104": "恰斯卡", "10000105": "欧洛伦", "10000901": "玛薇卡(试用)"}
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,21 @@
"10332": "音火锻淬",
"10339": "豹烈律动!"
},
"10000104": {
"10431": "普通攻击·迷羽流击",
"10432": "灵缰追影",
"10439": "索魂命袭"
},
"10000102": {
"10231": "普通攻击·降温处理",
"10232": "踏鲨破浪",
"10239": "爆瀑飞弹"
},
"10000105": {
"10531": "普通攻击·宿灵闪箭",
"10532": "暝色缒索",
"10539": "黯声回响"
},
"10000036": {
"3631": "普通攻击·灭邪四式",
"3632": "灵刃·重华叠霜",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"10000002": "5", "10000003": "5", "10000006": "4", "10000014": "4", "10000015": "4", "10000016": "5", "10000020": "4", "10000021": "4", "10000022": "5", "10000023": "4", "10000024": "4", "10000025": "4", "10000026": "5", "10000027": "4", "10000029": "5", "10000030": "5", "10000031": "4", "10000032": "4", "10000033": "5", "10000034": "4", "10000035": "5", "10000036": "4", "10000037": "5", "10000038": "5", "10000039": "4", "10000041": "5", "10000042": "5", "10000043": "4", "10000044": "4", "10000045": "4", "10000046": "5", "10000047": "5", "10000048": "4", "10000049": "5", "10000050": "4", "10000051": "5", "10000052": "5", "10000053": "4", "10000054": "5", "10000055": "4", "10000056": "4", "10000057": "5", "10000058": "5", "10000059": "4", "10000060": "5", "10000061": "4", "10000062": "5", "10000063": "5", "10000064": "4", "10000065": "4", "10000066": "5", "10000067": "4", "10000068": "4", "10000069": "5", "10000070": "5", "10000071": "5", "10000072": "4", "10000073": "5", "10000074": "4", "10000075": "5", "10000076": "4", "10000077": "4", "10000078": "5", "10000079": "5", "10000080": "4", "10000081": "4", "10000082": "5", "10000083": "4", "10000084": "5", "10000085": "4", "10000086": "5", "10000087": "5", "10000088": "4", "10000089": "5", "10000090": "4", "10000091": "5", "10000092": "4", "10000093": "5", "10000094": "5", "10000095": "5", "10000096": "5", "10000097": "4", "10000098": "5", "10000099": "5", "10000100": "4", "10000101": "5", "10000102": "5", "10000103": "5", "10000005": "5", "10000007": "5"}
{"10000002": "5", "10000003": "5", "10000006": "4", "10000014": "4", "10000015": "4", "10000016": "5", "10000020": "4", "10000021": "4", "10000022": "5", "10000023": "4", "10000024": "4", "10000025": "4", "10000026": "5", "10000027": "4", "10000029": "5", "10000030": "5", "10000031": "4", "10000032": "4", "10000033": "5", "10000034": "4", "10000035": "5", "10000036": "4", "10000037": "5", "10000038": "5", "10000039": "4", "10000041": "5", "10000042": "5", "10000043": "4", "10000044": "4", "10000045": "4", "10000046": "5", "10000047": "5", "10000048": "4", "10000049": "5", "10000050": "4", "10000051": "5", "10000052": "5", "10000053": "4", "10000054": "5", "10000055": "4", "10000056": "4", "10000057": "5", "10000058": "5", "10000059": "4", "10000060": "5", "10000061": "4", "10000062": "5", "10000063": "5", "10000064": "4", "10000065": "4", "10000066": "5", "10000067": "4", "10000068": "4", "10000069": "5", "10000070": "5", "10000071": "5", "10000072": "4", "10000073": "5", "10000074": "4", "10000075": "5", "10000076": "4", "10000077": "4", "10000078": "5", "10000079": "5", "10000080": "4", "10000081": "4", "10000082": "5", "10000083": "4", "10000084": "5", "10000085": "4", "10000086": "5", "10000087": "5", "10000088": "4", "10000089": "5", "10000090": "4", "10000091": "5", "10000092": "4", "10000093": "5", "10000094": "5", "10000095": "5", "10000096": "5", "10000097": "4", "10000098": "5", "10000099": "5", "10000100": "4", "10000101": "5", "10000102": "5", "10000103": "5", "10000104": "5", "10000105": "4", "10000005": "5", "10000007": "5"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"神里绫华": "Cryo", "琴": "Anemo", "丽莎": "Electro", "芭芭拉": "Hydro", "凯亚": "Cryo", "迪卢克": "Pyro", "雷泽": "Electro", "安柏": "Pyro", "温迪": "Anemo", "香菱": "Pyro", "北斗": "Electro", "行秋": "Hydro", "魈": "Anemo", "凝光": "Geo", "可莉": "Pyro", "钟离": "Geo", "菲谢尔": "Electro", "班尼特": "Pyro", "达达利亚": "Hydro", "诺艾尔": "Geo", "七七": "Cryo", "重云": "Cryo", "甘雨": "Cryo", "阿贝多": "Geo", "迪奥娜": "Cryo", "莫娜": "Hydro", "刻晴": "Electro", "砂糖": "Anemo", "辛焱": "Pyro", "罗莎莉亚": "Cryo", "胡桃": "Pyro", "枫原万叶": "Anemo", "烟绯": "Pyro", "宵宫": "Pyro", "托马": "Pyro", "优菈": "Cryo", "雷电将军": "Electro", "早柚": "Anemo", "珊瑚宫心海": "Hydro", "五郎": "Geo", "九条裟罗": "Electro", "荒泷一斗": "Geo", "八重神子": "Electro", "鹿野院平藏": "Anemo", "夜兰": "Hydro", "绮良良": "Dendro", "埃洛伊": "Cryo", "申鹤": "Cryo", "云堇": "Geo", "久岐忍": "Electro", "神里绫人": "Hydro", "柯莱": "Dendro", "多莉": "Electro", "提纳里": "Dendro", "妮露": "Hydro", "赛诺": "Electro", "坎蒂丝": "Hydro", "纳西妲": "Dendro", "莱依拉": "Cryo", "流浪者": "Anemo", "珐露珊": "Anemo", "瑶瑶": "Dendro", "艾尔海森": "Dendro", "迪希雅": "Pyro", "米卡": "Cryo", "卡维": "Dendro", "白术": "Dendro", "琳妮特": "Anemo", "林尼": "Pyro", "菲米尼": "Cryo", "莱欧斯利": "Cryo", "那维莱特": "Hydro", "夏洛蒂": "Cryo", "芙宁娜": "Hydro", "夏沃蕾": "Pyro", "娜维娅": "Geo", "嘉明": "Pyro", "闲云": "Anemo", "千织": "Geo", "希格雯": "Hydro", "阿蕾奇诺": "Pyro", "赛索斯": "Electro", "克洛琳德": "Electro", "艾梅莉埃": "Dendro", "卡齐娜": "Geo", "基尼奇": "Dendro", "玛拉妮": "Hydro", "希诺宁": "Geo"}
{"神里绫华": "Cryo", "琴": "Anemo", "丽莎": "Electro", "芭芭拉": "Hydro", "凯亚": "Cryo", "迪卢克": "Pyro", "雷泽": "Electro", "安柏": "Pyro", "温迪": "Anemo", "香菱": "Pyro", "北斗": "Electro", "行秋": "Hydro", "魈": "Anemo", "凝光": "Geo", "可莉": "Pyro", "钟离": "Geo", "菲谢尔": "Electro", "班尼特": "Pyro", "达达利亚": "Hydro", "诺艾尔": "Geo", "七七": "Cryo", "重云": "Cryo", "甘雨": "Cryo", "阿贝多": "Geo", "迪奥娜": "Cryo", "莫娜": "Hydro", "刻晴": "Electro", "砂糖": "Anemo", "辛焱": "Pyro", "罗莎莉亚": "Cryo", "胡桃": "Pyro", "枫原万叶": "Anemo", "烟绯": "Pyro", "宵宫": "Pyro", "托马": "Pyro", "优菈": "Cryo", "雷电将军": "Electro", "早柚": "Anemo", "珊瑚宫心海": "Hydro", "五郎": "Geo", "九条裟罗": "Electro", "荒泷一斗": "Geo", "八重神子": "Electro", "鹿野院平藏": "Anemo", "夜兰": "Hydro", "绮良良": "Dendro", "埃洛伊": "Cryo", "申鹤": "Cryo", "云堇": "Geo", "久岐忍": "Electro", "神里绫人": "Hydro", "柯莱": "Dendro", "多莉": "Electro", "提纳里": "Dendro", "妮露": "Hydro", "赛诺": "Electro", "坎蒂丝": "Hydro", "纳西妲": "Dendro", "莱依拉": "Cryo", "流浪者": "Anemo", "珐露珊": "Anemo", "瑶瑶": "Dendro", "艾尔海森": "Dendro", "迪希雅": "Pyro", "米卡": "Cryo", "卡维": "Dendro", "白术": "Dendro", "琳妮特": "Anemo", "林尼": "Pyro", "菲米尼": "Cryo", "莱欧斯利": "Cryo", "那维莱特": "Hydro", "夏洛蒂": "Cryo", "芙宁娜": "Hydro", "夏沃蕾": "Pyro", "娜维娅": "Geo", "嘉明": "Pyro", "闲云": "Anemo", "千织": "Geo", "希格雯": "Hydro", "阿蕾奇诺": "Pyro", "赛索斯": "Electro", "克洛琳德": "Electro", "艾梅莉埃": "Dendro", "卡齐娜": "Geo", "基尼奇": "Dendro", "玛拉妮": "Hydro", "希诺宁": "Geo", "恰斯卡": "Anemo", "欧洛伦": "Electro"}
Loading

0 comments on commit eeba069

Please sign in to comment.