Merge branch 'CMHopeSunshine:Bot' into Bot

LittlePaimon/config/data/alias.json

@@ -167,7 +167,8 @@
     "10000099": ["艾梅莉埃", "调香师", "艾梅"],
     "10000100": ["卡齐娜"],
     "10000101": ["基尼奇", "像素龙"],
-    "10000102": ["玛拉妮", "纳塔鲨", "娜塔莎"]
+    "10000102": ["玛拉妮", "纳塔鲨", "娜塔莎"],
+    "10000103": ["希诺宁", "岩猫", "岩猫猫", "豹女"]
   },
   "武器": {
     "柔灯挽歌": ["柔灯挽歌", "柔灯", "艾梅莉埃专武", "艾梅专武"],
@@ -383,7 +384,11 @@
     "苍纹角杯": ["苍纹角杯", "苍纹", "角杯"],
     "木棉之环": ["木棉之环", "木棉"],
     "冲浪时光": ["冲浪时光", "冲浪", "玛拉妮专武"],
-    "碎链": ["碎链"]
+    "碎链": ["碎链"],
+    "镇山之钉": ["镇山之钉", "钉子"],
+    "硕果钩": ["硕果钩", "钩子"],
+    "弥坚骨": ["弥坚骨"],
+    "岩峰巡歌": ["岩峰巡歌", "希诺宁专武"]
   },
   "圣遗物": {
     "游医": ["游医"],

LittlePaimon/config/data/genshin_info.json

@@ -2672,6 +2672,64 @@
     "SideIconName": "UI_AvatarIcon_Side_Mualani",
     "QualityType": "QUALITY_ORANGE"
   },
+  "10000103": {
+    "Element": "Rock",
+    "Consts": [
+      "UI_Talent_S_Xilonen_01",
+      "UI_Talent_S_Xilonen_02",
+      "UI_Talent_U_Xilonen_01",
+      "UI_Talent_S_Xilonen_03",
+      "UI_Talent_U_Xilonen_02",
+      "UI_Talent_S_Xilonen_04"
+    ],
+    "SkillOrder": [
+      11031,
+      11032,
+      11035
+    ],
+    "Skills": {
+      "11031": "Skill_A_01",
+      "11032": "Skill_S_Xilonen_01",
+      "11035": "Skill_E_Xilonen_01"
+    },
+    "ProudMap": {
+      "11031": 10331,
+      "11032": 10332,
+      "11035": 10339
+    },
+    "NameTextMapHash": 2515292882,
+    "SideIconName": "UI_AvatarIcon_Side_Xilonen",
+    "QualityType": "QUALITY_ORANGE"
+  },
+  "10000901": {
+    "Element": "Fire",
+    "Consts": [
+      "UI_Talent_S_Xiangling_01",
+      "UI_Talent_S_Xiangling_02",
+      "UI_Talent_U_Xiangling_02",
+      "UI_Talent_S_Xiangling_03",
+      "UI_Talent_U_Xiangling_01",
+      "UI_Talent_S_Xiangling_04"
+    ],
+    "SkillOrder": [
+      10231,
+      10232,
+      10235
+    ],
+    "Skills": {
+      "10231": "Skill_A_03",
+      "10232": "Skill_S_Xiangling_01",
+      "10235": "Skill_E_Xiangling_01"
+    },
+    "ProudMap": {
+      "10231": 2331,
+      "10232": 2332,
+      "10235": 2339
+    },
+    "NameTextMapHash": 3293134650,
+    "SideIconName": "UI_AvatarIcon_Side_Mavuika",
+    "QualityType": "QUALITY_ORANGE"
+  },
   "11000046": {
     "Element": "Ice",
     "Consts": [

LittlePaimon/config/data/role_skill.json

@@ -425,6 +425,13 @@
     "11015": "向伟大圣龙致意",
     "11018": "基尼奇吞噬或者钩锚点",
     "11019": "基尼奇空中喷射",
+    "11031": "普通攻击·锐锋攫猎",
+    "11032": "音火锻淬",
+    "11033": "希诺宁-占位",
+    "11034": "希诺宁-占位",
+    "11035": "豹烈律动！",
+    "11036": "希诺宁-元素战技-退夜魂态",
+    "11037": "希诺宁-夜魂接力技",
     "30000": "普通攻击·降温处理",
     "30002": "踏鲨破浪",
     "30003": "游猎S冲浪攻击技",
@@ -441,12 +448,12 @@
     "30103": "猎龙少年-猎龙状态-特殊普攻",
     "30104": "猎龙少年-猎龙状态-特殊战技",
     "30105": "猎龙少年-元素爆发",
-    "30201": "铭刻师-普通攻击",
+    "30201": "测试占位",
-    "30202": "铭刻师-元素战技-进豹灵状态",
+    "30202": "测试占位",
-    "30203": "铭刻师-豹灵状态-特殊普攻",
+    "30203": "测试占位",
-    "30204": "铭刻师-豹灵状态-特殊冲刺",
+    "30204": "测试占位",
-    "30205": "铭刻师-元素爆发",
+    "30205": "测试占位",
-    "30206": "铭刻师-元素战技-退豹灵状态",
+    "30206": "测试占位",
     "20001": "风魔炮",
     "20002": "风魔炮",
     "20011": "飞行挑战 - 前冲",
@@ -582,6 +589,7 @@
     "20541": "神秘预感",
     "20561": "鱼跃T地面",
     "20562": "鱼跃T空中",
+    "20580": "捕获！",
     "20310": "进入钓鱼选竿状态",
     "20311": "进入钓鱼瞄准状态",
     "20312": "QTE启动按键",
@@ -729,7 +737,8 @@
     "5099010": "艾梅莉埃空中攻击",
     "5100010": "卡齐娜空中攻击",
     "5101010": "基尼奇空中攻击",
-    "5102010": "玛拉妮空中攻击"
+    "5102010": "玛拉妮空中攻击",
+    "5103010": "希诺宁空中攻击"
   },
   "Icon": {
     "10001": "",
@@ -1157,6 +1166,13 @@
     "11015": "Skill_E_Kinich_01",
     "11018": "Skill_S_Kinich_05",
     "11019": "Skill_S_Kinich_07",
+    "11031": "Skill_A_01",
+    "11032": "Skill_S_Xilonen_01",
+    "11033": "",
+    "11034": "",
+    "11035": "Skill_E_Xilonen_01",
+    "11036": "Skill_S_Xilonen_02",
+    "11037": "Skill_S_Xilonen_01",
     "30000": "Skill_A_Catalyst_MD",
     "30002": "Skill_S_Mualani_01",
     "30003": "Skill_S_Mualani_02",
@@ -1314,6 +1330,7 @@
     "20541": "Btn_HideAndSeekV4_Seeker_A_01",
     "20561": "",
     "20562": "",
+    "20580": "Skill_A_DreamExplore",
     "20310": "",
     "20311": "Btn_Fishing_Cast",
     "20312": "Btn_Fishing_Battle",
@@ -1461,6 +1478,7 @@
     "5099010": "Skill_A_03",
     "5100010": "Skill_A_03",
     "5101010": "Skill_A_04",
-    "5102010": "Skill_A_Catalyst_MD"
+    "5102010": "Skill_A_Catalyst_MD",
+    "5103010": "Skill_A_01"
   }
 }

LittlePaimon/config/data/role_talent.json

@@ -551,7 +551,13 @@
     "1023": "在欢乐海上冲浪",
     "1024": "鲨鲨主食是豚豚。",
     "1025": "同款冲浪板有售！",
-    "1026": "「流泉之众」的精神"
+    "1026": "「流泉之众」的精神",
+    "1031": "献予慵眠的休假日",
+    "1032": "献予灼原的五重奏",
+    "1033": "献予日炎的巡行式",
+    "1034": "献予午后的花之梦",
+    "1035": "献予夕暮的转格调",
+    "1036": "献予永夜的狂欢舞"
   },
   "Icon": {
     "21": "UI_Talent_S_Ayaka_01",
@@ -1105,6 +1111,12 @@
     "1023": "UI_Talent_U_Mualani_01",
     "1024": "UI_Talent_S_Mualani_03",
     "1025": "UI_Talent_U_Mualani_02",
-    "1026": "UI_Talent_S_Mualani_04"
+    "1026": "UI_Talent_S_Mualani_04",
+    "1031": "UI_Talent_S_Xilonen_01",
+    "1032": "UI_Talent_S_Xilonen_02",
+    "1033": "UI_Talent_U_Xilonen_01",
+    "1034": "UI_Talent_S_Xilonen_03",
+    "1035": "UI_Talent_U_Xilonen_02",
+    "1036": "UI_Talent_S_Xilonen_04"
   }
 }

LittlePaimon/config/data/roles_data.json

@@ -31509,5 +31509,10 @@
     "region": "纳塔",
     "star": 5,
     "element": "水"
+  },
+  "希诺宁": {
+    "region": "纳塔",
+    "star": 5,
+    "element": "岩"
   }
 }

LittlePaimon/config/data/score.json

@@ -851,6 +851,7 @@
     "艾梅莉埃": [1, 2],
     "玛拉妮": [1, 2],
     "卡齐娜": [1, 2],
-    "基尼奇": [1, 2]
+    "基尼奇": [1, 2],
+    "希诺宁": [1, 2]
   }
 }

LittlePaimon/config/data/weapon.json

@@ -35,6 +35,7 @@
     "1790067483": "船坞长剑",
     "3016493955": "水仙十字之剑",
     "594850707": "水仙十字之剑",
+    "495182275": "弥坚骨",
     "3434743027": "息燧之笛",
     "902264035": "风鹰剑",
     "4055003299": "天空之刃",
@@ -48,6 +49,7 @@
     "1473399443": "静水流涌之辉",
     "1818340435": "有乐御簾切",
     "1009471939": "赦罪",
+    "3432339555": "岩峰巡歌",
     "2666951267": "训练大剑",
     "1182966603": "佣兵重剑",
     "1479961579": "铁影阔剑",
@@ -77,6 +79,7 @@
     "2077869763": "浪影阔剑",
     "933442195": "「究极霸王超级魔剑」",
     "3693117451": "便携动力锯",
+    "688237043": "硕果钩",
     "2481464075": "撼地者",
     "1089950259": "天空之傲",
     "3995710363": "狼的末路",
@@ -110,6 +113,7 @@
     "4158971171": "公义的酬报",
     "2847771107": "沙中伟贤的对答",
     "882305891": "勘探钻机",
+    "1965515667": "镇山之钉",
     "415520051": "虹的行迹",
     "3235324891": "护摩之杖",
     "4158505619": "天空之脊",
@@ -243,6 +247,7 @@
     "灰河渡手": "单手剑",
     "船坞长剑": "单手剑",
     "水仙十字之剑": "单手剑",
+    "弥坚骨": "单手剑",
     "息燧之笛": "单手剑",
     "风鹰剑": "单手剑",
     "天空之刃": "单手剑",
@@ -256,6 +261,7 @@
     "静水流涌之辉": "单手剑",
     "有乐御簾切": "单手剑",
     "赦罪": "单手剑",
+    "岩峰巡歌": "单手剑",
     "训练大剑": "双手剑",
     "佣兵重剑": "双手剑",
     "铁影阔剑": "双手剑",
@@ -285,6 +291,7 @@
     "浪影阔剑": "双手剑",
     "「究极霸王超级魔剑」": "双手剑",
     "便携动力锯": "双手剑",
+    "硕果钩": "双手剑",
     "撼地者": "双手剑",
     "天空之傲": "双手剑",
     "狼的末路": "双手剑",
@@ -318,6 +325,7 @@
     "公义的酬报": "长柄武器",
     "沙中伟贤的对答": "长柄武器",
     "勘探钻机": "长柄武器",
+    "镇山之钉": "长柄武器",
     "虹的行迹": "长柄武器",
     "护摩之杖": "长柄武器",
     "天空之脊": "长柄武器",
@@ -446,6 +454,7 @@
     "灰河渡手": "UI_EquipIcon_Sword_Machination",
     "船坞长剑": "UI_EquipIcon_Sword_Mechanic",
     "水仙十字之剑": "UI_EquipIcon_Sword_Purewill",
+    "弥坚骨": "UI_EquipIcon_Sword_Umpakati",
     "息燧之笛": "UI_EquipIcon_Sword_Isikhulu",
     "风鹰剑": "UI_EquipIcon_Sword_Falcon",
     "天空之刃": "UI_EquipIcon_Sword_Dvalin",
@@ -459,6 +468,7 @@
     "静水流涌之辉": "UI_EquipIcon_Sword_Regalis",
     "有乐御簾切": "UI_EquipIcon_Sword_Needle",
     "赦罪": "UI_EquipIcon_Sword_Estoc",
+    "岩峰巡歌": "UI_EquipIcon_Sword_XochitlsTube",
     "训练大剑": "UI_EquipIcon_Claymore_Aniki",
     "佣兵重剑": "UI_EquipIcon_Claymore_Oyaji",
     "铁影阔剑": "UI_EquipIcon_Claymore_Glaive",
@@ -488,6 +498,7 @@
     "浪影阔剑": "UI_EquipIcon_Claymore_Vorpal",
     "「究极霸王超级魔剑」": "UI_EquipIcon_Claymore_Champion",
     "便携动力锯": "UI_EquipIcon_Claymore_Mechanic",
+    "硕果钩": "UI_EquipIcon_Claymore_Umpakati",
     "撼地者": "UI_EquipIcon_Claymore_Isikhulu",
     "天空之傲": "UI_EquipIcon_Claymore_Dvalin",
     "狼的末路": "UI_EquipIcon_Claymore_Wolfmound",
@@ -521,6 +532,7 @@
     "公义的酬报": "UI_EquipIcon_Pole_Vorpal",
     "沙中伟贤的对答": "UI_EquipIcon_Pole_Caduceus",
     "勘探钻机": "UI_EquipIcon_Pole_Mechanic",
+    "镇山之钉": "UI_EquipIcon_Pole_Umpakati",
     "虹的行迹": "UI_EquipIcon_Pole_Isikhulu",
     "护摩之杖": "UI_EquipIcon_Pole_Homa",
     "天空之脊": "UI_EquipIcon_Pole_Dvalin",

LittlePaimon/config/data/类型.json

@@ -187,7 +187,8 @@
         "旅行者岩",
         "娜维娅",
         "千织",
-        "卡齐娜"
+        "卡齐娜",
+        "希诺宁"
       ],
       "草": [
         "柯莱",
@@ -247,7 +248,9 @@
       "静水流涌之辉",
       "有乐御簾切",
       "赦罪",
-      "息燧之笛"
+      "息燧之笛",
+      "岩峰巡歌",
+      "弥坚骨"
     ],
     "双手剑": [
       "训练大剑",
@@ -284,7 +287,8 @@
       "「究极霸王超级魔剑」",
       "裁断",
       "撼地者",
-      "山王长牙"
+      "山王长牙",
+      "硕果钩"
     ],
     "长柄武器": [
       "新手长枪",
@@ -318,7 +322,8 @@
       "勘探钻机",
       "沙中伟贤的对答",
       "柔灯挽歌",
-      "虹的行迹"
+      "虹的行迹",
+      "镇山之钉"
     ],
     "法器": [
       "学徒笔记",