diff --git a/apps/Character.js b/apps/Character.js index f4d4fe3..a7c3645 100644 --- a/apps/Character.js +++ b/apps/Character.js @@ -109,7 +109,11 @@ export class Character extends plugin { } if (!roleDetail.data.role) { - const showroleList = roleData.data.showRoleIdList.map(roleId => roleData.data.roleList.find(role => role.roleId === roleId).roleName); + const showroleList = roleData.data.showRoleIdList.map(roleId => { + const role = roleData.data.roleList.find(role => role.roleId === roleId || role.mapRoleId === roleId); + return role ? role.roleName : null; + }).filter(Boolean); + data.push({ message: `UID: ${account.roleId} 未在库街区展示共鸣者 ${name},请在库街区展示此角色\n\n当前展示角色有:\n${showroleList.join('、')}\n\n使用[~登录]登录该账号后即可查看所有角色` }); return; } diff --git a/package.json b/package.json index eefa7a2..bc916a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-plugin", - "version": "1.4.19", + "version": "1.4.20", "description": "基于 Yunzai 的鸣潮游戏数据查询插件", "main": "index.js", "scripts": { diff --git a/resources/Alias/role.yaml b/resources/Alias/role.yaml index e7d5dac..4b13233 100644 --- a/resources/Alias/role.yaml +++ b/resources/Alias/role.yaml @@ -23,22 +23,22 @@ - 狮子 - 羚羊 - 陵阳 -漂泊者-男-衍射: - - 光主 - - 衍射主 - - 漂泊者 -漂泊者-女-衍射: - - 光主 - - 衍射主 - - 漂泊者 -漂泊者-男-湮灭: +漂泊者-女-湮灭: - 暗主 - 湮灭主 - 漂泊者 -漂泊者-女-湮灭: +漂泊者-男-湮灭: - 暗主 - 湮灭主 - 漂泊者 +漂泊者-女-衍射: + - 光主 + - 衍射主 + - 漂泊者 +漂泊者-男-衍射: + - 光主 + - 衍射主 + - 漂泊者 秧秧: - 泱泱 - 怏怏 @@ -83,4 +83,8 @@ - 里哥 - 鸡哥 守岸人: - - 守夜人 \ No newline at end of file + - 守夜人 +釉瑚: + - 雌小鬼 + - 杂鱼 + - 油壶 \ No newline at end of file diff --git a/resources/Simulator/role.yaml b/resources/Simulator/role.yaml index a04d3d6..3f56aaa 100644 --- a/resources/Simulator/role.yaml +++ b/resources/Simulator/role.yaml @@ -1,7 +1,7 @@ -pool_name: 「直至海水褪色」 +pool_name: 「夜将寒色去」 five_star: up_pool: - - name: 守岸人 + - name: 忌炎 other_pool: - name: 维里奈 - name: 安可 @@ -13,14 +13,15 @@ five_star: other: 0.5 four_star: up_pool: - - name: 桃祈 - - name: 秧秧 - - name: 炽霞 + - name: 釉瑚 + - name: 散华 + - name: 莫特斐 other_pool: + - name: 桃祈 - name: 渊武 - - name: 散华 + - name: 秧秧 - name: 丹瑾 - - name: 莫特斐 + - name: 炽霞 - name: 秋水 - name: 白芷 - name: 东落 diff --git a/resources/Simulator/weapon.yaml b/resources/Simulator/weapon.yaml index 80d529e..a1969dc 100644 --- a/resources/Simulator/weapon.yaml +++ b/resources/Simulator/weapon.yaml @@ -1,16 +1,16 @@ pool_name: 「浮声沉兵」 five_star: up_pool: - - name: 星序协响 + - name: 苍鳞千嶂 other_pool: [] basic: 0.008 increase: 0.0902 other: 0 four_star: up_pool: - - name: 永续坍缩 - - name: 异响空灵 - - name: 异度 + - name: 东落 + - name: 奇幻变奏 + - name: 尘云旋臂 other_pool: - name: 西升 - name: 秧秧 @@ -21,13 +21,14 @@ four_star: - name: 桃祈 - name: 秋水 - name: 渊武 - - name: 东落 - name: 骇行 - name: 飞逝 + - name: 异度 - name: 莫特斐 + - name: 永续坍缩 - name: 无眠烈火 - name: 今州守望 - - name: 奇幻变奏 + - name: 异响空灵 - name: 袍泽之固 - name: 行进序曲 - name: 华彩乐段 diff --git "a/resources/Strategy/moealkyne/\351\207\211\347\221\232.jpg" "b/resources/Strategy/moealkyne/\351\207\211\347\221\232.jpg" new file mode 100644 index 0000000..ed29c88 Binary files /dev/null and "b/resources/Strategy/moealkyne/\351\207\211\347\221\232.jpg" differ diff --git a/resources/Weight/1106.yaml b/resources/Weight/1106.yaml new file mode 100644 index 0000000..8e90ede --- /dev/null +++ b/resources/Weight/1106.yaml @@ -0,0 +1,56 @@ +baseAttack: 849 +baseDefense: 1051 +baseHP: 9975 +subProps: + - name: 暴击伤害 + weight: 1 + - name: 暴击 + weight: 1 + - name: 攻击百分比 + weight: 1 + - name: 生命百分比 + weight: 0 + - name: 防御百分比 + weight: 0 + - name: 共鸣效率 + weight: 0.2 + - name: 普攻伤害加成 + weight: 0 + - name: 重击伤害加成 + weight: 0 + - name: 共鸣技能伤害加成 + weight: 0.3 + - name: 共鸣解放伤害加成 + weight: 0 +mainProps: + C4: + - name: 暴击伤害 + weight: 0.5 + - name: 暴击 + weight: 0.5 + - name: 治疗效果加成 + weight: 0.5 + - name: 生命百分比 + weight: 0 + - name: 攻击百分比 + weight: 0.25 + - name: 防御百分比 + weight: 0 + C3: + - name: 伤害加成 + weight: 0.75 + - name: 攻击百分比 + weight: 0.75 + - name: 生命百分比 + weight: 0 + - name: 防御百分比 + weight: 0 + - name: 共鸣效率 + weight: 0.6 + C1: + - name: 攻击百分比 + weight: 1 + - name: 防御百分比 + weight: 0 + - name: 生命百分比 + weight: 0 \ No newline at end of file