diff --git a/apps/Training.js b/apps/Training.js index 536047e..205ab1f 100644 --- a/apps/Training.js +++ b/apps/Training.js @@ -85,7 +85,22 @@ export class Training extends plugin { return calculatedRole; }); - roleList.sort((a, b) => b.starLevel - a.starLevel || b.phantomData.statistic.totalScore - a.phantomData.statistic.totalScore); + roleList.forEach(role => { + const { phantomData } = role; + phantomData.statistic = { + color: "#a0a0a0", + rank: "N", + totalScore: "N/A", + ...phantomData.statistic + }; + }); + + roleList.sort((a, b) => { + const aScore = parseFloat(a.phantomData.statistic.totalScore) || 0; + const bScore = parseFloat(b.phantomData.statistic.totalScore) || 0; + + return b.starLevel - a.starLevel || bScore - aScore; + }); const imageCard = await Render.render('Template/training/training', { baseData: baseData.data, diff --git a/package.json b/package.json index 3d9145c..78b4dd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-plugin", - "version": "1.5.15", + "version": "1.5.16", "description": "基于 Yunzai 的鸣潮游戏数据查询插件", "main": "index.js", "scripts": { diff --git a/resources/Alias/role.yaml b/resources/Alias/role.yaml index 360807a..62f909b 100644 --- a/resources/Alias/role.yaml +++ b/resources/Alias/role.yaml @@ -116,4 +116,7 @@ - yh 椿: - 春 - - c \ No newline at end of file + - c +灯灯: + - 登登 + - dd \ No newline at end of file diff --git "a/resources/Strategy/moealkyne/\347\201\257\347\201\257.jpg" "b/resources/Strategy/moealkyne/\347\201\257\347\201\257.jpg" new file mode 100644 index 0000000..c133a57 Binary files /dev/null and "b/resources/Strategy/moealkyne/\347\201\257\347\201\257.jpg" differ diff --git a/resources/Template/charProfile/charProfile.html b/resources/Template/charProfile/charProfile.html index c649878..7a4e1e1 100644 --- a/resources/Template/charProfile/charProfile.html +++ b/resources/Template/charProfile/charProfile.html @@ -66,10 +66,10 @@ {{if data.roleDetail.data.phantomData.statistic}}