💥 修改GsPush

This commit is contained in:
Wuyi无疑 2023-03-02 23:43:22 +08:00
parent 60e4907a9c
commit 45ae3a20e5
30 changed files with 179 additions and 5628 deletions

2
.gitignore vendored
View File

@ -675,8 +675,10 @@ AvatarSkillExcelConfigData.json
WeaponExcelConfigData.json
AvatarTalentExcelConfigData.json
AvatarExcelConfigData.json
曲线素材.xlsx
参考面板.xlsx
textMap.json
### Debug ###
testnb2/

File diff suppressed because one or more lines are too long

View File

@ -2980,5 +2980,89 @@
"6": ""
}
}
},
"卡维": {
"normal": {
"normal_skill": {
"50": "",
"70": ""
},
"normal_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
}
},
"fight": {
"fight_skill": {
"50": "",
"70": "elementalMastery+100"
},
"fight_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
},
"group_skill": {
"50": "",
"70": ""
},
"group_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
}
}
},
"白术": {
"normal": {
"normal_skill": {
"50": "",
"70": "DendroDmgBonus+25"
},
"normal_talent": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": "",
"6": ""
}
},
"fight": {
"fight_skill": {
"50": "",
"70": ""
},
"fight_talent": {
"1": "",
"2": "",
"3": "",
"4": "elementalMastery+80",
"5": "",
"6": "灵气脉:addDmg+6%hp"
},
"group_skill": {
"50": "",
"70": ""
},
"group_talent": {
"1": "",
"2": "",
"3": "",
"4": "elementalMastery+80",
"5": "",
"6": ""
}
}
}
}

View File

@ -254,5 +254,13 @@
"珐露珊": [
"E",
"Q"
],
"卡维": [
"Q",
"E"
],
"白术": [
"Q",
"E"
]
}

View File

@ -346,5 +346,19 @@
"米卡": [
"元素充能效率",
"血量"
],
"白术": [
"血量",
"元素充能效率",
"精通",
"暴击率",
"暴击伤害"
],
"卡维": [
"元素充能效率",
"精通",
"暴击率",
"暴击伤害",
"攻击力"
]
}

View File

@ -4739,6 +4739,37 @@
"time": 8,
"extra": {
}
}
},
"碧落之珑": {
"normal": {
"normal_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
}
},
"fight": {
"fight_effect": {
"1": "dmgBonus+12%0.03%hp",
"2": "dmgBonus+18%0.045%hp",
"3": "dmgBonus+24%0.06%hp",
"4": "dmgBonus+30%0.075%hp",
"5": "dmgBonus+36%0.09%hp"
},
"group_effect": {
"1": "",
"2": "",
"3": "",
"4": "",
"5": ""
},
"time": 8,
"extra": {
}
}
}

View File

@ -316,6 +316,7 @@ class SQLA:
#####################
async def insert_push_data(self, uid: str):
push_data = GsPush(
bot_id=self.bot_id,
uid=uid,
coin_push='off',
coin_value=2100,
@ -335,7 +336,11 @@ class SQLA:
async def update_push_data(self, uid: str, data: dict) -> bool:
await self.push_exists(uid)
sql = update(GsPush).where(GsPush.uid == uid).values(**data)
sql = (
update(GsPush)
.where(GsPush.uid == uid and GsPush.bot_id == self.bot_id)
.values(**data)
)
await self.session.execute(sql)
await self.session.commit()
return True
@ -350,12 +355,16 @@ class SQLA:
async def select_push_data(self, uid: str) -> GsPush:
await self.push_exists(uid)
sql = select(GsPush).where(GsPush.uid == uid)
sql = select(GsPush).where(
GsPush.uid == uid and GsPush.bot_id == self.bot_id
)
result = await self.session.execute(sql)
return result.scalars().one()
async def push_exists(self, uid: str) -> bool:
sql = select(GsPush).where(GsPush.uid == uid)
sql = select(GsPush).where(
GsPush.uid == uid and GsPush.bot_id == self.bot_id
)
result = await self.session.execute(sql)
data = result.scalars().all()
if not data:

View File

@ -39,6 +39,7 @@ class GsCache(SQLModel, table=True):
class GsPush(SQLModel, table=True):
__table_args__ = {'keep_existing': True}
id: Optional[int] = Field(default=None, primary_key=True, title='序号')
bot_id: str = Field(title='平台')
uid: str = Field(title='UID')
coin_push: Optional[str] = Field(title='洞天宝钱推送')
coin_value: Optional[int] = Field(title='洞天宝钱阈值')

View File

@ -7,9 +7,7 @@ import httpx
sys.path.append(str(Path(__file__).parents[1]))
from version import Genshin_version # noqa: E402
from utils.ambr_api.convert_ambr_data import ( # noqa: E402
convert_ambr_to_minigg,
)
from utils.ambr_to_minigg import convert_ambr_to_minigg # noqa: E402
R_PATH = Path(__file__).parents[0]
MAP_PATH = Path(__file__).parents[1] / 'utils' / 'enka_api' / 'map'

View File

@ -10,9 +10,7 @@ import httpx
sys.path.append(str(Path(__file__).parents[1]))
from version import Genshin_version # noqa: E402
from utils.ambr_api.convert_ambr_data import ( # noqa: E402
convert_ambr_to_talent,
)
from utils.ambr_to_minigg import convert_ambr_to_talent # noqa: E402
path = (
Path(__file__).parents[1]

View File

@ -105,6 +105,16 @@
"icon": "UI_DisplayItemIcon_410010",
"itemType": "ITEM_DISPLAY"
},
{
"typeDescTextMapHash": 1336793439,
"rankLevel": 3,
"displayType": "DEFAULT_ITEM",
"id": 410011,
"nameTextMapHash": 294751129,
"descTextMapHash": 2659708706,
"icon": "UI_DisplayItemIcon_410011",
"itemType": "ITEM_DISPLAY"
},
{
"typeDescTextMapHash": 1010293015,
"rankLevel": 1,
@ -2421,4 +2431,4 @@
"icon": "UI_DisplayItemIcon_419013",
"itemType": "ITEM_DISPLAY"
}
]
]

View File

@ -230,8 +230,8 @@ async def convert_ambr_to_talent(
para_list = re.findall(r'{(param[0-9]+):', label_str)
# 进行排序
new_para_list = [
f'param{i}'
nums = [
i
for i in sorted(
[
int(i[-2:]) if i[-2].isdigit() else int(i[-1])
@ -240,6 +240,16 @@ async def convert_ambr_to_talent(
)
]
num_temp = 0
new_nums = []
for num in nums:
if num != num_temp + 1:
new_nums.append(num_temp + 1)
num_temp = num
new_nums.append(num)
new_para_list = [f'param{i}' for i in new_nums]
for ig, para in enumerate(new_para_list):
for level in talent_data[i]['promote']:
if (

View File

@ -1,73 +0,0 @@
from pathlib import Path
from typing import Dict, List, TypedDict
from msgspec import json as msgjson
from ...version import Genshin_version
MAP = Path(__file__).parent / 'data'
version = Genshin_version
avatarName2Element_fileName = f'avatarName2Element_mapping_{version}.json'
weaponHash2Name_fileName = f'weaponHash2Name_mapping_{version}.json'
weaponHash2Type_fileName = f'weaponHash2Type_mapping_{version}.json'
skillId2Name_fileName = f'skillId2Name_mapping_{version}.json'
talentId2Name_fileName = f'talentId2Name_mapping_{version}.json'
avatarId2Name_fileName = f'avatarId2Name_mapping_{version}.json'
avatarId2Star_fileName = f'avatarId2Star_mapping_{version}.json'
artifact2attr_fileName = f'artifact2attr_mapping_{version}.json'
enName2Id_fileName = f'enName2AvatarID_mapping_{version}.json'
icon2Name_fileName = f'icon2Name_mapping_{version}.json'
avatarName2Weapon_fileName = f'avatarName2Weapon_mapping_{version}.json'
class TS(TypedDict):
Name: Dict[str, str]
Icon: Dict[str, str]
with open(MAP / avatarId2Name_fileName, 'r', encoding='UTF-8') as f:
avatarId2Name = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / icon2Name_fileName, 'r', encoding='UTF-8') as f:
icon2Name = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / artifact2attr_fileName, 'r', encoding='UTF-8') as f:
artifact2attr = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / 'propId2Name_mapping.json', 'r', encoding='UTF-8') as f:
propId2Name = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / weaponHash2Name_fileName, 'r', encoding='UTF-8') as f:
weaponHash2Name = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / weaponHash2Type_fileName, 'r', encoding='UTF-8') as f:
weaponHash2Type = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / 'artifactId2Piece_mapping.json', 'r', encoding='UTF-8') as f:
artifactId2Piece = msgjson.decode(f.read(), type=Dict[str, List[str]])
with open(MAP / skillId2Name_fileName, 'r', encoding='UTF-8') as f:
skillId2Name = msgjson.decode(f.read(), type=TS)
with open(MAP / talentId2Name_fileName, 'r', encoding='UTF-8') as f:
talentId2Name = msgjson.decode(f.read(), type=TS)
with open(MAP / avatarName2Element_fileName, 'r', encoding='UTF-8') as f:
avatarName2Element = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / avatarName2Weapon_fileName, 'r', encoding='UTF-8') as f:
avatarName2Weapon = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / 'char_alias.json', 'r', encoding='UTF-8') as f:
alias_data = msgjson.decode(f.read(), type=Dict[str, List[str]])
with open(MAP / avatarId2Star_fileName, 'r', encoding='utf8') as f:
avatarId2Star_data = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / avatarId2Star_fileName, 'r', encoding='utf8') as f:
avatarId2Star_data = msgjson.decode(f.read(), type=Dict[str, str])
with open(MAP / enName2Id_fileName, 'r', encoding='utf8') as f:
enName_to_avatarId_data = msgjson.decode(f.read(), type=Dict[str, str])

File diff suppressed because one or more lines are too long

View File

@ -1,22 +0,0 @@
{
"1": [
"goblet",
"空之杯"
],
"2": [
"plume",
"死之羽"
],
"3": [
"circlet",
"理之冠"
],
"4": [
"flower",
"生之花"
],
"5": [
"sands",
"时之沙"
]
}

View File

@ -1 +0,0 @@
{"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": "夜兰", "10000062": "埃洛伊", "10000063": "申鹤", "10000064": "云堇", "10000065": "久岐忍", "10000066": "神里绫人", "10000067": "柯莱", "10000068": "多莉", "10000069": "提纳里", "10000070": "妮露", "10000071": "赛诺", "10000072": "坎蒂丝", "10000073": "纳西妲", "10000074": "莱依拉", "10000075": "流浪者", "10000076": "珐露珊", "10000077": "瑶瑶", "10000078": "艾尔海森", "10000079": "迪希雅", "10000080": "米卡"}

View File

@ -1 +0,0 @@
{"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", "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", "10000005": "5", "10000007": "5"}

View File

@ -1 +0,0 @@
{"神里绫华": "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", "埃洛伊": "Cryo", "申鹤": "Cryo", "云堇": "Geo", "久岐忍": "Electro", "神里绫人": "Hydro", "柯莱": "Dendro", "多莉": "Electro", "提纳里": "Dendro", "妮露": "Hydro", "赛诺": "Electro", "坎蒂丝": "Hydro", "纳西妲": "Dendro", "莱依拉": "Cryo", "流浪者": "Anemo", "珐露珊": "Anemo", "瑶瑶": "Dendro", "艾尔海森": "Dendro", "迪希雅": "Pyro", "米卡": "Cryo"}

View File

@ -1 +0,0 @@
{"神里绫华": "单手剑", "琴": "单手剑", "丽莎": "法器", "芭芭拉": "法器", "凯亚": "单手剑", "迪卢克": "双手剑", "雷泽": "双手剑", "安柏": "弓", "温迪": "弓", "香菱": "长柄武器", "北斗": "双手剑", "行秋": "单手剑", "魈": "长柄武器", "凝光": "法器", "可莉": "法器", "钟离": "长柄武器", "菲谢尔": "弓", "班尼特": "单手剑", "达达利亚": "弓", "诺艾尔": "双手剑", "七七": "单手剑", "重云": "双手剑", "甘雨": "弓", "阿贝多": "单手剑", "迪奥娜": "弓", "莫娜": "法器", "刻晴": "单手剑", "砂糖": "法器", "辛焱": "双手剑", "罗莎莉亚": "长柄武器", "胡桃": "长柄武器", "枫原万叶": "单手剑", "烟绯": "法器", "宵宫": "弓", "托马": "长柄武器", "优菈": "双手剑", "雷电将军": "长柄武器", "早柚": "双手剑", "珊瑚宫心海": "法器", "五郎": "弓", "九条裟罗": "弓", "荒泷一斗": "双手剑", "八重神子": "法器", "鹿野院平藏": "法器", "夜兰": "弓", "埃洛伊": "弓", "申鹤": "长柄武器", "云堇": "长柄武器", "久岐忍": "单手剑", "神里绫人": "单手剑", "柯莱": "弓", "多莉": "双手剑", "提纳里": "弓", "妮露": "单手剑", "赛诺": "长柄武器", "坎蒂丝": "长柄武器", "纳西妲": "法器", "莱依拉": "单手剑", "流浪者": "法器", "珐露珊": "弓", "瑶瑶": "长柄武器", "艾尔海森": "单手剑", "迪希雅": "双手剑", "米卡": "长柄武器", "旅行者": "单手剑"}

View File

@ -1,739 +0,0 @@
{
"旅行者风": [
"风主"
],
"旅行者岩": [
"岩主"
],
"旅行者雷": [
"雷主"
],
"旅行者草": [
"草主"
],
"旅行者": [
"主角",
"卑鄙的外乡人",
"荣誉骑士",
"爷",
"履刑者",
"抽卡不歪真君",
"男主",
"男主角",
"龙哥",
"空哥",
"男爷",
"女主",
"女主角",
"莹",
"萤",
"黄毛阿姨",
"荧妹",
"女爷"
],
"神里绫华": [
"Kamisato Ayaka",
"Ayaka",
"ayaka",
"神里",
"绫华",
"神里凌华",
"凌华",
"白鹭公主",
"神里大小姐",
"小乌龟",
"龟龟"
],
"琴": [
"Jean",
"jean",
"团长",
"代理团长",
"琴团长",
"蒲公英骑士",
"琴·古恩希尔德",
"古恩希尔德"
],
"丽莎": [
"Lisa",
"lisa",
"图书管理员",
"图书馆管理员",
"蔷薇魔女",
"丽莎阿姨",
"丽莎·敏兹",
"敏兹"
],
"芭芭拉": [
"Barbara",
"barbara",
"巴巴拉",
"拉粑粑",
"拉巴巴",
"内鬼",
"加湿器",
"肉身解咒",
"肉身解咒真君",
"闪耀偶像",
"偶像",
"芭芭拉·佩奇",
"佩奇"
],
"凯亚": [
"Kaeya",
"kaeya",
"盖亚",
"凯子哥",
"凯鸭",
"矿工",
"矿工头子",
"骑兵队长",
"凯子",
"凝冰渡海真君",
"凯亚·亚尔伯里奇",
"亚尔伯里奇"
],
"迪卢克": [
"diluc",
"Diluc",
"卢姥爷",
"姥爷",
"卢老爷",
"卢锅巴",
"正义人",
"正e人",
"正E人",
"卢本伟",
"暗夜英雄",
"卢卢伯爵",
"落魄了",
"落魄了家人们",
"迪卢克·莱艮芬德",
"莱艮芬德"
],
"雷泽": [
"razor",
"Razor",
"狼少年",
"狼崽子",
"狼崽",
"卢皮卡",
"小狼",
"小狼狗",
"狼孩"
],
"安柏": [
"Amber",
"amber",
"安伯",
"兔兔伯爵",
"飞行冠军",
"侦查骑士",
"点火姬",
"点火机",
"打火机",
"打火姬"
],
"温迪": [
"Venti",
"venti",
"温蒂",
"风神",
"卖唱的",
"巴巴托斯",
"巴巴脱丝",
"芭芭托斯",
"芭芭脱丝",
"干点正事",
"不干正事",
"吟游诗人",
"诶嘿",
"唉嘿",
"摸鱼"
],
"香菱": [
"Xiangling",
"xiangling",
"香玲",
"锅巴",
"厨师",
"万民堂厨师",
"香师傅",
"卯香菱"
],
"北斗": [
"Beidou",
"beidou",
"大姐头",
"大姐",
"无冕的龙王",
"龙王"
],
"行秋": [
"Xingqiu",
"xingqiu",
"秋秋人",
"秋妹妹",
"书呆子",
"水神",
"飞云商会二少爷"
],
"魈": [
"Xiao",
"xiao",
"打桩机",
"插秧",
"三眼五显仙人",
"三眼五显真人",
"降魔大圣",
"护法夜叉",
"快乐风男",
"无聊",
"靖妖傩舞",
"矮子仙人",
"三点五尺仙人",
"跳跳虎"
],
"凝光": [
"Ningguang",
"ningguang",
"富婆",
"天权星",
"天权"
],
"可莉": [
"Klee",
"klee",
"嘟嘟可",
"火花骑士",
"蹦蹦炸弹",
"炸鱼",
"放火烧山",
"放火烧山真君",
"蒙德最强战力",
"逃跑的太阳",
"啦啦啦",
"哒哒哒",
"炸弹人",
"禁闭室",
"太阳",
"小太阳"
],
"钟离": [
"Zhongli",
"zhongli",
"摩拉克斯",
"岩王爷",
"岩神",
"钟师傅",
"天动万象",
"岩王帝君",
"未来可期",
"帝君",
"拒收病婿"
],
"菲谢尔": [
"Fischl",
"fischl",
"皇女",
"小艾米",
"小艾咪",
"奥兹",
"断罪皇女",
"中二病",
"中二少女",
"中二皇女",
"奥兹发射器",
"菲谢尔·冯·露弗施洛斯·那菲多特",
"露弗施洛斯",
"那菲多特"
],
"班尼特": [
"Bennett",
"bennett",
"点赞哥",
"点赞",
"倒霉少年",
"倒霉蛋",
"霹雳闪雷真君",
"班神",
"班爷",
"倒霉",
"火神",
"六星真神"
],
"达达利亚": [
"Tartaglia",
"tartaglia",
"Childe",
"childe",
"Ajax",
"ajax",
"达达鸭",
"达达利鸭",
"公子",
"工资",
"玩具销售员",
"玩具推销员",
"钱包",
"鸭鸭",
"愚人众末席",
"阿贾克斯"
],
"诺艾尔": [
"Noelle",
"noelle",
"女仆",
"高达",
"岩王帝姬"
],
"七七": [
"Qiqi",
"qiqi",
"僵尸",
"肚饿真君",
"度厄真君",
"'77'"
],
"重云": [
"Chongyun",
"chongyun",
"纯阳之体",
"冰棍"
],
"甘雨": [
"Ganyu",
"ganyu",
"椰羊",
"椰奶",
"王小美"
],
"阿贝多": [
"Albedo",
"albedo",
"可莉哥哥",
"升降机",
"升降台",
"电梯",
"白垩之子",
"贝爷",
"白垩",
"阿贝少",
"花呗多",
"阿贝夕",
"abd",
"阿师傅"
],
"迪奥娜": [
"Diona",
"diona",
"迪欧娜",
"dio",
"dio娜",
"冰猫",
"猫猫",
"猫娘",
"喵喵",
"调酒师",
"迪奥娜·凯茨莱茵",
"凯茨莱茵"
],
"莫娜": [
"Mona",
"mona",
"穷鬼",
"穷光蛋",
"穷",
"莫纳",
"占星术士",
"占星师",
"讨龙真君",
"半部讨龙真君",
"阿斯托洛吉斯·莫娜·梅姬斯图斯",
"阿斯托洛吉斯",
"梅姬斯图斯",
"梅姬斯图斯姬"
],
"刻晴": [
"Keqing",
"keqing",
"刻情",
"氪晴",
"刻师傅",
"刻师父",
"牛杂",
"牛杂师傅",
"斩尽牛杂",
"免疫",
"免疫免疫",
"屁斜剑法",
"玉衡星",
"玉衡",
"阿晴",
"啊晴",
"璃月雷神"
],
"砂糖": [
"Sucrose",
"sucrose",
"雷莹术士",
"雷萤术士",
"雷荧术士"
],
"辛焱": [
"Xinyan",
"xinyan",
"辛炎",
"黑妹",
"摇滚"
],
"罗莎莉亚": [
"Rosaria",
"rosaria",
"罗莎莉娅",
"白色史莱姆",
"白史莱姆",
"修女",
"罗莎利亚",
"罗莎利娅",
"罗沙莉亚",
"罗沙莉娅",
"罗沙利亚",
"罗沙利娅",
"萝莎莉亚",
"萝莎莉娅",
"萝莎利亚",
"萝莎利娅",
"萝沙莉亚",
"萝沙莉娅",
"萝沙利亚",
"萝沙利娅"
],
"胡桃": [
"Hu Tao",
"hu tao",
"HuTao",
"hutao",
"Hutao",
"胡淘",
"往生堂堂主",
"火化",
"抬棺的",
"蝴蝶",
"核桃",
"堂主",
"胡堂主",
"雪霁梅香",
"桃子"
],
"枫原万叶": [
"Kaedehara Kazuha",
"Kazuha",
"kazuha",
"万叶",
"叶天帝",
"天帝",
"叶师傅"
],
"烟绯": [
"Yanfei",
"yanfei",
"烟老师",
"律师",
"罗翔"
],
"宵宫": [
"Yoimiya",
"yoimiya",
"霄宫",
"烟花",
"肖宫",
"肖工",
"绷带女孩",
"长野原宵宫"
],
"托马": [
"Thoma",
"thoma",
"家政官",
"太郎丸",
"地头蛇",
"男仆",
"拖马"
],
"优菈": [
"Eula",
"eula",
"优拉",
"尤拉",
"尤菈",
"浪花骑士",
"记仇",
"优菈·劳伦斯",
"劳伦斯"
],
"雷电将军": [
"Raiden Shogun",
"Raiden",
"raiden",
"雷神",
"将军",
"雷军",
"巴尔",
"阿影",
"影",
"巴尔泽布",
"煮饭婆",
"奶香一刀",
"无想一刀",
"散兵他妈",
"宅女"
],
"早柚": [
"Sayu",
"sayu",
"小狸猫",
"狸猫",
"忍者",
"貉"
],
"珊瑚宫心海": [
"Sangonomiya Kokomi",
"Kokomi",
"kokomi",
"心海",
"军师",
"珊瑚宫",
"书记",
"观赏鱼",
"水母",
"鱼",
"美人鱼"
],
"五郎": [
"Gorou",
"gorou",
"柴犬",
"土狗",
"希娜",
"希娜小姐"
],
"九条裟罗": [
"Kujou Sara",
"Sara",
"sara",
"九条",
"九条沙罗",
"裟罗",
"沙罗",
"天狗"
],
"荒泷一斗": [
"Arataki Itto",
"Itto",
"itto",
"荒龙一斗",
"荒泷天下第一斗",
"一斗",
"一抖",
"荒泷",
"1斗",
"牛牛",
"斗子哥",
"牛子哥",
"牛子",
"孩子王",
"斗虫",
"巧乐兹",
"放牛的"
],
"八重神子": [
"Yae Miko",
"Miko",
"miko",
"八重",
"神子",
"狐狸",
"想得美哦",
"巫女",
"屑狐狸",
"骚狐狸",
"八重宫司",
"婶子",
"小八",
"八重寄子",
"寄子"
],
"鹿野院平藏": [
"shikanoin heizou",
"Heizou",
"heizou",
"heizo",
"鹿野苑",
"鹿野院",
"平藏",
"鹿野苑平藏",
"小鹿"
],
"夜兰": [
"Yelan",
"yelan",
"夜阑",
"叶澜",
"腋兰",
"夜天后"
],
"埃洛伊": [
"Aloy",
"aloy"
],
"申鹤": [
"Shenhe",
"shenhe",
"神鹤",
"小姨",
"小姨子",
"审鹤"
],
"云堇": [
"Yun Jin",
"yunjin",
"yun jin",
"云瑾",
"云先生",
"云锦",
"神女劈观",
"土女"
],
"久岐忍": [
"Kuki Shinobu",
"Kuki",
"kuki",
"Shinobu",
"shinobu",
"97忍",
"小忍",
"久歧忍",
"'97'",
"茄忍",
"茄子",
"紫茄子",
"阿忍",
"忍姐"
],
"神里绫人": [
"Kamisato Ayato",
"Ayato",
"ayato",
"绫人",
"神里凌人",
"凌人",
"0人",
"神人",
"零人",
"大舅哥"
],
"柯莱": [
"Collei",
"collei",
"柯来",
"科莱",
"科来",
"小天使",
"须弥安柏",
"须弥飞行冠军",
"见习巡林员",
"巡林员"
],
"多莉": [
"Dori",
"dori",
"多利",
"多力",
"多丽",
"奸商"
],
"提纳里": [
"Tighnari",
"tighnari",
"小提",
"提那里",
"缇娜里",
"提哪里",
"驴",
"柯莱老师",
"柯莱师傅",
"巡林官"
],
"妮露": [
"Nilou",
"nilou",
"尼露",
"尼禄"
],
"赛诺": [
"Cyno",
"cyno"
],
"坎蒂丝": [
"Candace",
"candace",
"坎迪斯"
],
"纳西妲": [
"Nahida",
"nahida",
"草王",
"草神",
"小吉祥草王",
"草萝莉",
"纳西坦",
"羽毛球"
],
"莱依拉": [
"layla",
"Layla",
"拉一拉",
"拉拉"
],
"流浪者": [
"散兵",
"斯卡拉姆齐",
"国崩",
"伞兵",
"正机之神",
"七叶寂照秘密主",
"散散"
],
"珐露珊": [
"初音",
"机逐封秘",
"初音未来",
"百岁珊",
"苏珊"
],
"艾尔海森": [
"草刻晴",
"海森",
"海子哥",
"苏哥",
"海参",
"海参哥"
],
"瑶瑶": [
"遥遥",
"幺幺"
],
"迪希雅": [
"迪西娅",
"狮女",
"狮子",
"腕豪",
"女拳"
],
"米卡": [
"咪卡",
"小米",
"正太"
]
}

View File

@ -1 +0,0 @@
{"Ayaka": "10000002", "Qin": "10000003", "Lisa": "10000006", "Barbara": "10000014", "Kaeya": "10000015", "Diluc": "10000016", "Razor": "10000020", "Ambor": "10000021", "Venti": "10000022", "Xiangling": "10000023", "Beidou": "10000024", "Xingqiu": "10000025", "Xiao": "10000026", "Ningguang": "10000027", "Klee": "10000029", "Zhongli": "10000030", "Fischl": "10000031", "Bennett": "10000032", "Tartaglia": "10000033", "Noel": "10000034", "Qiqi": "10000035", "Chongyun": "10000036", "Ganyu": "10000037", "Albedo": "10000038", "Diona": "10000039", "Mona": "10000041", "Keqing": "10000042", "Sucrose": "10000043", "Xinyan": "10000044", "Rosaria": "10000045", "Hutao": "10000046", "Kazuha": "10000047", "Feiyan": "10000048", "Yoimiya": "10000049", "Tohma": "10000050", "Eula": "10000051", "Shougun": "10000052", "Sayu": "10000053", "Kokomi": "10000054", "Gorou": "10000055", "Sara": "10000056", "Itto": "10000057", "Yae": "10000058", "Heizo": "10000059", "Yelan": "10000060", "Aloy": "10000062", "Shenhe": "10000063", "Yunjin": "10000064", "Shinobu": "10000065", "Ayato": "10000066", "Collei": "10000067", "Dori": "10000068", "Tighnari": "10000069", "Nilou": "10000070", "Cyno": "10000071", "Candace": "10000072", "Nahida": "10000073", "Layla": "10000074", "Wanderer": "10000075", "Faruzan": "10000076", "Yaoyao": "10000077", "Alhatham": "10000078", "Dehya": "10000079", "Mika": "10000080"}

File diff suppressed because one or more lines are too long

View File

@ -1,31 +0,0 @@
{
"FIGHT_PROP_BASE_ATTACK": "基础攻击力",
"FIGHT_PROP_BASE_DEFENSE": "基础防御力",
"FIGHT_PROP_BASE_HP": "基础血量",
"FIGHT_PROP_ATTACK": "攻击力",
"FIGHT_PROP_ATTACK_PERCENT": "百分比攻击力",
"FIGHT_PROP_HP": "血量",
"FIGHT_PROP_HP_PERCENT": "百分比血量",
"FIGHT_PROP_DEFENSE": "防御力",
"FIGHT_PROP_DEFENSE_PERCENT": "百分比防御力",
"FIGHT_PROP_ELEMENT_MASTERY": "元素精通",
"FIGHT_PROP_CRITICAL": "暴击率",
"FIGHT_PROP_CRITICAL_HURT": "暴击伤害",
"FIGHT_PROP_CHARGE_EFFICIENCY": "元素充能效率",
"FIGHT_PROP_FIRE_SUB_HURT": "火元素抗性",
"FIGHT_PROP_ELEC_SUB_HURT": "雷元素抗性",
"FIGHT_PROP_ICE_SUB_HURT": "冰元素抗性",
"FIGHT_PROP_WATER_SUB_HURT": "水元素抗性",
"FIGHT_PROP_WIND_SUB_HURT": "风元素抗性",
"FIGHT_PROP_ROCK_SUB_HURT": "岩元素抗性",
"FIGHT_PROP_GRASS_SUB_HURT": "草元素抗性",
"FIGHT_PROP_FIRE_ADD_HURT": "火元素伤害加成",
"FIGHT_PROP_ELEC_ADD_HURT": "雷元素伤害加成",
"FIGHT_PROP_ICE_ADD_HURT": "冰元素伤害加成",
"FIGHT_PROP_WATER_ADD_HURT": "水元素伤害加成",
"FIGHT_PROP_WIND_ADD_HURT": "风元素伤害加成",
"FIGHT_PROP_ROCK_ADD_HURT": "岩元素伤害加成",
"FIGHT_PROP_GRASS_ADD_HURT": "草元素伤害加成",
"FIGHT_PROP_PHYSICAL_ADD_HURT": "物理伤害加成",
"FIGHT_PROP_HEAL_ADD": "治疗加成"
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"2410593283": "无锋剑", "2125206395": "银剑", "479076483": "冷刃", "1608953539": "黎明神剑", "3673792067": "旅行剑", "160493219": "暗铁剑", "3421967235": "吃虎鱼刀", "1388004931": "飞天御剑", "2474354867": "西风剑", "3587621259": "笛剑", "1990641987": "祭礼剑", "2375993851": "宗室长剑", "1321135667": "匣里龙吟", "1991707099": "试作斩岩", "4103022435": "铁蜂刺", "3378007475": "黑岩长剑", "3796905611": "黑剑", "2947140987": "暗巷闪光", "1773425155": "降临之剑", "2749853923": "腐殖之剑", "1990820123": "天目影打刀", "342097547": "辰砂之纺锤", "1012170803": "笼钓瓶一心", "313300315": "原木刀", "143051931": "西福斯的月光", "1499745907": "「一心传」名刀", "1538092267": "「一心传」名刀", "3464027035": "「一心传」名刀", "2448629019": "东花坊时雨", "902264035": "风鹰剑", "4055003299": "天空之刃", "2949448555": "苍古自由之誓", "944332883": "斫峰之刃", "1345343763": "磐岩结绿", "4124851547": "雾切之回光", "1600275315": "波乱月白经津", "454086795": "圣显之钥", "275622963": "裁叶萃光", "2666951267": "训练大剑", "1182966603": "佣兵重剑", "1479961579": "铁影阔剑", "4090429643": "沐浴龙血的剑", "850802171": "白铁大剑", "1516554699": "石英大剑", "3097441915": "以理服人", "2614170427": "飞天大御剑", "735056795": "西风大剑", "930640955": "钟剑", "1675686363": "祭礼大剑", "877751435": "宗室大剑", "3684723963": "雨裁", "3722933411": "试作古华", "680510411": "白影剑", "20848859": "黑岩斩刀", "1437658243": "螭骨剑", "2006422931": "千岩古剑", "2753539619": "雪葬的星银", "346510395": "衔珠海皇", "4193089947": "桂木斩长正", "3073454867": "玛海菈的水色", "2359799475": "恶王丸", "902184579": "森林王器", "1089950259": "天空之傲", "3995710363": "狼的末路", "1075647299": "松籁响起之时", "2792766467": "无工之剑", "3914951691": "赤角石溃杵", "2796697027": "新手长枪", "3070169307": "铁尖枪", "1390797107": "白缨枪", "618786571": "钺矛", "4103766499": "黑缨枪", "500612819": "「旗杆」", "2664629131": "匣里灭辰", "1154009435": "试作星镰", "578575283": "流月针", "481755219": "黑岩刺枪", "4049410651": "决斗之枪", "716252627": "千岩长枪", "3755004051": "西风长枪", "2935286715": "宗室猎枪", "3443142923": "龙脊长枪", "2491797315": "喜多院十文字", "1148024603": "「渔获」", "4122509083": "断浪长鳍", "452357939": "贯月矢", "1470442731": "风信之锋", "3235324891": "护摩之杖", "4158505619": "天空之脊", "197755235": "贯虹之槊", "1997709467": "和璞鸢", "688991243": "息灾", "3717849275": "薙草之稻光", "4238339131": "赤沙之杖", "3584825427": "学徒笔记", "2705029563": "口袋魔导书", "2279290283": "魔导绪论", "3500935003": "讨龙英杰谭", "1406746947": "异世界行记", "2963220587": "翡玉法球", "3719372715": "甲级宝珏", "302691299": "琥珀玥", "623534363": "西风秘典", "1163263227": "流浪乐章", "2195665683": "祭礼残章", "3827789435": "宗室秘法录", "37147251": "匣里日月", "2521338131": "试作金珀", "1072884907": "万国诸海图谱", "3273999011": "黑岩绯玉", "3156385731": "昭心", "3090373787": "暗巷的酒与诗", "2587614459": "忍冬之果", "3456986819": "嘟嘟可故事集", "2324146259": "白辰之环", "2539208459": "证誓之明瞳", "426363739": "流浪的晚星", "2267978875": "盈满之实", "807607555": "天空之卷", "1455107995": "四风原典", "693354267": "尘世之锁", "1890163363": "不灭月华", "310247243": "神乐之真意", "1201790667": "千夜浮梦", "359484419": "图莱杜拉的回忆", "3600623979": "猎弓", "2340970067": "历练的猎弓", "3975746731": "鸦羽弓", "656120259": "神射手之誓", "4267718859": "反曲弓", "1021898539": "弹弓", "4139294531": "信使", "2242027395": "黑檀弓", "1240067179": "西风猎弓", "2556914683": "绝弦", "2400012995": "祭礼弓", "2832648187": "宗室长弓", "3169209451": "弓藏", "3625393819": "试作澹月", "411685275": "钢轮弓", "3447737235": "黑岩战弓", "3439749859": "苍翠猎弓", "2417717595": "暗巷猎手", "2425414923": "落霞", "3949653579": "幽夜华尔兹", "650049651": "风花之颂", "4186179883": "破魔之弓", "540938627": "掠食者", "1860795787": "曚云之月", "3176599083": "王下近侍", "3063191787": "竭泽", "3933622347": "天空之翼", "828711395": "阿莫斯之弓", "3112679155": "终末嗟叹之诗", "1901973075": "冬极白星", "4230231107": "若水", "2918525947": "飞雷之弦振", "1348687251": "猎人之径", "4137694339": "(test)竿测试", "2719832059": "(test)穿模测试", "500987603": "(test)穿模测试", "1595734083": "(test)穿模测试", "2009975571": "(test)穿模测试", "4162981171": "(test)穿模测试", "3762437019": "(test)穿模测试"}

View File

@ -1 +0,0 @@
{"2410593283": "单手剑", "2125206395": "单手剑", "479076483": "单手剑", "1608953539": "单手剑", "3673792067": "单手剑", "160493219": "单手剑", "3421967235": "单手剑", "1388004931": "单手剑", "2474354867": "单手剑", "3587621259": "单手剑", "1990641987": "单手剑", "2375993851": "单手剑", "1321135667": "单手剑", "1991707099": "单手剑", "4103022435": "单手剑", "3378007475": "单手剑", "3796905611": "单手剑", "2947140987": "单手剑", "1135130229": "单手剑", "1773425155": "单手剑", "2749853923": "单手剑", "1990820123": "单手剑", "342097547": "单手剑", "1012170803": "单手剑", "313300315": "单手剑", "143051931": "单手剑", "1499745907": "单手剑", "1538092267": "单手剑", "3464027035": "单手剑", "2448629019": "单手剑", "902264035": "单手剑", "4055003299": "单手剑", "2949448555": "单手剑", "944332883": "单手剑", "1345343763": "单手剑", "231836963": "单手剑", "3780343147": "单手剑", "1664039091": "单手剑", "4124851547": "单手剑", "1600275315": "单手剑", "454086795": "单手剑", "275622963": "单手剑", "2666951267": "双手剑", "1182966603": "双手剑", "1479961579": "双手剑", "4090429643": "双手剑", "850802171": "双手剑", "1516554699": "双手剑", "3097441915": "双手剑", "2614170427": "双手剑", "735056795": "双手剑", "930640955": "双手剑", "1675686363": "双手剑", "877751435": "双手剑", "3684723963": "双手剑", "3722933411": "双手剑", "680510411": "双手剑", "20848859": "双手剑", "1437658243": "双手剑", "2006422931": "双手剑", "2753539619": "双手剑", "346510395": "双手剑", "4193089947": "双手剑", "3073454867": "双手剑", "2359799475": "双手剑", "902184579": "双手剑", "1089950259": "双手剑", "3995710363": "双手剑", "1075647299": "双手剑", "2792766467": "双手剑", "977648923": "双手剑", "2597527627": "双手剑", "759708203": "双手剑", "2507837467": "双手剑", "3914951691": "双手剑", "2796697027": "长柄武器", "3070169307": "长柄武器", "1390797107": "长柄武器", "618786571": "长柄武器", "4103766499": "长柄武器", "500612819": "长柄武器", "2664629131": "长柄武器", "1154009435": "长柄武器", "578575283": "长柄武器", "481755219": "长柄武器", "4049410651": "长柄武器", "716252627": "长柄武器", "3755004051": "长柄武器", "2935286715": "长柄武器", "3443142923": "长柄武器", "2491797315": "长柄武器", "1148024603": "长柄武器", "4122509083": "长柄武器", "452357939": "长柄武器", "1470442731": "长柄武器", "3235324891": "长柄武器", "4158505619": "长柄武器", "469555475": "长柄武器", "197755235": "长柄武器", "1997709467": "长柄武器", "3532343811": "长柄武器", "688991243": "长柄武器", "3717849275": "长柄武器", "4238339131": "长柄武器", "3584825427": "法器", "2705029563": "法器", "2279290283": "法器", "3500935003": "法器", "1406746947": "法器", "2963220587": "法器", "3719372715": "法器", "302691299": "法器", "623534363": "法器", "1163263227": "法器", "2195665683": "法器", "3827789435": "法器", "37147251": "法器", "2521338131": "法器", "1072884907": "法器", "3273999011": "法器", "3156385731": "法器", "3090373787": "法器", "415851979": "法器", "2587614459": "法器", "3456986819": "法器", "2324146259": "法器", "2539208459": "法器", "426363739": "法器", "2267978875": "法器", "807607555": "法器", "1455107995": "法器", "452043283": "法器", "693354267": "法器", "4007372867": "法器", "1890163363": "法器", "4123950051": "法器", "310247243": "法器", "1201790667": "法器", "359484419": "法器", "3600623979": "弓", "2340970067": "弓", "3975746731": "弓", "656120259": "弓", "4267718859": "弓", "1021898539": "弓", "4139294531": "弓", "2242027395": "弓", "1240067179": "弓", "2556914683": "弓", "2400012995": "弓", "2832648187": "弓", "3169209451": "弓", "3625393819": "弓", "411685275": "弓", "3447737235": "弓", "3439749859": "弓", "2417717595": "弓", "2425414923": "弓", "3949653579": "弓", "650049651": "弓", "4186179883": "弓", "540938627": "弓", "1860795787": "弓", "3176599083": "弓", "3063191787": "弓", "3933622347": "弓", "828711395": "弓", "3112679155": "弓", "565329475": "弓", "1994081075": "弓", "2824690859": "弓", "1901973075": "弓", "4230231107": "弓", "2918525947": "弓", "1348687251": "弓", "4137694339": "单手剑", "2719832059": "单手剑", "500987603": "双手剑", "1595734083": "长柄武器", "2009975571": "法器", "4162981171": "法器", "3762437019": "弓"}

File diff suppressed because it is too large Load Diff

View File

@ -1,45 +0,0 @@
from .GS_MAP_PATH import (
alias_data,
avatarId2Name,
avatarId2Star_data,
enName_to_avatarId_data,
)
async def avatar_id_to_name(avatar_id: str) -> str:
char_name = avatarId2Name[avatar_id]
return char_name
async def name_to_avatar_id(name: str) -> str:
avatar_id = ''
for i in avatarId2Name:
if avatarId2Name[i] == name:
avatar_id = i
break
return avatar_id
async def avatar_id_to_char_star(char_id: str) -> str:
char_star = avatarId2Star_data[str(char_id)]
return char_star
async def alias_to_char_name(char_name: str) -> str:
for i in alias_data:
if (char_name in i) or (char_name in alias_data[i]):
return i
return char_name
async def enName_to_avatarId(en_name: str) -> str:
avatar_id = enName_to_avatarId_data[en_name]
return avatar_id
async def avatarId_to_enName(avatarId: str) -> str:
for name in enName_to_avatarId_data:
if enName_to_avatarId_data[name] == avatarId:
return name
else:
return 'Ayaka'

View File

@ -1,2 +1,2 @@
GenshinUID_version = '3.1.0'
Genshin_version = '3.4.0'
Genshin_version = '3.5.0'