适配Enka 3.4角色信息获取

增加迪希雅、米卡的角色信息，可通过`#迪希雅天赋`、`#迪希雅图鉴`等查看

CHANGELOG.md

@@ -1,9 +1,11 @@
-# 2.1.8
+# 2.1.9
 
-* 增加`#启用排名``#禁用排名`，可在全局启用排名情况下，在特定群内禁用排名功能
+* 适配Enka 3.4角色信息获取
-* `#日历`展示问题修复
+* 增加绫华、丽莎的时装素材
+* 增加迪希雅、米卡的角色信息，可通过`#迪希雅天赋`、`#迪希雅图鉴`等查看
+* 增加`#启用排名``#禁用排名`命令，可在全局启用排名情况下，在特定群内禁用排名功能
 
-# 2.1.1~2.1.7
+# 2.1.1~2.1.8
 
 * 增加面板替换功能，可通过命令更换面板的圣遗物、武器、天赋命座等，用于伤害计算
     * `#雷神面板换稻光换90级满命` / `#刻晴面板换雷神圣遗物` 等命令

components/profile-data/enka-meta.js

@@ -19,6 +19,7 @@ export default {
   246984427: '踏火息雷',
   262428003: '祭冰之人',
   270124867: '护国的无垢之心',
+  275622963: '裁叶萃光',
   287454963: '祭风之人',
   288666635: '无垢之心',
   302691299: '琥珀玥',
@@ -126,6 +127,7 @@ export default {
   1344953075: '顺风而行',
   1345343763: '磐岩结绿',
   1348687251: '猎人之径',
+  1383427723: '白月枝芒',
   1383639611: '奇迹',
   1388004931: '飞天御剑',
   1390797107: '白缨枪',
@@ -168,6 +170,7 @@ export default {
   1702903411: '镇灵的低语',
   1706534267: '有话直说',
   1722706579: '止水融冰',
+  1732418482: '瑶瑶',
   1745286795: '名士振舞',
   1745712907: '驭浪的海祇民',
   1751039235: '昔日宗室之仪',
@@ -386,6 +389,7 @@ export default {
   3996017211: '收割',
   3999792907: '祭水之人',
   4000770243: '街巷伏击',
+  4002157418: '艾尔海森',
   4022012131: '乘胜追击',
   4049410651: '决斗之枪',
   4055003299: '天空之刃',
@@ -420,24 +424,52 @@ export default {
   4267718859: '反曲弓',
   4273845410: '辛焱',
   4275754179: '如狼般狩猎者',
-  FIGHT_PROP_HP_PERCENT: '生命值',
+  FIGHT_PROP_ADD_HURT: '伤害增加',
-  FIGHT_PROP_MAX_HP: '生命值上限',
+  FIGHT_PROP_ANTI_CRITICAL: '暴击抗性',
   FIGHT_PROP_ATTACK: '攻击力',
-  FIGHT_PROP_DEFENSE: '防御力',
+  FIGHT_PROP_ATTACK_PERCENT: '攻击力',
-  FIGHT_PROP_ELEMENT_MASTERY: '元素精通',
+  FIGHT_PROP_BASE_ATTACK: '基础攻击力',
+  FIGHT_PROP_BASE_DEFENSE: '基础防御力',
+  FIGHT_PROP_BASE_HP: '基础生命值',
+  FIGHT_PROP_BASE_SPEED: '移动速度',
+  FIGHT_PROP_CHARGE_EFFICIENCY: '元素充能效率',
   FIGHT_PROP_CRITICAL: '暴击率',
   FIGHT_PROP_CRITICAL_HURT: '暴击伤害',
-  FIGHT_PROP_HEAL_ADD: '治疗加成',
+  FIGHT_PROP_CUR_ATTACK: '攻击力',
-  FIGHT_PROP_HEALED_ADD: '受治疗加成',
+  FIGHT_PROP_CUR_DEFENSE: '防御力',
-  FIGHT_PROP_CHARGE_EFFICIENCY: '元素充能效率',
+  FIGHT_PROP_CUR_HP: '生命值',
-  FIGHT_PROP_SHIELD_COST_MINUS_RATIO: '护盾强效',
+  FIGHT_PROP_CUR_SPEED: '移动速度',
-  FIGHT_PROP_FIRE_ADD_HURT: '火元素伤害加成',
+  FIGHT_PROP_DEFENSE: '防御力',
-  FIGHT_PROP_WATER_ADD_HURT: '水元素伤害加成',
+  FIGHT_PROP_DEFENSE_PERCENT: '防御力',
-  FIGHT_PROP_GRASS_ADD_HURT: '草元素伤害加成',
+  FIGHT_PROP_DIZZY_SHORTEN: '眩晕时间缩短',
+  FIGHT_PROP_EFFECT_HIT: '效果命中',
+  FIGHT_PROP_EFFECT_RESIST: '效果抵抗',
   FIGHT_PROP_ELEC_ADD_HURT: '雷元素伤害加成',
-  FIGHT_PROP_WIND_ADD_HURT: '风元素伤害加成',
+  FIGHT_PROP_ELEC_SUB_HURT: '雷元素抗性',
+  FIGHT_PROP_ELEMENT_MASTERY: '元素精通',
+  FIGHT_PROP_FIRE_ADD_HURT: '火元素伤害加成',
+  FIGHT_PROP_FIRE_SUB_HURT: '火元素抗性',
+  FIGHT_PROP_FREEZE_SHORTEN: '冻结时间缩短',
+  FIGHT_PROP_GRASS_ADD_HURT: '草元素伤害加成',
+  FIGHT_PROP_GRASS_SUB_HURT: '草元素抗性',
+  FIGHT_PROP_HEALED_ADD: '受治疗加成',
+  FIGHT_PROP_HEAL_ADD: '治疗加成',
+  FIGHT_PROP_HP: '生命值',
+  FIGHT_PROP_HP_PERCENT: '生命值',
   FIGHT_PROP_ICE_ADD_HURT: '冰元素伤害加成',
-  FIGHT_PROP_ROCK_ADD_HURT: '岩元素伤害加成',
+  FIGHT_PROP_ICE_SUB_HURT: '冰元素抗性',
+  FIGHT_PROP_MAX_HP: '生命值上限',
   FIGHT_PROP_PHYSICAL_ADD_HURT: '物理伤害加成',
+  FIGHT_PROP_PHYSICAL_SUB_HURT: '物理抗性',
+  FIGHT_PROP_ROCK_ADD_HURT: '岩元素伤害加成',
+  FIGHT_PROP_ROCK_SUB_HURT: '岩元素抗性',
+  FIGHT_PROP_SHIELD_COST_MINUS_RATIO: '护盾强效',
+  FIGHT_PROP_SKILL_CD_MINUS_RATIO: '冷却缩减',
+  FIGHT_PROP_SPEED_PERCENT: '移动速度',
+  FIGHT_PROP_SUB_HURT: '受伤减免',
+  FIGHT_PROP_WATER_ADD_HURT: '水元素伤害加成',
+  FIGHT_PROP_WATER_SUB_HURT: '水元素抗性',
+  FIGHT_PROP_WIND_ADD_HURT: '风元素伤害加成',
+  FIGHT_PROP_WIND_SUB_HURT: '风元素抗性',
   level: '等级'
 }

config/system/character_system.js

@@ -71,7 +71,9 @@ export const characters = {
   10000075: ['流浪者', 'Wanderer', '散兵', '国崩', '雷电国崩', '大炮', '雷电大炮', '雷大炮', '伞兵', '斯卡拉姆齐'],
   10000076: ['珐露珊', 'Faruzan', '法露珊', '法璐珊', '法露姗', '法璐姗', '珐露姗', '珐璐姗', '百岁珊', '百岁山'],
   10000077: ['瑶瑶', '遥遥', '萝卜'],
-  10000078: ['艾尔海森', '海哥', '埃尔海森', '海森', '海参'],
+  10000078: ['艾尔海森', '海哥', '埃尔海森', '海森', '海参', '书记官'],
+  10000079: ['迪希雅', '迪希亚', '迪希娅', '迪西雅', '迪西亚'],
+  10000080: ['米卡', '鹦鹉', '凤头', '凤头鹦鹉'],
 
   // 自定义角色
   paimon: ['派蒙', '应急食物', '应急食品', '吉祥物', '宠物', '外置器官', '会说话的动物', '矮堇瓜', '飞行矮堇瓜', '最好的伙伴'],
@@ -88,7 +90,6 @@ export const characters = {
   choujue: ['皮耶罗', '丑角', '老爷子'],
   gongji: ['普契涅拉', '公鸡', '鸽子'],
   duizhang: ['卡皮塔诺', '队长'],
-  dixiya: ['迪希雅', '迪希亚', '迪希娅', '迪西雅', '迪西亚'],
   daiyin: ['戴因斯雷布', '戴因', '男派蒙', '大派蒙', '末光之剑', '拾枝者'],
   tianli: ['天理', '天理维系者', '维系者']
 }

models/ProfileReq.js

@@ -33,7 +33,7 @@ export default class ProfileReq extends Base {
 
   err (msg = '', cd = 0) {
     const msgs = {
-      error: '请求失败，可能是服务负载较高，请稍后重试...',
+      error: '请求失败，可能是面板服务升级维护或遇到故障，请稍后重试...',
       empty: '请将角色放置在【游戏内】角色展柜，并打开【显示详情】，等待5分钟重新获取面板'
     }
     msg = msgs[msg] || msg

resources/meta/character/瑶瑶/data.json

@@ -28,7 +28,11 @@
     "7732": "e",
     "7739": "q"
   },
-  "talentId": {},
+  "talentId": {
+    "10771": 7731,
+    "10772": 7732,
+    "10775": 7739
+  },
   "talentCons": {
     "e": 3,
     "q": 5

resources/meta/character/神里绫华/data.json

@@ -12,7 +12,9 @@
   "desc": "稻妻「社奉行」神里家的大小姐。端庄而文雅，聪慧又坚韧。",
   "cncv": "小N",
   "jpcv": "早见沙织",
-  "costume": false,
+  "costume": [
+    200201
+  ],
   "ver": 1,
   "baseAttr": {
     "hp": 12858,

resources/meta/character/神里绫华/detail.json

@@ -462,6 +462,68 @@
         172.23,
         181.71
       ],
+      "四段伤害2": [
+        [
+          22.65,
+          3
+        ],
+        [
+          24.49,
+          3
+        ],
+        [
+          26.33,
+          3
+        ],
+        [
+          28.97,
+          3
+        ],
+        [
+          30.81,
+          3
+        ],
+        [
+          32.92,
+          3
+        ],
+        [
+          35.81,
+          3
+        ],
+        [
+          38.71,
+          3
+        ],
+        [
+          41.61,
+          3
+        ],
+        [
+          44.77,
+          3
+        ],
+        [
+          47.93,
+          3
+        ],
+        [
+          51.09,
+          3
+        ],
+        [
+          54.25,
+          3
+        ],
+        [
+          57.41,
+          3
+        ],
+        [
+          60.57,
+          3
+        ]
+      ],
       "五段伤害": [
         78.18,
         84.55,
@@ -496,6 +558,68 @@
         419.22,
         442.29
       ],
+      "重击伤害2": [
+        [
+          55.13,
+          3
+        ],
+        [
+          59.61,
+          3
+        ],
+        [
+          64.1,
+          3
+        ],
+        [
+          70.51,
+          3
+        ],
+        [
+          75,
+          3
+        ],
+        [
+          80.12,
+          3
+        ],
+        [
+          87.18,
+          3
+        ],
+        [
+          94.23,
+          3
+        ],
+        [
+          101.28,
+          3
+        ],
+        [
+          108.97,
+          3
+        ],
+        [
+          116.66,
+          3
+        ],
+        [
+          124.35,
+          3
+        ],
+        [
+          132.05,
+          3
+        ],
+        [
+          139.74,
+          3
+        ],
+        [
+          147.43,
+          3
+        ]
+      ],
       "下坠期间伤害": [
         63.93,
         69.14,

resources/meta/character/米卡/data.json

@@ -0,0 +1,45 @@
+{
+  "id": 10000080,
+  "name": "米卡",
+  "abbr": "米卡",
+  "title": "晴霜的标绘",
+  "star": 4,
+  "elem": "cryo",
+  "allegiance": "？？？",
+  "weapon": "polearm",
+  "birth": "1-1",
+  "astro": "林鸽座",
+  "desc": "测试角色",
+  "cncv": "？？？",
+  "jpcv": "？？？",
+  "costume": false,
+  "ver": 1,
+  "baseAttr": {
+    "hp": 12506,
+    "atk": 169.92,
+    "def": 593.79
+  },
+  "growAttr": {
+    "key": "hpPct",
+    "value": 24
+  },
+  "talentKey": {
+    "8031": "a",
+    "8032": "e",
+    "8039": "q"
+  },
+  "talentId": {},
+  "talentCons": {
+    "e": 5,
+    "q": 3
+  },
+  "materials": {
+    "gem": "哀叙冰玉",
+    "boss": "苍砾蕊羽",
+    "specialty": "钩钩果",
+    "normal": "尉官的徽记",
+    "talent": "「诗文」的哲学",
+    "weekly": "无心的渊镜"
+  },
+  "eta": 1677636000000
+}

resources/meta/character/艾尔海森/data.json

@@ -1,7 +1,7 @@
 {
   "id": 10000078,
   "name": "艾尔海森",
-  "abbr": "艾尔海森",
+  "abbr": "海森",
   "title": "诲韬诤言",
   "star": 5,
   "elem": "dendro",
@@ -28,7 +28,11 @@
     "7832": "e",
     "7839": "q"
   },
-  "talentId": {},
+  "talentId": {
+    "10781": 7831,
+    "10782": 7832,
+    "10785": 7839
+  },
   "talentCons": {
     "e": 3,
     "q": 5

resources/meta/character/迪希雅/data.json

@@ -0,0 +1,45 @@
+{
+  "id": 10000079,
+  "name": "迪希雅",
+  "abbr": "迪希雅",
+  "title": "炽鬃之狮",
+  "star": 5,
+  "elem": "pyro",
+  "allegiance": "？？？",
+  "weapon": "claymore",
+  "birth": "1-1",
+  "astro": "蝎尾鬃狮座",
+  "desc": "测试角色",
+  "cncv": "？？？",
+  "jpcv": "？？？",
+  "costume": false,
+  "ver": 1,
+  "baseAttr": {
+    "hp": 15675,
+    "atk": 265.49,
+    "def": 627.91
+  },
+  "growAttr": {
+    "key": "hpPct",
+    "value": 28.8
+  },
+  "talentKey": {
+    "7931": "a",
+    "7932": "e",
+    "7939": "q"
+  },
+  "talentId": {},
+  "talentCons": {
+    "e": 5,
+    "q": 3
+  },
+  "materials": {
+    "gem": "燃愿玛瑙",
+    "boss": "导光四面体",
+    "specialty": "沙脂蛹",
+    "normal": "织金红绸",
+    "talent": "「笃行」的哲学",
+    "weekly": "傀儡的悬丝"
+  },
+  "eta": 1677636000000
+}

resources/meta/weapon/claymore/calc.js

@@ -141,6 +141,24 @@ export default function (step, staticStep) {
       data: {
         atkPlus: ({ attr, calc, refine }) => step(24)[refine] * calc(attr.mastery) / 100
       }
-    }
+    },
+    饰铁之花: {
+      title: '元素战技或触发元素反应提高[atkPct]%攻击力，[mastery]点元素精通',
+      refine: {
+        atkPct: step(12),
+        mastery: step(48)
+      }
+    },
+    苇海信标: [{
+      title: '元素战技命中敌人并受伤害后提升攻击力[atkPct]%',
+      refine: {
+        atkPct: step(40)
+      }
+    }, {
+      title: '不处于护盾下时，提高[hpPct]%生命值',
+      refine: {
+        hpPct: step(32)
+      }
+    }]
   }
 }

resources/meta/weapon/claymore/data.json

@@ -143,5 +143,15 @@
 		"id": "n12510",
 		"name": "赤角石溃杵",
 		"star": 5
+	},
+	"饰铁之花": {
+		"id": "n12418",
+		"name": "饰铁之花",
+		"star": 4
+	},
+	"苇海信标": {
+		"id": "n12511",
+		"name": "苇海信标",
+		"star": 5
 	}
 }

resources/meta/weapon/claymore/苇海信标/data.json

@@ -0,0 +1,73 @@
+{
+	"id": "n12511",
+	"name": "苇海信标",
+	"affixTitle": "沙海守望",
+	"star": 5,
+	"desc": "元素战技命中敌人后，攻击力提升20%，持续8秒；受到伤害后，攻击力提升20%，持续8秒。上述2种效果角色处于队伍后台时也能触发。此外，不处于护盾庇护下时，生命值上限提高32%。",
+	"attr": {
+		"atk": {
+			"1": 45.94,
+			"20": 121.73,
+			"40": 235.2,
+			"50": 308.42,
+			"60": 382.43,
+			"70": 456.99,
+			"80": 532.23,
+			"90": 608.07,
+			"20+": 152.83,
+			"40+": 266.3,
+			"50+": 339.62,
+			"60+": 413.53,
+			"70+": 488.09,
+			"80+": 563.33
+		},
+		"bonusKey": "cpct",
+		"bonusData": {
+			"1": 7.2,
+			"20": 12.72,
+			"40": 18.54,
+			"50": 21.45,
+			"60": 24.36,
+			"70": 27.26,
+			"80": 30.17,
+			"90": 33.08,
+			"20+": 12.72,
+			"40+": 18.54,
+			"50+": 21.45,
+			"60+": 24.36,
+			"70+": 27.26,
+			"80+": 30.17
+		}
+	},
+	"materials": {
+		"weapon": "烈日威权的旧日",
+		"monster": "锲纹的横脊",
+		"normal": "织金红绸"
+	},
+	"affixData": {
+		"text": "元素战技命中敌人后，攻击力提升$[0]，持续8秒；受到伤害后，攻击力提升$[1]，持续8秒。上述2种效果角色处于队伍后台时也能触发。此外，不处于护盾庇护下时，生命值上限提高$[2]。",
+		"datas": {
+			"0": [
+				"20%",
+				"25%",
+				"30%",
+				"35%",
+				"40%"
+			],
+			"1": [
+				"20%",
+				"25%",
+				"30%",
+				"35%",
+				"40%"
+			],
+			"2": [
+				"32%",
+				"40%",
+				"48%",
+				"56%",
+				"64%"
+			]
+		}
+	}
+}

resources/meta/weapon/claymore/饰铁之花/data.json

@@ -0,0 +1,66 @@
+{
+	"id": "n12418",
+	"name": "饰铁之花",
+	"affixTitle": "风与花的密语",
+	"star": 4,
+	"desc": "元素战技命中敌人或触发元素反应后的8秒内，攻击力提升12%，元素精通提升48点。",
+	"attr": {
+		"atk": {
+			"1": 43.73,
+			"20": 118.57,
+			"40": 225.99,
+			"50": 293.36,
+			"60": 360.9,
+			"70": 428.69,
+			"80": 496.72,
+			"90": 564.78,
+			"20+": 144.47,
+			"40+": 251.99,
+			"50+": 319.26,
+			"60+": 386.8,
+			"70+": 454.69,
+			"80+": 522.62
+		},
+		"bonusKey": "mastery",
+		"bonusData": {
+			"1": 24,
+			"20": 42.41,
+			"40": 61.8,
+			"50": 71.5,
+			"60": 81.19,
+			"70": 90.86,
+			"80": 100.56,
+			"90": 110.26,
+			"20+": 42.41,
+			"40+": 61.8,
+			"50+": 71.5,
+			"60+": 81.19,
+			"70+": 90.86,
+			"80+": 100.56
+		}
+	},
+	"materials": {
+		"weapon": "狮牙斗士的理想",
+		"monster": "锲纹的横脊",
+		"normal": "浮游晶化核"
+	},
+	"affixData": {
+		"text": "元素战技命中敌人或触发元素反应后的8秒内，攻击力提升$[0]，元素精通提升$[1]点。",
+		"datas": {
+			"0": [
+				"12%",
+				"15%",
+				"18%",
+				"21%",
+				"24%"
+			],
+			"1": [
+				"48",
+				"60",
+				"72",
+				"84",
+				"96"
+			]
+		}
+	}
+}

resources/meta/weapon/meta.js

@@ -69,7 +69,7 @@ export const alias = {
   笼钓瓶一心: '妖刀,红刀,笼钓瓶,一心传名刀,一心传',
   东花坊时雨: '雨伞,伞剑',
   黑剑: '月卡剑',
-  裁叶萃光: '草剑,裁叶,萃光,海哥专武',
+  裁叶萃光: '草剑,裁叶,萃光,海哥专武,菜刀,菜叶',
 
   // 大剑
   天空之傲: '天空大剑',
@@ -91,6 +91,8 @@ export const alias = {
   衔珠海皇: '海皇,咸鱼剑,咸鱼大剑',
   螭骨剑: '螭骨,丈育剑,离骨剑,月卡大剑',
   沐浴龙血的剑: '龙血剑,龙血大剑',
+  饰铁之花: '饰铁',
+  苇海信标: '苇海',
 
   // 枪
   天空之脊: '天空枪,薄荷枪',

resources/meta/weapon/sword/calc.js

@@ -152,7 +152,7 @@ export default function (step, staticStep) {
       title: '普攻与元素战技造成的伤害值提高[aPlus]',
       data: {
         aPlus: ({ attr, calc, refine }) => calc(attr.mastery) * [200, 230, 260, 290, 320][refine] / 100,
-        ePlus: ({ attr, calc, refine }) => calc(attr.mastery) * [200, 230, 260, 290, 320][refine] / 100,
+        ePlus: ({ attr, calc, refine }) => calc(attr.mastery) * [200, 230, 260, 290, 320][refine] / 100
       }
     }],
     斫峰之刃: [{

tools/char-data.js

@@ -256,7 +256,9 @@ const charData = {
   75: { key: 'wanderer', name: '流浪者' },
   76: { key: 'faruzan', name: '珐露珊' },
   77: { key: 'yaoyao', name: '瑶瑶' },
-  78: { key: 'alhatham', name: '艾尔海森' }
+  78: { key: 'alhatham', name: '艾尔海森' },
+  79: { key: 'dehya', name: '迪希雅' },
+  80: { key: 'mika', name: '米卡' }
 }
 let eta = {
   妮露: '2022-10-14 18:00:00',
@@ -265,6 +267,8 @@ let eta = {
   流浪者: '2022-12-07 11:00:00',
   珐露珊: '2022-12-07 11:00:00',
   瑶瑶: '2023-01-18 11:00:00',
-  艾尔海森: '2023-01-18 11:00:00'
+  艾尔海森: '2023-01-18 11:00:00',
+  迪希雅: '2023-03-01 10:00:00',
+  米卡: '2023-03-01 10:00:00'
 }
-await down('77,78', true)
+await down('79,80', true)

tools/sprider/CharData.js

@@ -8,7 +8,8 @@ let costumes = {
   刻晴: [204201], // 刻晴
   凝光: [202701], // 凝光
   迪卢克: [201601], // 迪卢克
-  菲谢尔: [203101] // 菲谢尔
+  菲谢尔: [203101], // 菲谢尔
+  神里绫华: [200201]
 }
 
 const CharData = {

tools/sprider/abbr.js

@@ -9,5 +9,6 @@ export default {
   八重神子: '八重',
   九条裟罗: '九条',
   罗莎莉亚: '罗莎',
-  鹿野院平藏: '平藏'
+  鹿野院平藏: '平藏',
+  艾尔海森: '海森'
 }

tools/weapon-data.js

@@ -140,4 +140,4 @@ async function down (t, n) {
 }
 
 // 'sword', 'claymore', 'polearm', 'bow', 'catalyst'
-await down('sword', '裁叶萃光')
+await down('claymore', '苇海信标')