更新4.5数据,初步支持集录祈愿 (#500)

*  更新4.5数据

*  初步支持集录祈愿

* 添加集录祈愿百分比颜色(黄色的,感觉不好看)

* 修复旧记录集录祈愿不存在的报错
This commit is contained in:
forchannot 2024-03-14 12:30:57 +08:00 committed by GitHub
parent d2069ac23f
commit f3811c2be9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 254 additions and 164 deletions

View File

@ -460,6 +460,9 @@
],
"10000093": [
"闲云"
],
"10000094": [
"千织"
]
},
"武器": {
@ -1203,6 +1206,18 @@
"鹤鸣余音",
"余音",
"闲云专武"
],
"有乐御簾切": [
"有乐御簾切",
"有乐",
"御簾切",
"千织专武"
],
"沙中伟贤的对答": [
"沙中伟贤的对答",
"沙中伟贤",
"伟贤",
"对答"
]
},
"圣遗物": {
@ -1402,6 +1417,14 @@
"逐影猎人": [
"逐影猎人",
"猎人"
],
"昔时之歌": [
"昔时之歌",
"昔时"
],
"回声之林夜话": [
"回声之林夜话",
"回声"
]
},
"原魔": {

View File

@ -2221,6 +2221,19 @@
},
"SideIconName": "UI_AvatarIcon_Side_Liuyun"
},
"10000094": {
"SkillOrder": [
10941,
10942,
10945
],
"Skills": {
"10941": "Skill_A_01",
"10942": "Skill_S_Chiori_01",
"10945": "Skill_E_Chiori_01"
},
"SideIconName": "UI_AvatarIcon_Side_Chiori"
},
"10000005-501": {
"Element": "None",
"Consts": [

View File

@ -6,9 +6,6 @@
"10004": "双手剑单次重击",
"10006": "蓄力技能教学触发器",
"10011": "五连击",
"10101": "武器技能CD",
"10102": "队伍天赋共CD",
"10111": "神里绫华空中连斩",
"10012": "凯特测试技能",
"10013": "神里流·霰步",
"10014": "凯特-穿透电流",
@ -63,6 +60,9 @@
"10083": "Lisa队伍天赋技能",
"10087": "水纹剑",
"10088": "扬水制流",
"10101": "武器技能CD",
"10102": "队伍天赋共CD",
"10111": "神里绫华空中连斩",
"10117": "草缘剑",
"10118": "偃草若化",
"10160": "普通攻击·淬炼之剑",
@ -87,12 +87,15 @@
"10241": "普通攻击·征涛",
"10242": "捉浪",
"10245": "斫雷",
"20000": "进入瞄准模式",
"10251": "阿葵丽雅点射",
"10252": "阿葵丽雅长按瞄准",
"10253": "阿葵丽雅瞄准模式",
"10254": "冰爆弓",
"10255": "霜寒病毒",
"10256": "风魔遁-地面",
"10257": "风魔遁-空遁",
"10258": "冰爆弓",
"10259": "霜寒病毒",
"10261": "普通攻击·卷积微尘",
"10262": "风轮两立",
"10263": "魈冲抓(空中)",
@ -137,28 +140,17 @@
"10352": "仙法·寒病鬼差",
"10353": "仙法·救苦度厄",
"10355": "七七复活技能",
"10371": "普通攻击·流天射术",
"10372": "山泽麟迹",
"10373": "降众天华",
"10374": "花雨",
"11301": "菲谢尔普攻",
"11302": "菲谢尔小技能",
"11305": "菲谢尔充能技",
"10256": "风魔遁-地面",
"10257": "风魔遁-空遁",
"10258": "冰爆弓",
"10259": "霜寒病毒",
"10362": "重云小技能白盒测试",
"10363": "雷主角小技能白盒测试",
"10364": "雷主角小技能白盒测试",
"10365": "雷主角小技能白盒测试1",
"11371": "Rx白盒测试普攻",
"11372": "Rx白盒测试技能1",
"11373": "Rx白盒测试技能2",
"11374": "Rx白盒进入瞄准",
"11375": "Rx白盒触发射击",
"10371": "普通攻击·流天射术",
"10372": "山泽麟迹",
"10373": "降众天华",
"10374": "花雨",
"10381": "普通攻击·古华剑法",
"10382": "古华剑·画雨笼山",
"10384": "抓猫扔鱼",
"10385": "古华剑·裁雨留虹",
"10386": "普通攻击·西风剑术·白",
"10387": "创生法·拟造阳华",
@ -257,10 +249,10 @@
"10622": "冰尘雪野",
"10623": "埃洛伊瞄准射击",
"10624": "埃洛伊普通攻击",
"10625": "曙光预言",
"10631": "普通攻击·踏辰摄斗",
"10632": "仰灵威召将役咒",
"10635": "神女遣灵真诀",
"10625": "曙光预言",
"10641": "普通攻击·拂云出手",
"10642": "旋云开相",
"10643": "破嶂见旌仪",
@ -275,8 +267,8 @@
"10665": "神里流·水囿",
"10671": "普通攻击·祈颂射艺",
"10672": "拂花偈叶",
"10675": "猫猫秘宝",
"10674": "柯莱瞄准模式",
"10675": "猫猫秘宝",
"10681": "普通攻击·妙显剑舞·改",
"10682": "镇灵之灯·烦恼解决炮",
"10685": "卡萨扎莱宫的无微不至",
@ -288,9 +280,9 @@
"10702": "七域舞步",
"10703": "妮露元素战技2",
"10704": "妮露元素战技3",
"10705": "浮莲舞步·远梦聆泉",
"10706": "妮露元素战技特殊A",
"10707": "妮露元素战技特殊E",
"10705": "浮莲舞步·远梦聆泉",
"10708": "妮露元素战技1命六用",
"10711": "普通攻击·七圣枪术",
"10712": "秘仪·律渊渡魂",
@ -305,6 +297,7 @@
"10741": "普通攻击·熠辉轨度剑",
"10742": "垂裳端凝之夜",
"10745": "星流摇床之梦",
"10750": "流浪者元素战技",
"10751": "普通攻击·行幡鸣弦",
"10752": "羽画·风姿华歌",
"10753": "狂言·式乐五番",
@ -313,7 +306,6 @@
"10757": "流浪者元素战技",
"10758": "流浪者元素战技",
"10759": "流浪者元素战技",
"10750": "流浪者元素战技",
"10761": "普通攻击·迴身箭术",
"10762": "非想风天",
"10764": "珐露珊长按/瞄准模式",
@ -378,10 +370,23 @@
"10931": "普通攻击·清风散花词",
"10932": "朝起鹤云",
"10933": "留云元素战技_第二跳",
"10936": "留云元素战技_第三跳",
"10937": "留云命6_地面第一跳",
"10934": "留云元素战技_鹤形追击",
"10935": "暮集竹星",
"10936": "留云元素战技_第三跳",
"10937": "留云命6_地面第一跳",
"10941": "普通攻击·心织刀流",
"10942": "羽袖一触",
"10944": "千织二段E后-技能替换",
"10945": "二刀之形·比翼",
"11301": "菲谢尔普攻",
"11302": "菲谢尔小技能",
"11305": "菲谢尔充能技",
"11371": "Rx白盒测试普攻",
"11372": "Rx白盒测试技能1",
"11373": "Rx白盒测试技能2",
"11374": "Rx白盒进入瞄准",
"11375": "Rx白盒触发射击",
"20000": "进入瞄准模式",
"20001": "风魔炮",
"20002": "风魔炮",
"20011": "飞行挑战 - 前冲",
@ -433,11 +438,13 @@
"20066": "提线木偶-左右连打(白盒)",
"20067": "4.2 陆地章鱼-喷射能力",
"20070": "探查技能",
"20080": "探查技能",
"20077": "4.4海灯节-变身技能-金币关",
"20080": "探查技能",
"20082": "4.2水下弹射",
"20083": "4.4海灯节-变身技能-积分关",
"20084": "4.4海灯节-变身技能-生存关",
"20093": "4.5史莱姆球-元素弹",
"20094": "4.5史莱姆球-物理连射",
"20100": "捕获!",
"20101": "捕获!",
"20110": "神秘预感",
@ -447,42 +454,15 @@
"20122": "禁锢诅咒",
"20200": "伪装",
"20201": "伪装",
"20210": "透明戏法",
"20212": "透明戏法",
"20211": "诱饵战术",
"20213": "诱饵战术",
"20220": "星步疾行",
"20202": "伪装",
"20203": "伪装",
"20210": "透明戏法",
"20211": "诱饵战术",
"20212": "透明戏法",
"20213": "诱饵战术",
"20214": "诱饵战术",
"20215": "诱饵战术",
"20400": "捕获!",
"20401": "捕获!",
"20410": "神秘预感",
"20411": "感应光环",
"20420": "狩猎直觉",
"20421": "洞察全局",
"20422": "禁锢诅咒",
"20500": "伪装",
"20501": "伪装",
"20510": "透明戏法",
"20512": "透明戏法",
"20511": "诱饵战术",
"20513": "诱饵战术",
"20520": "星步疾行",
"20521": "猎手投网",
"20522": "幻形信标",
"20523": "匿踪信标",
"20524": "神秘预感",
"20525": "伪装",
"20526": "伪装",
"20527": "鱼跃",
"20528": "景观玩法",
"20529": "鱼跃弹出",
"20530": "螭神像发子弹",
"20531": "螭神像弹出",
"20561": "鱼跃T地面",
"20562": "鱼跃T空中",
"20220": "星步疾行",
"20310": "进入钓鱼选竿状态",
"20311": "进入钓鱼瞄准状态",
"20312": "QTE启动按键",
@ -509,7 +489,33 @@
"20364": "4.1三周年庆-泡泡枪",
"20365": "4.1黑拳WQ投壶技能 长CD",
"20366": "4.1黑拳WQ投壶技能 短CD",
"10384": "抓猫扔鱼",
"20400": "捕获!",
"20401": "捕获!",
"20410": "神秘预感",
"20411": "感应光环",
"20420": "狩猎直觉",
"20421": "洞察全局",
"20422": "禁锢诅咒",
"20500": "伪装",
"20501": "伪装",
"20510": "透明戏法",
"20511": "诱饵战术",
"20512": "透明戏法",
"20513": "诱饵战术",
"20520": "星步疾行",
"20521": "猎手投网",
"20522": "幻形信标",
"20523": "匿踪信标",
"20524": "神秘预感",
"20525": "伪装",
"20526": "伪装",
"20527": "鱼跃",
"20528": "景观玩法",
"20529": "鱼跃弹出",
"20530": "螭神像发子弹",
"20531": "螭神像弹出",
"20561": "鱼跃T地面",
"20562": "鱼跃T空中",
"100540": "普通攻击·故去的追忆",
"100541": "旅行者五连击(火)",
"100542": "普通攻击·异邦激流",
@ -583,8 +589,8 @@
"5054010": "珊瑚宫心海空中攻击",
"5055010": "五郎空中攻击",
"5056010": "九条裟罗空中攻击",
"5058010": "八重神子空中攻击",
"5057010": "荒泷一斗空中攻击",
"5058010": "八重神子空中攻击",
"5059010": "鹿野院平藏空中攻击",
"5060010": "夜兰空中攻击",
"5061010": "绮良良空中攻击",
@ -619,7 +625,8 @@
"5090010": "夏沃蕾空中攻击",
"5091010": "娜维娅空中攻击",
"5092010": "嘉明空中攻击",
"5093010": "闲云空中攻击"
"5093010": "闲云空中攻击",
"5094010": "千织空中攻击"
},
"Icon": {
"10001": "",
@ -628,9 +635,6 @@
"10004": "",
"10006": "",
"10011": "Skill_A_01",
"10101": "",
"10102": "",
"10111": "Skill_A_01",
"10012": "Skill_S_Kate_01",
"10013": "Skill_S_Ayaka_02",
"10014": "Skill_E_Kate",
@ -685,6 +689,9 @@
"10083": "Skill_E_Kate",
"10087": "Skill_S_PlayerWater_01",
"10088": "Skill_E_PlayerWater_01",
"10101": "",
"10102": "",
"10111": "Skill_A_01",
"10117": "Skill_E_PlayerGrass_01",
"10118": "Skill_S_PlayerGrass_01",
"10160": "Skill_A_04",
@ -709,12 +716,15 @@
"10241": "Skill_A_04",
"10242": "Skill_S_Beidou_01",
"10245": "Skill_E_Beidou_01",
"20000": "Main_AimActive",
"10251": "Skill_A_02",
"10252": "Skill_A_02",
"10253": "Skill_A_02",
"10254": "Skill_S_Ayaka_01",
"10255": "Skill_E_Ayaka",
"10256": "Skill_S_Ayaka_01",
"10257": "Skill_S_Ayaka_01",
"10258": "Skill_S_Ayaka_01",
"10259": "Skill_E_Ayaka",
"10261": "Skill_A_03",
"10262": "Skill_S_Xiao_01",
"10263": "Skill_S_Xiao_01",
@ -759,28 +769,17 @@
"10352": "Skill_S_Qiqi_01",
"10353": "Skill_E_Qiqi_01",
"10355": "Skill_E_Kate",
"10371": "Skill_A_02",
"10372": "Skill_S_Ganyu_01",
"10373": "Skill_E_Ganyu_01",
"10374": "Skill_A_02",
"11301": "Skill_A_02",
"11302": "Skill_S_Ambor_01",
"11305": "Skill_E_Beidou_01",
"10256": "Skill_S_Ayaka_01",
"10257": "Skill_S_Ayaka_01",
"10258": "Skill_S_Ayaka_01",
"10259": "Skill_E_Ayaka",
"10362": "Skill_E_Ayaka",
"10363": "Skill_E_Ayaka",
"10364": "Skill_S_Ayaka_01",
"10365": "Skill_E_Ayaka",
"11371": "Skill_A_02",
"11372": "Skill_S_Razor_01",
"11373": "Skill_E_Razor_01",
"11374": "Skill_A_02",
"11375": "Skill_A_02",
"10371": "Skill_A_02",
"10372": "Skill_S_Ganyu_01",
"10373": "Skill_E_Ganyu_01",
"10374": "Skill_A_02",
"10381": "Skill_A_01",
"10382": "Skill_S_Xingqiu_01",
"10384": "Btn_Recon_Bait",
"10385": "Skill_E_Xingqiu_01",
"10386": "Skill_A_01",
"10387": "Skill_S_Albedo_01",
@ -879,10 +878,10 @@
"10622": "Skill_S_Aloy_01",
"10623": "Skill_A_02",
"10624": "Skill_A_02",
"10625": "Skill_E_Aloy_01",
"10631": "Skill_A_03",
"10632": "Skill_S_Shenhe_01",
"10635": "Skill_E_Shenhe_01",
"10625": "Skill_E_Aloy_01",
"10641": "Skill_A_03",
"10642": "Skill_S_Yunjin_01",
"10643": "Skill_E_Yunjin_01",
@ -897,8 +896,8 @@
"10665": "Skill_E_Ayato_01",
"10671": "Skill_A_02",
"10672": "Skill_S_Collei_01",
"10675": "Skill_E_Collei_01",
"10674": "Skill_A_02",
"10675": "Skill_E_Collei_01",
"10681": "Skill_A_04",
"10682": "Skill_S_Dori_01",
"10685": "Skill_E_Dori_01",
@ -910,9 +909,9 @@
"10702": "Skill_S_Nilou_01",
"10703": "Skill_S_Nilou_01",
"10704": "Skill_S_Nilou_01",
"10705": "Skill_E_Nilou_01",
"10706": "Skill_S_Nilou_04",
"10707": "Skill_S_Nilou_02",
"10705": "Skill_E_Nilou_01",
"10708": "Skill_S_Nilou_01",
"10711": "Skill_A_03",
"10712": "Skill_S_Cyno_01",
@ -927,6 +926,7 @@
"10741": "Skill_A_01",
"10742": "Skill_S_Layla_01",
"10745": "Skill_E_Layla_01",
"10750": "Skill_S_Wanderer_03",
"10751": "Skill_A_Catalyst_MD",
"10752": "Skill_S_Wanderer_01",
"10753": "Skill_E_Wanderer_01",
@ -935,7 +935,6 @@
"10757": "Skill_S_Wanderer_01",
"10758": "Skill_A_Catalyst_MD",
"10759": "Skill_S_Wanderer_02",
"10750": "Skill_S_Wanderer_03",
"10761": "Skill_A_02",
"10762": "Skill_S_Faruzan_01",
"10764": "Skill_A_02",
@ -1000,10 +999,23 @@
"10931": "Skill_A_Catalyst_MD",
"10932": "Skill_S_Liuyun_01",
"10933": "Skill_S_Liuyun_02",
"10936": "Skill_S_Liuyun_03",
"10937": "Skill_S_Liuyun_05",
"10934": "Skill_S_Liuyun_04",
"10935": "Skill_E_Liuyun_01",
"10936": "Skill_S_Liuyun_03",
"10937": "Skill_S_Liuyun_05",
"10941": "Skill_A_01",
"10942": "Skill_S_Chiori_01",
"10944": "Skill_S_Chiori_03",
"10945": "Skill_E_Chiori_01",
"11301": "Skill_A_02",
"11302": "Skill_S_Ambor_01",
"11305": "Skill_E_Beidou_01",
"11371": "Skill_A_02",
"11372": "Skill_S_Razor_01",
"11373": "Skill_E_Razor_01",
"11374": "Skill_A_02",
"11375": "Skill_A_02",
"20000": "Main_AimActive",
"20001": "Skill_A_Dvalin_AirGun",
"20002": "Skill_A_Dvalin_AirGun",
"20011": "Btn_FlightSprint",
@ -1055,11 +1067,13 @@
"20066": "Btn_HideAndSeek_Seeker_S_01",
"20067": "Skill_Diving_Octopus",
"20070": "QuesteventSkillIcon_01",
"20080": "QuesteventSkillIcon_01",
"20077": "Skill_LanV4PartyLion_01",
"20080": "QuesteventSkillIcon_01",
"20082": "",
"20083": "Skill_LanV4PartyLion_01",
"20084": "Skill_LanV4PartyLion_01",
"20093": "Btn_SlimeCannon_Fire_01",
"20094": "Btn_SlimeCannon_Fire_04",
"20100": "Btn_HideAndSeek_Seeker_A_01",
"20101": "Btn_HideAndSeek_Seeker_A_01",
"20110": "Btn_HideAndSeek_Seeker_S_01",
@ -1069,42 +1083,15 @@
"20122": "Btn_HideAndSeek_Seeker_E_03",
"20200": "Btn_HideAndSeek_Hider_A_01",
"20201": "Btn_HideAndSeek_Hider_A_03",
"20210": "Btn_HideAndSeek_Hider_S_01",
"20212": "Btn_HideAndSeek_Hider_S_01_Borbid",
"20211": "Btn_HideAndSeek_Hider_S_02",
"20213": "Btn_HideAndSeek_Hider_S_02_Borbid",
"20220": "Btn_HideAndSeek_Hider_E_01",
"20202": "Btn_HideAndSeek_Hider_A_01",
"20203": "Btn_HideAndSeek_Hider_A_03",
"20210": "Btn_HideAndSeek_Hider_S_01",
"20211": "Btn_HideAndSeek_Hider_S_02",
"20212": "Btn_HideAndSeek_Hider_S_01_Borbid",
"20213": "Btn_HideAndSeek_Hider_S_02_Borbid",
"20214": "Btn_HideAndSeek_Hider_S_02",
"20215": "Btn_HideAndSeek_Hider_S_02_Borbid",
"20400": "Btn_HideAndSeek_Seeker_A_01",
"20401": "Btn_HideAndSeek_Seeker_A_01",
"20410": "Btn_HideAndSeek_Seeker_S_01",
"20411": "Btn_HideAndSeek_Seeker_S_02",
"20420": "Btn_HideAndSeek_Seeker_E_01",
"20421": "Btn_HideAndSeek_Seeker_E_02",
"20422": "Btn_HideAndSeek_Seeker_E_03",
"20500": "Btn_HideAndSeek_Hider_A_01",
"20501": "Btn_HideAndSeek_Hider_A_03",
"20510": "Btn_HideAndSeek_Hider_S_01",
"20512": "Btn_HideAndSeek_Hider_S_01_Borbid",
"20511": "Btn_HideAndSeek_Hider_S_02",
"20513": "Btn_HideAndSeek_Hider_S_02_Borbid",
"20520": "Btn_HideAndSeek_Hider_E_01",
"20521": "UI_Icon_Skill_Hunter_Net",
"20522": "Btn_HideAndSeek_Hider_S_02",
"20523": "UI_Icon_Skill_Prey_Invisible_Bait",
"20524": "Btn_HideAndSeek_Seeker_S_01",
"20525": "Btn_HideAndSeek_Hider_A_01",
"20526": "Btn_HideAndSeek_Hider_A_03",
"20527": "Skill_CarpJump_02",
"20528": "Skill_C_FairyGadgetSet",
"20529": "Btn_Fishing_Exit",
"20530": "Skill_CarpJump_01",
"20531": "Btn_Fishing_Exit",
"20561": "",
"20562": "",
"20220": "Btn_HideAndSeek_Hider_E_01",
"20310": "",
"20311": "Btn_Fishing_Cast",
"20312": "Btn_Fishing_Battle",
@ -1131,7 +1118,33 @@
"20364": "Skill_E_BubbleGun_01",
"20365": "Btn_Recon_Bait",
"20366": "Btn_Recon_Bait",
"10384": "Btn_Recon_Bait",
"20400": "Btn_HideAndSeekV4_Seeker_S",
"20401": "Btn_HideAndSeekV4_Seeker_S",
"20410": "Btn_HideAndSeek_Seeker_S_01",
"20411": "Btn_HideAndSeekV4_Seeker_A_02",
"20420": "Btn_HideAndSeek_Seeker_E_01",
"20421": "Btn_HideAndSeekV4_Seeker_E_02",
"20422": "Btn_HideAndSeekV4_Seeker_E_01",
"20500": "Btn_HideAndSeek_Hider_A_01",
"20501": "Btn_HideAndSeek_Hider_A_03",
"20510": "Btn_HideAndSeekV4_Hider_A_01",
"20511": "Btn_HideAndSeek_Hider_S_02",
"20512": "Btn_HideAndSeek_Hider_S_01_Borbid",
"20513": "Btn_HideAndSeek_Hider_S_02_Borbid",
"20520": "Btn_HideAndSeekV4_Hider_E",
"20521": "UI_Icon_Skill_Hunter_Net",
"20522": "Btn_HideAndSeek_Hider_S_02",
"20523": "Btn_HideAndSeekV4_Hider_A_02",
"20524": "Btn_HideAndSeekV4_Seeker_A_01",
"20525": "Btn_HideAndSeek_Hider_A_01",
"20526": "Btn_HideAndSeek_Hider_A_03",
"20527": "Skill_CarpJump_02",
"20528": "Skill_C_FairyGadgetSet",
"20529": "Btn_Fishing_Exit",
"20530": "Skill_CarpJump_01",
"20531": "Btn_Fishing_Exit",
"20561": "",
"20562": "",
"100540": "Skill_A_01",
"100541": "Skill_A_01",
"100542": "Skill_A_01",
@ -1205,8 +1218,8 @@
"5054010": "Skill_A_Catalyst_MD",
"5055010": "Skill_A_02",
"5056010": "Skill_A_02",
"5058010": "Skill_A_Catalyst_MD",
"5057010": "Skill_A_04",
"5058010": "Skill_A_Catalyst_MD",
"5059010": "Skill_A_Catalyst_MD",
"5060010": "Skill_A_02",
"5061010": "Skill_A_01",
@ -1241,6 +1254,7 @@
"5090010": "Skill_A_03",
"5091010": "Skill_A_04",
"5092010": "Skill_A_04",
"5093010": "Skill_A_Catalyst_MD"
"5093010": "Skill_A_Catalyst_MD",
"5094010": "Skill_A_01"
}
}

View File

@ -18,6 +18,12 @@
"44": "如雨的电浆",
"45": "等离态的落雷",
"46": "脉冲的魔女",
"61": "微澜的湖水",
"62": "潺涓的碧水",
"63": "激荡的波水",
"64": "倾落的迸水",
"65": "洄旋的曲水",
"66": "公义的潮水",
"71": "回转的怒风",
"72": "革新的旋风",
"73": "天地的刚风",
@ -42,12 +48,6 @@
"114": "如饴的蜜草",
"115": "迅生的丰草",
"116": "蕴思的霜草",
"61": "微澜的湖水",
"62": "潺涓的碧水",
"63": "激荡的波水",
"64": "倾落的迸水",
"65": "洄旋的曲水",
"66": "公义的潮水",
"141": "彩色歌谣",
"142": "元气迸发",
"143": "明日之星",
@ -300,6 +300,12 @@
"604": "诓惑者,接树移花",
"605": "坐庄者,三仙戏法",
"606": "取胜者,大小通吃",
"611": "物器流转",
"612": "八尖裹术",
"613": "万户门牌通识",
"614": "韦驮骏足",
"615": "千里一日",
"616": "沿途百景会心",
"621": "异界之星",
"622": "异界之星",
"623": "异界之星",
@ -426,12 +432,6 @@
"824": "法古观冥",
"825": "盈虚藏象",
"826": "真邪合离",
"611": "物器流转",
"612": "八尖裹术",
"613": "万户门牌通识",
"614": "韦驮骏足",
"615": "千里一日",
"616": "沿途百景会心",
"831": "如影流露的冷刃",
"832": "层见叠出的谜象",
"833": "倒错知能的视度",
@ -497,7 +497,13 @@
"933": "造化有星月",
"934": "奥妙烹黍珠",
"935": "旋步霞蔚上",
"936": "知是留云僊"
"936": "知是留云僊",
"941": "正绢六通",
"942": "落染五色",
"943": "缀锦四分",
"944": "衣裁三礼",
"945": "绫羽二重",
"946": "万理一空"
},
"Icon": {
"21": "UI_Talent_S_Ayaka_01",
@ -518,6 +524,12 @@
"44": "UI_Talent_S_Lisa_03",
"45": "UI_Talent_U_Lisa_01",
"46": "UI_Talent_S_Lisa_04",
"61": "UI_Talent_S_PlayerWater_01",
"62": "UI_Talent_S_PlayerWater_02",
"63": "UI_Talent_U_PlayerWater_01",
"64": "UI_Talent_S_PlayerWater_03",
"65": "UI_Talent_U_PlayerWater_02",
"66": "UI_Talent_S_PlayerWater_04",
"71": "UI_Talent_S_PlayerWind_01",
"72": "UI_Talent_S_PlayerWind_02",
"73": "UI_Talent_U_PlayerWind_02",
@ -542,12 +554,6 @@
"114": "UI_Talent_S_PlayerGrass_04",
"115": "UI_Talent_S_PlayerGrass_05",
"116": "UI_Talent_S_PlayerGrass_06",
"61": "UI_Talent_S_PlayerWater_01",
"62": "UI_Talent_S_PlayerWater_02",
"63": "UI_Talent_U_PlayerWater_01",
"64": "UI_Talent_S_PlayerWater_03",
"65": "UI_Talent_U_PlayerWater_02",
"66": "UI_Talent_S_PlayerWater_04",
"141": "UI_Talent_S_Barbara_01",
"142": "UI_Talent_S_Barbara_02",
"143": "UI_Talent_U_Barbara_02",
@ -800,6 +806,12 @@
"604": "UI_Talent_S_Yelan_03",
"605": "UI_Talent_U_Yelan_02",
"606": "UI_Talent_S_Yelan_04",
"611": "UI_Talent_S_Momoka_01",
"612": "UI_Talent_S_Momoka_02",
"613": "UI_Talent_U_Momoka_01",
"614": "UI_Talent_S_Momoka_04",
"615": "UI_Talent_U_Momoka_02",
"616": "UI_Talent_S_Momoka_03",
"621": "UI_Talent_S_Aloy_Lock",
"622": "UI_Talent_S_Aloy_Lock",
"623": "UI_Talent_S_Aloy_Lock",
@ -926,12 +938,6 @@
"824": "UI_Talent_S_Baizhuer_03",
"825": "UI_Talent_U_Baizhuer_02",
"826": "UI_Talent_S_Baizhuer_04",
"611": "UI_Talent_S_Momoka_01",
"612": "UI_Talent_S_Momoka_02",
"613": "UI_Talent_U_Momoka_01",
"614": "UI_Talent_S_Momoka_04",
"615": "UI_Talent_U_Momoka_02",
"616": "UI_Talent_S_Momoka_03",
"831": "UI_Talent_S_Linette_01",
"832": "UI_Talent_S_Linette_02",
"833": "UI_Talent_U_Linette_01",
@ -997,6 +1003,12 @@
"933": "UI_Talent_U_Liuyun_02",
"934": "UI_Talent_S_Liuyun_03",
"935": "UI_Talent_U_Liuyun_01",
"936": "UI_Talent_S_Liuyun_04"
"936": "UI_Talent_S_Liuyun_04",
"941": "UI_Talent_S_Chiori_01",
"942": "UI_Talent_S_Chiori_03",
"943": "UI_Talent_U_Chiori_01",
"944": "UI_Talent_S_Chiori_02",
"945": "UI_Talent_U_Chiori_02",
"946": "UI_Talent_S_Chiori_04"
}
}

View File

@ -31674,5 +31674,10 @@
"region": "璃月",
"star": 5,
"element": "风"
},
"千织": {
"region": "枫丹",
"star": 5,
"element": "岩"
}
}

View File

@ -1091,6 +1091,10 @@
"闲云": [
1,
0
],
"千织": [
0,
1
]
}
}

View File

@ -45,6 +45,7 @@
"454086795": "圣显之钥",
"275622963": "裁叶萃光",
"1473399443": "静水流涌之辉",
"1818340435": "有乐御簾切",
"2666951267": "训练大剑",
"1182966603": "佣兵重剑",
"1479961579": "铁影阔剑",
@ -111,6 +112,7 @@
"688991243": "息灾",
"3717849275": "薙草之稻光",
"4238339131": "赤沙之杖",
"2847771107": "沙中伟贤的对答",
"3584825427": "学徒笔记",
"2705029563": "口袋魔导书",
"2279290283": "魔导绪论",
@ -238,6 +240,7 @@
"波乱月白经津": "单手剑",
"圣显之钥": "单手剑",
"裁叶萃光": "单手剑",
"有乐御簾切": "单手剑",
"训练大剑": "双手剑",
"佣兵重剑": "双手剑",
"铁影阔剑": "双手剑",
@ -304,6 +307,7 @@
"息灾": "长柄武器",
"薙草之稻光": "长柄武器",
"赤沙之杖": "长柄武器",
"沙中伟贤的对答": "长柄武器",
"学徒笔记": "法器",
"口袋魔导书": "法器",
"魔导绪论": "法器",
@ -568,6 +572,8 @@
"飞雷之弦振": "UI_EquipIcon_Bow_Narukami",
"猎人之径": "UI_EquipIcon_Bow_Ayus",
"最初的大魔术": "UI_EquipIcon_Bow_Pledge",
"有乐御簾切": "UI_EquipIcon_Sword_Needle",
"沙中伟贤的对答": "UI_EquipIcon_Pole_Caduceus",
"(test)竿测试": "UI_EquipIcon_FishingRod",
"(test)穿模测试": "UI_EquipIcon_Bow_Template"
}

View File

@ -23,7 +23,8 @@
"旅行者水",
"绮良良",
"琳妮特",
"芙宁娜"
"芙宁娜",
"千织"
],
"法器": [
"丽莎",
@ -176,7 +177,8 @@
"荒泷一斗",
"云堇",
"旅行者岩",
"娜维娅"
"娜维娅",
"千织"
],
"草": [
"柯莱",
@ -231,7 +233,8 @@
"灰河渡手",
"船坞长剑",
"水仙十字之剑",
"静水流涌之辉"
"静水流涌之辉",
"有乐御簾切"
],
"双手剑": [
"训练大剑",
@ -297,7 +300,8 @@
"赤沙之杖",
"峡湾长歌",
"公义的酬报",
"勘探钻机"
"勘探钻机",
"沙中伟贤的对答"
],
"法器": [
"学徒笔记",

View File

@ -50,7 +50,10 @@ def load_history_info(user_id: str, uid: str) -> Tuple[GachaLogInfo, bool]:
"""
file_path = GACHA_LOG / f'gacha_log-{user_id}-{uid}.json'
if file_path.exists():
return GachaLogInfo.parse_obj(load_json(file_path)), True
old_gacha_info = load_json(file_path)
if "集录祈愿" not in old_gacha_info["item_list"]:
old_gacha_info["item_list"]["集录祈愿"] = []
return GachaLogInfo.parse_obj(old_gacha_info), True
else:
return GachaLogInfo(user_id=user_id,
uid=uid,
@ -134,6 +137,7 @@ async def get_gacha_log_data(user_id: str, uid: str):
'武器祈愿': 0,
'常驻祈愿': 0,
'新手祈愿': 0,
'集录祈愿': 0
}
server_id = 'cn_qd01' if uid[0] == '5' else 'cn_gf01'
authkey, state, cookie_info = await get_authkey_by_stoken(user_id, uid)

View File

@ -11,7 +11,7 @@ from .models import GachaLogInfo, FiveStarItem, FourStarItem
avatar_point = [69, 156, 259, 358, 456, 558, 645, 746, 840, 945]
line_point = [88, 182, 282, 378, 477, 574, 673, 769, 864, 967]
bar_color = [('#b6d6f2', '#3d6e99'), ('#c8b6f2', '#593d99'), ('#abede0', '#3a9382')]
bar_color = [('#b6d6f2', '#3d6e99'), ('#c8b6f2', '#593d99'), ('#abede0', '#3a9382'), ("#e3d809", "#646C04")]
name_level_color = [('#f6b9c9', '#a90d35'), ('#f2cab9', '#ff6f30'), ('#b9d8f2', '#157eaa'), ('#dedede', '#707070')]
small_avatar_cache = {}
"""
@ -161,14 +161,14 @@ async def draw_four_star(info: FourStarItem) -> PMImage:
'center')
await bg.text(str(info.num['武器祈愿']), (65, 125), 209, fm.get('bahnschrift_regular', 36, 'Bold'), '#593d99',
'center')
await bg.text(str(info.num['常驻祈愿'] + info.num['新手祈愿']), (126, 186), 209, fm.get('bahnschrift_regular', 36, 'Bold'),
await bg.text(str(info.num['常驻祈愿'] + info.num['新手祈愿'] + info.num['集录祈愿']), (126, 186), 209, fm.get('bahnschrift_regular', 36, 'Bold'),
'#3a9381',
'center')
return bg
async def draw_four_star_detail(data: List[FourStarItem]):
data.sort(key=lambda x: x.num['角色祈愿'] + x.num['武器祈愿'] + x.num['常驻祈愿'] + x.num['新手祈愿'], reverse=True)
data.sort(key=lambda x: x.num['角色祈愿'] + x.num['武器祈愿'] + x.num['常驻祈愿'] + x.num['新手祈愿'] + x.num['集录祈愿'], reverse=True)
bar = await load_image(RESOURCE_BASE_PATH / 'gacha_log' / 'four_star_bar.png')
total_height = 105 + 260 * math.ceil(len(data) / 5)
bg = PMImage(size=(1008, total_height), mode='RGBA', color=(255, 255, 255, 0))
@ -221,8 +221,9 @@ async def draw_gacha_log(user_id: str, uid: str, nickname: Optional[str], signat
chara_pool_per = round(len(data5['角色祈愿']) / total_five_star_count * 100, 1)
weapon_pool_per = round(len(data5['武器祈愿']) / total_five_star_count * 100, 1)
new_pool_per = round((len(data5['常驻祈愿']) + len(data5['新手祈愿'])) / total_five_star_count * 100, 1)
jilu_pool_per = round(len(data5['集录祈愿']) / total_five_star_count * 100, 1)
now_used_width = 56
pers = [chara_pool_per, weapon_pool_per, new_pool_per]
pers = [chara_pool_per, weapon_pool_per, new_pool_per, jilu_pool_per]
i = 0
for per in pers:
if per >= 3:

View File

@ -5,7 +5,7 @@ from pydantic import BaseModel
from LittlePaimon.utils.alias import get_chara_icon, get_weapon_icon
GACHA_TYPE_LIST = {'100': '新手祈愿', '200': '常驻祈愿', '302': '武器祈愿', '301': '角色祈愿', '400': '角色祈愿'}
GACHA_TYPE_LIST = {'100': '新手祈愿', '200': '常驻祈愿', '302': '武器祈愿', '301': '角色祈愿', '400': '角色祈愿', '500': '集录祈愿'}
class FiveStarItem(BaseModel):
@ -23,7 +23,8 @@ class FourStarItem(BaseModel):
'角色祈愿': 0,
'武器祈愿': 0,
'常驻祈愿': 0,
'新手祈愿': 0}
'新手祈愿': 0,
'集录祈愿': 0}
class GachaItem(BaseModel):
@ -44,6 +45,7 @@ class GachaLogInfo(BaseModel):
'武器祈愿': [],
'常驻祈愿': [],
'新手祈愿': [],
'集录祈愿': []
}
def get_record_time(self) -> Dict[str, Tuple[datetime.datetime, datetime.datetime]]:
@ -51,7 +53,8 @@ class GachaLogInfo(BaseModel):
'角色祈愿': (self.item_list['角色祈愿'][0].time, self.item_list['角色祈愿'][-1].time) if self.item_list['角色祈愿'] else (None, None),
'武器祈愿': (self.item_list['武器祈愿'][0].time, self.item_list['武器祈愿'][-1].time) if self.item_list['武器祈愿'] else (None, None),
'常驻祈愿': (self.item_list['常驻祈愿'][0].time, self.item_list['常驻祈愿'][-1].time) if self.item_list['常驻祈愿'] else (None, None),
'新手祈愿': (self.item_list['新手祈愿'][0].time, self.item_list['新手祈愿'][-1].time) if self.item_list['新手祈愿'] else (None, None)
'新手祈愿': (self.item_list['新手祈愿'][0].time, self.item_list['新手祈愿'][-1].time) if self.item_list['新手祈愿'] else (None, None),
'集录祈愿': (self.item_list['集录祈愿'][0].time, self.item_list['集录祈愿'][-1].time) if self.item_list['集录祈愿'] else (None, None),
}
def get_statistics(self) -> Tuple[Dict[str, List[FiveStarItem]], Dict[str, FourStarItem], Dict[str, int]]:
@ -60,6 +63,7 @@ class GachaLogInfo(BaseModel):
'武器祈愿': [],
'常驻祈愿': [],
'新手祈愿': [],
'集录祈愿': []
}
gacha_data_four: Dict[str, FourStarItem] = {}
gacha_not_out: Dict[str, int] = {}

View File

@ -37,7 +37,7 @@ CHARACTERS = ['神里绫华', '琴', '丽莎', '芭芭拉', '凯亚', '迪卢克
'枫原万叶', '烟绯', '宵宫', '托马', '优菈', '雷电将军', '早柚', '珊瑚宫心海', '五郎', '九条裟罗',
'荒泷一斗', '八重神子', '夜兰', '埃洛伊',
'申鹤', '云堇', '久岐忍', '神里绫人', '鹿野院平藏', '提纳里', '柯莱', '多莉', '赛诺', '坎蒂丝', '妮露',
'纳西妲', '莱依拉', '流浪者', '珐露珊', '艾尔海森', '瑶瑶', '迪希雅', '米卡', '白术', '卡维', '绮良良', '琳妮特', '林尼', '菲米尼', '莱欧斯利', '那维莱特', '夏洛蒂', '芙宁娜', '夏沃蕾', '娜维娅', '嘉明', '闲云']
'纳西妲', '莱依拉', '流浪者', '珐露珊', '艾尔海森', '瑶瑶', '迪希雅', '米卡', '白术', '卡维', '绮良良', '琳妮特', '林尼', '菲米尼', '莱欧斯利', '那维莱特', '夏洛蒂', '芙宁娜', '夏沃蕾', '娜维娅', '嘉明', '闲云', '千织']
"""全角色"""
MALE_CHARACTERS = ['凯亚', '迪卢克', '钟离', '达达利亚', '托马', '荒泷一斗', '神里绫人', '艾尔海森', '白术', '卡维', '莱欧斯利', '那维莱特']
"""成男角色"""
@ -45,7 +45,7 @@ FEMALE_CHARACTERS = ['琴', '丽莎', '北斗', '凝光', '罗莎莉亚', '优
'申鹤', '坎蒂丝', '迪希雅', '闲云']
"""成女角色"""
GIRL_CHARACTERS = ['神里绫华', '芭芭拉', '安柏', '香菱', '菲谢尔', '诺艾尔', '甘雨', '莫娜', '刻晴', '砂糖', '辛焱',
'胡桃', '烟绯', '宵宫', '珊瑚宫心海', '埃洛伊', '云堇', '久岐忍', '柯莱', '妮露', '莱依拉', '珐露珊', '绮良良', '琳妮特', '夏洛蒂', '芙宁娜', '夏沃蕾', '娜维娅']
'胡桃', '烟绯', '宵宫', '珊瑚宫心海', '埃洛伊', '云堇', '久岐忍', '柯莱', '妮露', '莱依拉', '珐露珊', '绮良良', '琳妮特', '夏洛蒂', '芙宁娜', '夏沃蕾', '娜维娅', '千织']
"""少女角色"""
BOY_CHARACTERS = ['雷泽', '温迪', '行秋', '', '班尼特', '重云', '阿贝多', '枫原万叶', '五郎', '鹿野院平藏', '提纳里',
'赛诺', '流浪者', '米卡', '林尼', '菲米尼', '嘉明']