diff --git a/LittlePaimon/config/data/alias.json b/LittlePaimon/config/data/alias.json index 0240e11..054b481 100644 --- a/LittlePaimon/config/data/alias.json +++ b/LittlePaimon/config/data/alias.json @@ -463,6 +463,11 @@ ], "10000094": [ "千织" + ], + "10000096": [ + "阿蕾奇诺", + "仆人", + "父亲" ] }, "武器": { diff --git a/LittlePaimon/config/data/artifact.json b/LittlePaimon/config/data/artifact.json index 8566e75..ce4f6f4 100644 --- a/LittlePaimon/config/data/artifact.json +++ b/LittlePaimon/config/data/artifact.json @@ -224,9 +224,9 @@ "UI_RelicIcon_15030_5": "久远花落之时", "UI_RelicIcon_15031_1": "遗忘的容器", "UI_RelicIcon_15031_2": "杰作的序曲", - "UI_RelicIcon_15031_3": "裁判的时刻", + "UI_RelicIcon_15031_3": "老兵的容颜", "UI_RelicIcon_15031_4": "猎人的胸花", - "UI_RelicIcon_15031_5": "老兵的容颜", + "UI_RelicIcon_15031_5": "裁判的时刻", "UI_RelicIcon_15032_1": "黄金之夜的喧嚣", "UI_RelicIcon_15032_2": "黄金飞鸟的落羽", "UI_RelicIcon_15032_3": "黄金剧团的奖赏", @@ -241,194 +241,204 @@ "UI_RelicIcon_15034_2": "诚恳的蘸水笔", "UI_RelicIcon_15034_3": "慈爱的淑女帽", "UI_RelicIcon_15034_4": "无私的妆饰花", - "UI_RelicIcon_15034_5": "忠实的砂时计" + "UI_RelicIcon_15034_5": "忠实的砂时计", + "UI_RelicIcon_15035_1": "灵露倾洒的狂诗", + "UI_RelicIcon_15035_2": "古海玄幽的夜想", + "UI_RelicIcon_15035_3": "异想零落的圆舞", + "UI_RelicIcon_15035_4": "谐律交响的前奏", + "UI_RelicIcon_15035_5": "命途轮转的谐谑", + "UI_RelicIcon_15036_1": "筹谋的共樽", + "UI_RelicIcon_15036_2": "褪光的翠尾", + "UI_RelicIcon_15036_3": "失冕的宝冠", + "UI_RelicIcon_15036_4": "暗结的明花", + "UI_RelicIcon_15036_5": "举业的识刻" }, "Mapping": { - "冒险家之花": "冒险家", - "冒险家尾羽": "冒险家", - "冒险家怀表": "冒险家", - "冒险家金杯": "冒险家", - "冒险家头带": "冒险家", - "磐陀裂生之花": "悠古的磐岩", - "嵯峨群峰之翼": "悠古的磐岩", - "星罗圭璧之晷": "悠古的磐岩", - "巉岩琢塑之樽": "悠古的磐岩", - "不动玄石之相": "悠古的磐岩", - "战狂的蔷薇": "战狂", - "战狂的翎羽": "战狂", - "战狂的时计": "战狂", - "战狂的骨杯": "战狂", - "战狂的鬼面": "战狂", - "历经风雪的思念": "冰风迷途的勇士", - "摧冰而行的执望": "冰风迷途的勇士", - "冰雪故园的终期": "冰风迷途的勇士", - "遍结寒霜的傲骨": "冰风迷途的勇士", - "破冰踏雪的回音": "冰风迷途的勇士", - "染血的铁之心": "染血的骑士道", - "染血的黑之羽": "染血的骑士道", - "骑士染血之时": "染血的骑士道", - "染血骑士之杯": "染血的骑士道", - "染血的铁假面": "染血的骑士道", - "勇士的勋章": "勇士之心", - "勇士的期许": "勇士之心", - "勇士的坚毅": "勇士之心", - "勇士的壮行": "勇士之心", - "勇士的冠冕": "勇士之心", - "魔女的炎之花": "炽烈的炎之魔女", - "魔女常燃之羽": "炽烈的炎之魔女", - "魔女破灭之时": "炽烈的炎之魔女", - "魔女的心之火": "炽烈的炎之魔女", - "焦灼的魔女帽": "炽烈的炎之魔女", - "守护之花": "守护之心", - "守护徽印": "守护之心", - "守护座钟": "守护之心", - "守护之皿": "守护之心", - "守护束带": "守护之心", - "魂香之花": "来歆余响", - "垂玉之叶": "来歆余响", - "祝祀之凭": "来歆余响", - "涌泉之盏": "来歆余响", - "浮溯之珏": "来歆余响", - "明威之镡": "绝缘之旗印", - "切落之羽": "绝缘之旗印", - "雷云之笼": "绝缘之旗印", - "绯花之壶": "绝缘之旗印", - "华饰之兜": "绝缘之旗印", - "赌徒的胸花": "赌徒", - "赌徒的羽饰": "赌徒", - "赌徒的怀表": "赌徒", - "赌徒的骰盅": "赌徒", - "赌徒的耳环": "赌徒", - "凛冬霜心": "冰之川与雪之砂", - "雪藏之羽": "冰之川与雪之砂", - "凝冰成砂": "冰之川与雪之砂", - "北风之盏": "冰之川与雪之砂", - "冰河之冠": "冰之川与雪之砂", - "角斗士的留恋": "角斗士的终幕礼", - "角斗士的归宿": "角斗士的终幕礼", - "角斗士的希冀": "角斗士的终幕礼", - "角斗士的酣醉": "角斗士的终幕礼", - "角斗士的凯旋": "角斗士的终幕礼", - "饰金胸花": "沉沦之心", - "追忆之风": "沉沦之心", - "坚铜罗盘": "沉沦之心", - "沉波之盏": "沉沦之心", - "酒渍船帽": "沉沦之心", - "荣花之期": "华馆梦醒形骸记", - "华馆之羽": "华馆梦醒形骸记", - "众生之谣": "华馆梦醒形骸记", - "梦醒之瓢": "华馆梦醒形骸记", - "形骸之笠": "华馆梦醒形骸记", - "教官的胸花": "教官", - "教官的羽饰": "教官", - "教官的怀表": "教官", - "教官的茶杯": "教官", - "教官的帽子": "教官", - "渡火者的决绝": "渡过烈火的贤人", - "渡火者的解脱": "渡过烈火的贤人", - "渡火者的煎熬": "渡过烈火的贤人", - "渡火者的醒悟": "渡过烈火的贤人", - "渡火者的智慧": "渡过烈火的贤人", - "幸运儿绿花": "幸运儿", - "幸运儿鹰羽": "幸运儿", - "幸运儿沙漏": "幸运儿", - "幸运儿之杯": "幸运儿", - "幸运儿银冠": "幸运儿", - "远方的少女之心": "被怜爱的少女", - "少女飘摇的思念": "被怜爱的少女", - "少女苦短的良辰": "被怜爱的少女", - "少女片刻的闲暇": "被怜爱的少女", - "少女易逝的芳颜": "被怜爱的少女", - "武人的红花": "武人", - "武人的羽饰": "武人", - "武人的水漏": "武人", - "武人的酒杯": "武人", - "武人的头巾": "武人", - "宗室之花": "昔日宗室之仪", - "宗室之翎": "昔日宗室之仪", - "宗室时计": "昔日宗室之仪", - "宗室银瓮": "昔日宗室之仪", - "宗室面具": "昔日宗室之仪", - "海染之花": "海染砗磲", - "渊宫之羽": "海染砗磲", - "离别之贝": "海染砗磲", - "真珠之笼": "海染砗磲", - "海祇之冠": "海染砗磲", - "无垢之花": "苍白之火", - "贤医之羽": "苍白之火", - "停摆之刻": "苍白之火", - "超越之盏": "苍白之火", - "嗤笑之面": "苍白之火", - "祭水礼冠": "祭水之人", - "祭火礼冠": "祭火之人", - "祭雷礼冠": "祭雷之人", - "祭冰礼冠": "祭冰之人", - "祭风礼冠": "祭风之人", - "故人之心": "行者之心", - "归乡之羽": "行者之心", "逐光之石": "行者之心", "异国之盏": "行者之心", + "归乡之羽": "行者之心", "感别之冠": "行者之心", - "夏祭之花": "逆飞的流星", - "夏祭终末": "逆飞的流星", - "夏祭之刻": "逆飞的流星", - "夏祭水玉": "逆飞的流星", - "夏祭之面": "逆飞的流星", - "学士的书签": "学士", - "学士的羽笔": "学士", - "学士的时钟": "学士", - "学士的墨杯": "学士", - "学士的镜片": "学士", - "羁缠之花": "追忆之注连", - "思忆之矢": "追忆之注连", - "朝露之时": "追忆之注连", - "祈望之心": "追忆之注连", - "无常之面": "追忆之注连", - "勋绩之花": "千岩牢固", - "昭武翎羽": "千岩牢固", - "金铜时晷": "千岩牢固", - "盟誓金爵": "千岩牢固", - "将帅兜鍪": "千岩牢固", - "流放者之花": "流放者", - "流放者之羽": "流放者", - "流放者怀表": "流放者", - "流放者之杯": "流放者", - "流放者头冠": "流放者", - "雷鸟的怜悯": "如雷的盛怒", - "雷灾的孑遗": "如雷的盛怒", - "雷霆的时计": "如雷的盛怒", - "降雷的凶兆": "如雷的盛怒", - "唤雷的头冠": "如雷的盛怒", - "平雷之心": "平息鸣雷的尊者", - "平雷之羽": "平息鸣雷的尊者", - "平雷之刻": "平息鸣雷的尊者", - "平雷之器": "平息鸣雷的尊者", - "平雷之冠": "平息鸣雷的尊者", - "奇迹之花": "奇迹", - "奇迹之羽": "奇迹", - "奇迹之沙": "奇迹", + "故人之心": "行者之心", + "勇士的壮行": "勇士之心", + "勇士的期许": "勇士之心", + "勇士的冠冕": "勇士之心", + "勇士的勋章": "勇士之心", + "勇士的坚毅": "勇士之心", + "守护之皿": "守护之心", + "守护徽印": "守护之心", + "守护束带": "守护之心", + "守护之花": "守护之心", + "守护座钟": "守护之心", "奇迹之杯": "奇迹", + "奇迹之羽": "奇迹", "奇迹耳坠": "奇迹", - "游医的银莲": "游医", - "游医的枭羽": "游医", - "游医的怀钟": "游医", + "奇迹之花": "奇迹", + "奇迹之沙": "奇迹", + "战狂的骨杯": "战狂", + "战狂的翎羽": "战狂", + "战狂的鬼面": "战狂", + "战狂的蔷薇": "战狂", + "战狂的时计": "战狂", + "武人的酒杯": "武人", + "武人的羽饰": "武人", + "武人的头巾": "武人", + "武人的红花": "武人", + "武人的水漏": "武人", + "教官的茶杯": "教官", + "教官的羽饰": "教官", + "教官的帽子": "教官", + "教官的胸花": "教官", + "教官的怀表": "教官", + "赌徒的骰盅": "赌徒", + "赌徒的羽饰": "赌徒", + "赌徒的耳环": "赌徒", + "赌徒的胸花": "赌徒", + "赌徒的怀表": "赌徒", + "流放者之杯": "流放者", + "流放者之羽": "流放者", + "流放者头冠": "流放者", + "流放者之花": "流放者", + "流放者怀表": "流放者", + "冒险家金杯": "冒险家", + "冒险家尾羽": "冒险家", + "冒险家头带": "冒险家", + "冒险家之花": "冒险家", + "冒险家怀表": "冒险家", + "幸运儿之杯": "幸运儿", + "幸运儿鹰羽": "幸运儿", + "幸运儿银冠": "幸运儿", + "幸运儿绿花": "幸运儿", + "幸运儿沙漏": "幸运儿", + "学士的墨杯": "学士", + "学士的羽笔": "学士", + "学士的镜片": "学士", + "学士的书签": "学士", + "学士的时钟": "学士", "游医的药壶": "游医", + "游医的枭羽": "游医", "游医的方巾": "游医", - "生灵之华": "辰砂往生录", - "潜光片羽": "辰砂往生录", - "阳辔之遗": "辰砂往生录", - "结契之刻": "辰砂往生录", - "虺雷之姿": "辰砂往生录", - "野花记忆的绿野": "翠绿之影", - "猎人青翠的箭羽": "翠绿之影", - "翠绿猎人的笃定": "翠绿之影", + "游医的银莲": "游医", + "游医的怀钟": "游医", + "遍结寒霜的傲骨": "冰风迷途的勇士", + "摧冰而行的执望": "冰风迷途的勇士", + "破冰踏雪的回音": "冰风迷途的勇士", + "历经风雪的思念": "冰风迷途的勇士", + "冰雪故园的终期": "冰风迷途的勇士", + "平雷之器": "平息鸣雷的尊者", + "平雷之羽": "平息鸣雷的尊者", + "平雷之冠": "平息鸣雷的尊者", + "平雷之心": "平息鸣雷的尊者", + "平雷之刻": "平息鸣雷的尊者", + "渡火者的醒悟": "渡过烈火的贤人", + "渡火者的解脱": "渡过烈火的贤人", + "渡火者的智慧": "渡过烈火的贤人", + "渡火者的决绝": "渡过烈火的贤人", + "渡火者的煎熬": "渡过烈火的贤人", + "少女片刻的闲暇": "被怜爱的少女", + "少女飘摇的思念": "被怜爱的少女", + "少女易逝的芳颜": "被怜爱的少女", + "远方的少女之心": "被怜爱的少女", + "少女苦短的良辰": "被怜爱的少女", + "角斗士的酣醉": "角斗士的终幕礼", + "角斗士的归宿": "角斗士的终幕礼", + "角斗士的凯旋": "角斗士的终幕礼", + "角斗士的留恋": "角斗士的终幕礼", + "角斗士的希冀": "角斗士的终幕礼", "翠绿猎人的容器": "翠绿之影", + "猎人青翠的箭羽": "翠绿之影", "翠绿的猎人之冠": "翠绿之影", - "乐团的晨光": "流浪大地的乐团", - "琴师的箭羽": "流浪大地的乐团", - "终幕的时计": "流浪大地的乐团", + "野花记忆的绿野": "翠绿之影", + "翠绿猎人的笃定": "翠绿之影", "吟游者之壶": "流浪大地的乐团", + "琴师的箭羽": "流浪大地的乐团", "指挥的礼帽": "流浪大地的乐团", + "乐团的晨光": "流浪大地的乐团", + "终幕的时计": "流浪大地的乐团", + "北风之盏": "冰之川与雪之砂", + "雪藏之羽": "冰之川与雪之砂", + "冰河之冠": "冰之川与雪之砂", + "凛冬霜心": "冰之川与雪之砂", + "凝冰成砂": "冰之川与雪之砂", + "降雷的凶兆": "如雷的盛怒", + "雷灾的孑遗": "如雷的盛怒", + "唤雷的头冠": "如雷的盛怒", + "雷鸟的怜悯": "如雷的盛怒", + "雷霆的时计": "如雷的盛怒", + "魔女的心之火": "炽烈的炎之魔女", + "魔女常燃之羽": "炽烈的炎之魔女", + "焦灼的魔女帽": "炽烈的炎之魔女", + "魔女的炎之花": "炽烈的炎之魔女", + "魔女破灭之时": "炽烈的炎之魔女", + "宗室银瓮": "昔日宗室之仪", + "宗室之翎": "昔日宗室之仪", + "宗室面具": "昔日宗室之仪", + "宗室之花": "昔日宗室之仪", + "宗室时计": "昔日宗室之仪", + "染血骑士之杯": "染血的骑士道", + "染血的黑之羽": "染血的骑士道", + "染血的铁假面": "染血的骑士道", + "染血的铁之心": "染血的骑士道", + "骑士染血之时": "染血的骑士道", + "祭火礼冠": "祭火之人", + "祭水礼冠": "祭水之人", + "祭雷礼冠": "祭雷之人", + "祭风礼冠": "祭风之人", + "祭冰礼冠": "祭冰之人", + "巉岩琢塑之樽": "悠古的磐岩", + "嵯峨群峰之翼": "悠古的磐岩", + "不动玄石之相": "悠古的磐岩", + "磐陀裂生之花": "悠古的磐岩", + "星罗圭璧之晷": "悠古的磐岩", + "夏祭水玉": "逆飞的流星", + "夏祭终末": "逆飞的流星", + "夏祭之面": "逆飞的流星", + "夏祭之花": "逆飞的流星", + "夏祭之刻": "逆飞的流星", + "沉波之盏": "沉沦之心", + "追忆之风": "沉沦之心", + "酒渍船帽": "沉沦之心", + "饰金胸花": "沉沦之心", + "坚铜罗盘": "沉沦之心", + "盟誓金爵": "千岩牢固", + "昭武翎羽": "千岩牢固", + "将帅兜鍪": "千岩牢固", + "勋绩之花": "千岩牢固", + "金铜时晷": "千岩牢固", + "超越之盏": "苍白之火", + "贤医之羽": "苍白之火", + "嗤笑之面": "苍白之火", + "无垢之花": "苍白之火", + "停摆之刻": "苍白之火", + "祈望之心": "追忆之注连", + "思忆之矢": "追忆之注连", + "无常之面": "追忆之注连", + "羁缠之花": "追忆之注连", + "朝露之时": "追忆之注连", + "绯花之壶": "绝缘之旗印", + "切落之羽": "绝缘之旗印", + "华饰之兜": "绝缘之旗印", + "明威之镡": "绝缘之旗印", + "雷云之笼": "绝缘之旗印", + "梦醒之瓢": "华馆梦醒形骸记", + "华馆之羽": "华馆梦醒形骸记", + "形骸之笠": "华馆梦醒形骸记", + "荣花之期": "华馆梦醒形骸记", + "众生之谣": "华馆梦醒形骸记", + "真珠之笼": "海染砗磲", + "渊宫之羽": "海染砗磲", + "海祇之冠": "海染砗磲", + "海染之花": "海染砗磲", + "离别之贝": "海染砗磲", + "结契之刻": "辰砂往生录", + "潜光片羽": "辰砂往生录", + "虺雷之姿": "辰砂往生录", + "生灵之华": "辰砂往生录", + "阳辔之遗": "辰砂往生录", + "涌泉之盏": "来歆余响", + "垂玉之叶": "来歆余响", + "浮溯之珏": "来歆余响", + "魂香之花": "来歆余响", + "祝祀之凭": "来歆余响", "迷误者之灯": "深林的记忆", "翠蔓的智者": "深林的记忆", "月桂的宝冠": "深林的记忆", @@ -461,9 +471,9 @@ "久远花落之时": "花海甘露之光", "遗忘的容器": "逐影猎人", "杰作的序曲": "逐影猎人", - "裁判的时刻": "逐影猎人", - "猎人的胸花": "逐影猎人", "老兵的容颜": "逐影猎人", + "猎人的胸花": "逐影猎人", + "裁判的时刻": "逐影猎人", "黄金之夜的喧嚣": "黄金剧团", "黄金飞鸟的落羽": "黄金剧团", "黄金剧团的奖赏": "黄金剧团", @@ -478,7 +488,17 @@ "诚恳的蘸水笔": "回声之林夜话", "慈爱的淑女帽": "回声之林夜话", "无私的妆饰花": "回声之林夜话", - "忠实的砂时计": "回声之林夜话" + "忠实的砂时计": "回声之林夜话", + "灵露倾洒的狂诗": "谐律异想断章", + "古海玄幽的夜想": "谐律异想断章", + "异想零落的圆舞": "谐律异想断章", + "谐律交响的前奏": "谐律异想断章", + "命途轮转的谐谑": "谐律异想断章", + "筹谋的共樽": "未竟的遐思", + "褪光的翠尾": "未竟的遐思", + "失冕的宝冠": "未竟的遐思", + "暗结的明花": "未竟的遐思", + "举业的识刻": "未竟的遐思" }, "Info": { "冒险家": { diff --git a/LittlePaimon/config/data/genshin_info.json b/LittlePaimon/config/data/genshin_info.json index 2a12493..6228c1d 100644 --- a/LittlePaimon/config/data/genshin_info.json +++ b/LittlePaimon/config/data/genshin_info.json @@ -2234,6 +2234,19 @@ }, "SideIconName": "UI_AvatarIcon_Side_Chiori" }, + "10000096": { + "SkillOrder": [ + 10941, + 10942, + 10945 + ], + "Skills": { + "10941": "Skill_A_03", + "10942": "Skill_S_Arlecchino_01", + "10945": "Skill_E_Arlecchino_01" + }, + "SideIconName": "UI_AvatarIcon_Side_Arlecchino" + }, "10000005-501": { "Element": "None", "Consts": [ diff --git a/LittlePaimon/config/data/role_skill.json b/LittlePaimon/config/data/role_skill.json index acbbb0e..e6d4b95 100644 --- a/LittlePaimon/config/data/role_skill.json +++ b/LittlePaimon/config/data/role_skill.json @@ -378,6 +378,12 @@ "10942": "羽袖一触", "10944": "千织二段E后-技能替换", "10945": "二刀之形·比翼", + "10961": "普通攻击·斩首之邀", + "10962": "万相化灰", + "10963": "元素战技替换技能", + "10965": "厄月将升", + "10966": "阿蕾奇诺重击远距离索敌", + "10967": "阿蕾奇诺抵死回血", "11301": "菲谢尔普攻", "11302": "菲谢尔小技能", "11305": "菲谢尔充能技", @@ -438,11 +444,14 @@ "20066": "提线木偶-左右连打（白盒）", "20067": "4.2 陆地章鱼-喷射能力", "20070": "探查技能", + "20076": "4.6鲸鱼钩爪", "20077": "4.4海灯节-变身技能-金币关", "20080": "探查技能", + "20081": "4.6音乐机制", "20082": "4.2水下弹射", "20083": "4.4海灯节-变身技能-积分关", "20084": "4.4海灯节-变身技能-生存关", + "20086": "4.6音乐机制水下", "20093": "4.5史莱姆球-元素弹", "20094": "4.5史莱姆球-物理连射", "20100": "捕获！", @@ -480,6 +489,7 @@ "20341": "3.4跑酷冲刺", "20342": "3.4跑酷冲刺空中", "20345": "3.5吃豆人", + "20346": "4.6鲸鱼钩爪退出", "20350": "3.8过山车-左攻击", "20351": "3.8过山车-右攻击", "20352": "3.8过山车-跃迁", @@ -514,6 +524,14 @@ "20529": "鱼跃弹出", "20530": "螭神像发子弹", "20531": "螭神像弹出", + "20532": "捕影信标", + "20533": "无形追迹", + "20534": "伪装", + "20535": "伪装", + "20538": "禁锢诅咒", + "20539": "捕获！", + "20540": "捕获！", + "20541": "神秘预感", "20561": "鱼跃T地面", "20562": "鱼跃T空中", "100540": "普通攻击·故去的追忆", @@ -626,7 +644,8 @@ "5091010": "娜维娅空中攻击", "5092010": "嘉明空中攻击", "5093010": "闲云空中攻击", - "5094010": "千织空中攻击" + "5094010": "千织空中攻击", + "5096010": "阿蕾奇诺空中攻击" }, "Icon": { "10001": "", @@ -1007,6 +1026,12 @@ "10942": "Skill_S_Chiori_01", "10944": "Skill_S_Chiori_03", "10945": "Skill_E_Chiori_01", + "10961": "Skill_A_03", + "10962": "Skill_S_Arlecchino_01", + "10963": "Skill_S_Arlecchino_01", + "10965": "Skill_E_Arlecchino_01", + "10966": "Skill_A_03", + "10967": "Skill_A_03", "11301": "Skill_A_02", "11302": "Skill_S_Ambor_01", "11305": "Skill_E_Beidou_01", @@ -1067,11 +1092,14 @@ "20066": "Btn_HideAndSeek_Seeker_S_01", "20067": "Skill_Diving_Octopus", "20070": "QuesteventSkillIcon_01", + "20076": "", "20077": "Skill_LanV4PartyLion_01", "20080": "QuesteventSkillIcon_01", + "20081": "Skill_Music", "20082": "", "20083": "Skill_LanV4PartyLion_01", "20084": "Skill_LanV4PartyLion_01", + "20086": "Skill_Music", "20093": "Btn_SlimeCannon_Fire_01", "20094": "Btn_SlimeCannon_Fire_04", "20100": "Btn_HideAndSeek_Seeker_A_01", @@ -1109,6 +1137,7 @@ "20341": "Skill_LanV3_Icon05", "20342": "Skill_LanV3_Icon05", "20345": "Btn_PacMan", + "20346": "Btn_Whale_Interrupt", "20350": "Skill_E_Klee_01", "20351": "Skill_E_Klee_01", "20352": "Btn_Fishing_Bait", @@ -1143,6 +1172,14 @@ "20529": "Btn_Fishing_Exit", "20530": "Skill_CarpJump_01", "20531": "Btn_Fishing_Exit", + "20532": "Btn_HideAndSeekV4_Seeker_A_03", + "20533": "Btn_HideAndSeekV4_Seeker_E_03", + "20534": "Btn_HideAndSeekV4_Hider_S", + "20535": "Btn_HideAndSeekV4_Hider_S", + "20538": "Btn_HideAndSeekV4_Seeker_E_01", + "20539": "Btn_HideAndSeekV4_Seeker_S", + "20540": "Btn_HideAndSeekV4_Seeker_S", + "20541": "Btn_HideAndSeekV4_Seeker_A_01", "20561": "", "20562": "", "100540": "Skill_A_01", @@ -1255,6 +1292,7 @@ "5091010": "Skill_A_04", "5092010": "Skill_A_04", "5093010": "Skill_A_Catalyst_MD", - "5094010": "Skill_A_01" + "5094010": "Skill_A_01", + "5096010": "Skill_A_03" } -} \ No newline at end of file +} diff --git a/LittlePaimon/config/data/role_talent.json b/LittlePaimon/config/data/role_talent.json index b447e93..9d87497 100644 --- a/LittlePaimon/config/data/role_talent.json +++ b/LittlePaimon/config/data/role_talent.json @@ -503,7 +503,13 @@ "943": "缀锦四分", "944": "衣裁三礼", "945": "绫羽二重", - "946": "万理一空" + "946": "万理一空", + "961": "「所有的仇与债皆由我偿…」", + "962": "「所有的赏与罚皆自我出…」", + "963": "「你将成为我们新的家人…」", + "964": "「此后，你们须相爱相护…」", + "965": "「我们已孑然一身，与死无异…」", + "966": "「自此以后，我们将共飨新生。」" }, "Icon": { "21": "UI_Talent_S_Ayaka_01", @@ -1009,6 +1015,12 @@ "943": "UI_Talent_U_Chiori_01", "944": "UI_Talent_S_Chiori_02", "945": "UI_Talent_U_Chiori_02", - "946": "UI_Talent_S_Chiori_04" + "946": "UI_Talent_S_Chiori_04", + "961": "UI_Talent_S_Arlecchino_01", + "962": "UI_Talent_S_Arlecchino_02", + "963": "UI_Talent_U_Arlecchino_01", + "964": "UI_Talent_S_Arlecchino_03", + "965": "UI_Talent_U_Arlecchino_02", + "966": "UI_Talent_S_Arlecchino_04" } -} \ No newline at end of file +} diff --git a/LittlePaimon/config/data/roles_data.json b/LittlePaimon/config/data/roles_data.json index 60c10e4..8ce1d9b 100644 --- a/LittlePaimon/config/data/roles_data.json +++ b/LittlePaimon/config/data/roles_data.json @@ -31679,5 +31679,10 @@ "region": "枫丹", "star": 5, "element": "岩" + }, + "阿蕾奇诺": { + "region": "枫丹", + "star": 5, + "element": "火" } } \ No newline at end of file diff --git a/LittlePaimon/config/data/score.json b/LittlePaimon/config/data/score.json index e62880a..249d7a1 100644 --- a/LittlePaimon/config/data/score.json +++ b/LittlePaimon/config/data/score.json @@ -1095,6 +1095,10 @@ "千织": [ 0, 1 + ], + "阿蕾奇诺": [ + 0, + 2 ] } } \ No newline at end of file diff --git a/LittlePaimon/config/data/weapon.json b/LittlePaimon/config/data/weapon.json index 476f46d..ffd4828 100644 --- a/LittlePaimon/config/data/weapon.json +++ b/LittlePaimon/config/data/weapon.json @@ -1,201 +1,202 @@ { "Name": { - "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": "东花坊时雨", - "2265792579": "狼牙", - "800766043": "海渊终曲", - "1921306659": "灰河渡手", - "1790067483": "船坞长剑", - "3016493955": "水仙十字之剑", - "594850707": "水仙十字之剑", - "902264035": "风鹰剑", - "4055003299": "天空之刃", - "2949448555": "苍古自由之誓", - "944332883": "斫峰之刃", - "1345343763": "磐岩结绿", - "4124851547": "雾切之回光", - "1600275315": "波乱月白经津", - "454086795": "圣显之钥", - "275622963": "裁叶萃光", - "1473399443": "静水流涌之辉", - "1818340435": "有乐御簾切", - "2666951267": "训练大剑", - "1182966603": "佣兵重剑", - "1479961579": "铁影阔剑", - "4090429643": "沐浴龙血的剑", - "850802171": "白铁大剑", - "1516554699": "石英大剑", - "3097441915": "以理服人", - "2614170427": "飞天大御剑", - "735056795": "西风大剑", - "930640955": "钟剑", - "1675686363": "祭礼大剑", - "877751435": "宗室大剑", - "3684723963": "雨裁", - "3722933411": "试作古华", - "680510411": "白影剑", "20848859": "黑岩斩刀", - "1437658243": "螭骨剑", - "2006422931": "千岩古剑", - "2753539619": "雪葬的星银", - "346510395": "衔珠海皇", - "4193089947": "桂木斩长正", - "3073454867": "玛海菈的水色", - "2359799475": "恶王丸", - "902184579": "森林王器", - "1200948859": "饰铁之花", - "3459616011": "聊聊棒", - "2077869763": "浪影阔剑", - "933442195": "「究极霸王超级魔剑」", - "3693117451": "便携动力锯", - "1089950259": "天空之傲", - "3995710363": "狼的末路", - "1075647299": "松籁响起之时", - "2792766467": "无工之剑", - "3914951691": "赤角石溃杵", - "2834063555": "苇海信标", - "3812523339": "裁断", - "2796697027": "新手长枪", - "3070169307": "铁尖枪", - "1390797107": "白缨枪", - "618786571": "钺矛", - "4103766499": "黑缨枪", - "500612819": "「旗杆」", - "2664629131": "匣里灭辰", - "1154009435": "试作星镰", - "578575283": "流月针", - "481755219": "黑岩刺枪", - "4049410651": "决斗之枪", - "716252627": "千岩长枪", - "3755004051": "西风长枪", - "2935286715": "宗室猎枪", - "3443142923": "龙脊长枪", - "2491797315": "喜多院十文字", - "1148024603": "「渔获」", - "4122509083": "断浪长鳍", - "452357939": "贯月矢", - "1470442731": "风信之锋", - "449192923": "峡湾长歌", - "4158971171": "公义的酬报", - "882305891": "勘探钻机", - "3235324891": "护摩之杖", - "4158505619": "天空之脊", - "197755235": "贯虹之槊", - "1997709467": "和璞鸢", - "688991243": "息灾", - "3717849275": "薙草之稻光", - "4238339131": "赤沙之杖", - "2847771107": "沙中伟贤的对答", - "3584825427": "学徒笔记", - "2705029563": "口袋魔导书", - "2279290283": "魔导绪论", - "3500935003": "讨龙英杰谭", - "1406746947": "异世界行记", - "2963220587": "翡玉法球", - "3719372715": "甲级宝珏", - "302691299": "琥珀玥", - "623534363": "西风秘典", - "1163263227": "流浪乐章", - "2195665683": "祭礼残章", - "3827789435": "宗室秘法录", "37147251": "匣里日月", - "2521338131": "试作金珀", - "1072884907": "万国诸海图谱", - "3273999011": "黑岩绯玉", - "3156385731": "昭心", - "3090373787": "暗巷的酒与诗", - "2587614459": "忍冬之果", - "3456986819": "嘟嘟可故事集", - "2324146259": "白辰之环", - "2539208459": "证誓之明瞳", + "143051931": "西福斯的月光", + "160493219": "暗铁剑", + "197755235": "贯虹之槊", + "275622963": "裁叶萃光", + "302691299": "琥珀玥", + "310247243": "神乐之真意", + "313300315": "原木刀", + "316078811": "鹮穿之喙", + "342097547": "辰砂之纺锤", + "346510395": "衔珠海皇", + "359484419": "图莱杜拉的回忆", + "411685275": "钢轮弓", "426363739": "流浪的晚星", + "449192923": "峡湾长歌", + "452357939": "贯月矢", + "454086795": "圣显之钥", + "479076483": "冷刃", + "481755219": "黑岩刺枪", + "500612819": "「旗杆」", + "500987603": "(test)穿模测试", + "540938627": "掠食者", + "578575283": "流月针", + "594850707": "水仙十字之剑", + "618786571": "钺矛", + "623534363": "西风秘典", + "650049651": "风花之颂", + "656120259": "神射手之誓", + "680510411": "白影剑", + "688991243": "息灾", + "693354267": "尘世之锁", + "716252627": "千岩长枪", + "724881171": "金流监督", + "735056795": "西风大剑", + "800766043": "海渊终曲", + "807607555": "天空之卷", + "828711395": "阿莫斯之弓", + "850802171": "白铁大剑", + "877751435": "宗室大剑", + "882305891": "勘探钻机", + "902184579": "森林王器", + "902264035": "风鹰剑", + "930640955": "钟剑", + "933442195": "「究极霸王超级魔剑」", + "944332883": "斫峰之刃", + "1012170803": "笼钓瓶一心", + "1021898539": "弹弓", + "1055195035": "测距规", + "1072884907": "万国诸海图谱", + "1075647299": "松籁响起之时", + "1089950259": "天空之傲", + "1148024603": "「渔获」", + "1154009435": "试作星镰", + "1163263227": "流浪乐章", + "1182966603": "佣兵重剑", + "1200948859": "饰铁之花", + "1201790667": "千夜浮梦", + "1240067179": "西风猎弓", + "1321135667": "匣里龙吟", + "1345343763": "磐岩结绿", + "1348687251": "猎人之径", + "1388004931": "飞天御剑", + "1390797107": "白缨枪", + "1406746947": "异世界行记", + "1437658243": "螭骨剑", + "1455107995": "四风原典", + "1470442731": "风信之锋", + "1473399443": "静水流涌之辉", + "1479961579": "铁影阔剑", + "1499745907": "「一心传」名刀", + "1516554699": "石英大剑", + "1538092267": "「一心传」名刀", + "1595734083": "(test)穿模测试", + "1600275315": "波乱月白经津", + "1608953539": "黎明神剑", + "1675686363": "祭礼大剑", + "1773425155": "降临之剑", + "1790067483": "船坞长剑", + "1818340435": "有乐御簾切", + "1860795787": "曚云之月", + "1890163363": "不灭月华", + "1901973075": "冬极白星", + "1921306659": "灰河渡手", + "1990641987": "祭礼剑", + "1990820123": "天目影打刀", + "1991707099": "试作斩岩", + "1997709467": "和璞鸢", + "2006422931": "千岩古剑", + "2009975571": "(test)穿模测试", + "2077869763": "浪影阔剑", + "2125206395": "银剑", + "2195665683": "祭礼残章", + "2242027395": "黑檀弓", + "2265792579": "狼牙", "2267978875": "盈满之实", "2275710883": "遗祀玉珑", - "2432865507": "纯水流华", - "2722902043": "无垠蔚蓝之歌", - "807607555": "天空之卷", - "1455107995": "四风原典", - "693354267": "尘世之锁", - "4007372867": "碧落之珑", - "1890163363": "不灭月华", - "310247243": "神乐之真意", - "1201790667": "千夜浮梦", - "359484419": "图莱杜拉的回忆", - "724881171": "金流监督", - "4176923379": "万世流涌大典", - "3660626387": "鹤鸣余音", - "3600623979": "猎弓", + "2279290283": "魔导绪论", + "2324146259": "白辰之环", "2340970067": "历练的猎弓", - "3975746731": "鸦羽弓", - "656120259": "神射手之誓", - "4267718859": "反曲弓", - "1021898539": "弹弓", - "4139294531": "信使", - "2242027395": "黑檀弓", - "1240067179": "西风猎弓", - "2556914683": "绝弦", + "2359799475": "恶王丸", + "2375993851": "宗室长剑", "2400012995": "祭礼弓", - "2832648187": "宗室长弓", - "3169209451": "弓藏", - "3625393819": "试作澹月", - "411685275": "钢轮弓", - "3447737235": "黑岩战弓", - "3439749859": "苍翠猎弓", + "2410593283": "无锋剑", "2417717595": "暗巷猎手", "2425414923": "落霞", - "3949653579": "幽夜华尔兹", - "650049651": "风花之颂", - "4186179883": "破魔之弓", - "540938627": "掠食者", - "1860795787": "曚云之月", - "3176599083": "王下近侍", - "3063191787": "竭泽", - "316078811": "鹮穿之喙", - "2958179435": "烈阳之嗣", + "2432865507": "纯水流华", + "2448629019": "东花坊时雨", + "2474354867": "西风剑", + "2491797315": "喜多院十文字", + "2521338131": "试作金珀", + "2539208459": "证誓之明瞳", + "2556914683": "绝弦", + "2587614459": "忍冬之果", "2600875323": "静谧之曲", - "1055195035": "测距规", - "3933622347": "天空之翼", - "828711395": "阿莫斯之弓", - "3112679155": "终末嗟叹之诗", - "1901973075": "冬极白星", - "4230231107": "若水", - "2918525947": "飞雷之弦振", - "1348687251": "猎人之径", - "2988480723": "最初的大魔术", - "4137694339": "(test)竿测试", + "2614170427": "飞天大御剑", + "2664629131": "匣里灭辰", + "2666951267": "训练大剑", + "2705029563": "口袋魔导书", "2719832059": "(test)穿模测试", - "500987603": "(test)穿模测试", - "1595734083": "(test)穿模测试", - "2009975571": "(test)穿模测试", + "2722902043": "无垠蔚蓝之歌", + "2749853923": "腐殖之剑", + "2753539619": "雪葬的星银", + "2792766467": "无工之剑", + "2796697027": "新手长枪", + "2832648187": "宗室长弓", + "2834063555": "苇海信标", + "2847771107": "沙中伟贤的对答", + "2918525947": "飞雷之弦振", + "2935286715": "宗室猎枪", + "2944936683": "赤月之形", + "2947140987": "暗巷闪光", + "2949448555": "苍古自由之誓", + "2958179435": "烈阳之嗣", + "2963220587": "翡玉法球", + "2988480723": "最初的大魔术", + "3016493955": "水仙十字之剑", + "3063191787": "竭泽", + "3070169307": "铁尖枪", + "3073454867": "玛海菈的水色", + "3090373787": "暗巷的酒与诗", + "3097441915": "以理服人", + "3112679155": "终末嗟叹之诗", + "3156385731": "昭心", + "3169209451": "弓藏", + "3176599083": "王下近侍", + "3235324891": "护摩之杖", + "3273999011": "黑岩绯玉", + "3378007475": "黑岩长剑", + "3421967235": "吃虎鱼刀", + "3439749859": "苍翠猎弓", + "3443142923": "龙脊长枪", + "3447737235": "黑岩战弓", + "3456986819": "嘟嘟可故事集", + "3459616011": "聊聊棒", + "3464027035": "「一心传」名刀", + "3500935003": "讨龙英杰谭", + "3584825427": "学徒笔记", + "3587621259": "笛剑", + "3600623979": "猎弓", + "3625393819": "试作澹月", + "3660626387": "鹤鸣余音", + "3673792067": "旅行剑", + "3684723963": "雨裁", + "3693117451": "便携动力锯", + "3717849275": "薙草之稻光", + "3719372715": "甲级宝珏", + "3722933411": "试作古华", + "3755004051": "西风长枪", + "3762437019": "(test)穿模测试", + "3796905611": "黑剑", + "3812523339": "裁断", + "3827789435": "宗室秘法录", + "3914951691": "赤角石溃杵", + "3933622347": "天空之翼", + "3949653579": "幽夜华尔兹", + "3975746731": "鸦羽弓", + "3995710363": "狼的末路", + "4007372867": "碧落之珑", + "4049410651": "决斗之枪", + "4055003299": "天空之刃", + "4090429643": "沐浴龙血的剑", + "4103022435": "铁蜂刺", + "4103766499": "黑缨枪", + "4122509083": "断浪长鳍", + "4124851547": "雾切之回光", + "4137694339": "(test)竿测试", + "4139294531": "信使", + "4158505619": "天空之脊", + "4158971171": "公义的酬报", "4162981171": "(test)穿模测试", - "3762437019": "(test)穿模测试" + "4176923379": "万世流涌大典", + "4186179883": "破魔之弓", + "4193089947": "桂木斩长正", + "4230231107": "若水", + "4238339131": "赤沙之杖", + "4267718859": "反曲弓" }, "Type": { "无锋剑": "单手剑", @@ -308,6 +309,7 @@ "薙草之稻光": "长柄武器", "赤沙之杖": "长柄武器", "沙中伟贤的对答": "长柄武器", + "赤月之形": "长柄武器", "学徒笔记": "法器", "口袋魔导书": "法器", "魔导绪论": "法器", @@ -496,6 +498,7 @@ "息灾": "UI_EquipIcon_Pole_Santika", "薙草之稻光": "UI_EquipIcon_Pole_Narukami", "赤沙之杖": "UI_EquipIcon_Pole_Deshret", + "赤月之形": "UI_EquipIcon_Pole_BloodMoon", "学徒笔记": "UI_EquipIcon_Catalyst_Apprentice", "口袋魔导书": "UI_EquipIcon_Catalyst_Pocket", "魔导绪论": "UI_EquipIcon_Catalyst_Intro", diff --git a/LittlePaimon/config/data/类型.json b/LittlePaimon/config/data/类型.json index dc0a3de..dc7b0b6 100644 --- a/LittlePaimon/config/data/类型.json +++ b/LittlePaimon/config/data/类型.json @@ -89,7 +89,8 @@ "坎蒂丝", "瑶瑶", "米卡", - "夏沃蕾" + "夏沃蕾", + "阿蕾奇诺" ] }, "元素类型": { diff --git a/LittlePaimon/plugins/Paimon_Gacha_Log/__init__.py b/LittlePaimon/plugins/Paimon_Gacha_Log/__init__.py index 21d755a..7581f7c 100644 --- a/LittlePaimon/plugins/Paimon_Gacha_Log/__init__.py +++ b/LittlePaimon/plugins/Paimon_Gacha_Log/__init__.py @@ -18,6 +18,7 @@ from LittlePaimon.utils.api import get_authkey_by_stoken from LittlePaimon.utils.message import CommandPlayer, CommandUID from .data_source import ( + GACHA_LOG_API, create_import_command, gacha_log_to_UIGF, get_gacha_log_data, @@ -182,16 +183,16 @@ async def _(bot: Bot, event: MessageEvent, uid: str = CommandUID()): authkey, state, _ = await get_authkey_by_stoken(str(event.user_id), uid) if not state: return authkey - if authkey == {}: + if not authkey: await gacha_url.finish(authkey, at_sender=True) region = "cn_qd01" if uid[0] == "5" else "cn_gf01" url = ( - f"https://hk4e-api.mihoyo.com/event/gacha_info/api/getGachaLog?" + f"{GACHA_LOG_API}?" f"authkey_ver=1&sign_type=2&auth_appid=webview_gacha&init_type=301&" f"gacha_id=fecafa7b6560db5f3182222395d88aaa6aaac1bc" f"×tamp={int(time.time())}" f"&lang=zh-cn&device_type=mobile&plat_type=ios®ion={region}" - f"&authkey={quote(authkey,'utf-8')}" + f"&authkey={quote(authkey,encoding='utf-8')}" f"&game_biz=hk4e_cn&gacha_type=301&page=1&size=5&end_id=0" ) msgs = [ diff --git a/LittlePaimon/plugins/Paimon_Gacha_Log/data_source.py b/LittlePaimon/plugins/Paimon_Gacha_Log/data_source.py index 5bd3a47..9d40450 100644 --- a/LittlePaimon/plugins/Paimon_Gacha_Log/data_source.py +++ b/LittlePaimon/plugins/Paimon_Gacha_Log/data_source.py @@ -17,7 +17,7 @@ from LittlePaimon.utils.path import GACHA_LOG from .draw import draw_gacha_log from .models import GachaItem, GachaLogInfo, GACHA_TYPE_LIST -GACHA_LOG_API = 'https://hk4e-api.mihoyo.com/event/gacha_info/api/getGachaLog' +GACHA_LOG_API = 'https://public-operation-hk4e.mihoyo.com/gacha_info/api/getGachaLog' HEADERS: Dict[str, str] = { 'x-rpc-app_version': '2.11.1', 'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (' diff --git a/LittlePaimon/utils/api.py b/LittlePaimon/utils/api.py index fa4e723..012f39a 100644 --- a/LittlePaimon/utils/api.py +++ b/LittlePaimon/utils/api.py @@ -106,9 +106,9 @@ def get_old_version_ds(mhy_bbs: bool = False) -> str: 生成米游社旧版本headers的ds_token """ if mhy_bbs: - s = 'N50pqm7FSy2AkFz2B3TqtuZMJ5TOl3Ep' + s = "1OJyMNCqFlstEQqqMOv0rKCIdTOoJhNt" else: - s = 'z8DRIUjNDT7IT5IZXvrUAxyupA1peND9' + s = "AcpNVhfh0oedCobdCyFV8EE1jMOVDy9q" t = str(int(time.time())) r = ''.join(random.sample(string.ascii_lowercase + string.digits, 6)) c = md5(f"salt={s}&t={t}&r={r}") @@ -465,18 +465,18 @@ async def get_authkey_by_stoken( if not cookie_info.stoken: return 'cookie中没有stoken字段，请重新绑定', False, cookie_info headers = { - 'Cookie': cookie_info.stoken, - 'DS': get_old_version_ds(True), - 'User-Agent': 'okhttp/4.8.0', - 'x-rpc-app_version': '2.35.2', - 'x-rpc-sys_version': '12', - 'x-rpc-client_type': '5', - 'x-rpc-channel': 'mihoyo', - 'x-rpc-device_id': random_hex(32), - 'x-rpc-device_name': random_text(random.randint(1, 10)), - 'x-rpc-device_model': 'Mi 10', - 'Referer': 'https://app.mihoyo.com', - 'Host': 'api-takumi.mihoyo.com', + "Cookie": cookie_info.stoken, + "DS": get_old_version_ds(True), + "User-Agent": "okhttp/4.8.0", + "x-rpc-app_version": "2.60.1", + "x-rpc-sys_version": "12", + "x-rpc-client_type": "5", + "x-rpc-channel": "mihoyo", + "x-rpc-device_id": random_hex(32), + "x-rpc-device_name": random_text(random.randint(1, 10)), + "x-rpc-device_model": "Mi 10", + "Referer": "https://app.mihoyo.com", + "Host": "api-takumi.mihoyo.com", } data = await aiorequests.post( url=AUTHKEY_API, diff --git a/README.md b/README.md index a3cf21b..0a1682c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ ## 丨文档 -因某些原因，文档地址暂时无法访问，请静待后续更新... +> [文档地址](docs.paimon.cherishmoon.top) ## | 功能示例
@@ -71,7 +71,7 @@ ## | 常见问题&致谢 -详见[常见问题](https://docs.paimon.cherishmoon.fun/question.html)和[致谢](https://docs.paimon.cherishmoon.fun/thanks.html)。 +详见[常见问题](https://docs.paimon.cherishmoon.top/question.html)和[致谢](https://docs.paimon.cherishmoon.top/thanks.html)。 ## | 其他