@sjtdev/koishi-plugin-dota2tracker 1.5.0-pre.1 → 1.5.0-pre.3

package/lib/index.js

@@ -38,14 +38,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/en-US.schema.yml
 var require_en_US_schema = __commonJS({
   "src/locales/en-US.schema.yml"(exports2, module2) {
-    module2.exports = { _config: { base: { $desc: "Basic Settings", STRATZ_API_TOKEN: "Required. API TOKEN from stratz.com, available at https://stratz.com/api.", dataParsingTimeoutMinutes: "Time to wait for match data parsing (in minutes). If the data parsing time exceeds the waiting time, the report will be generated directly without waiting for the parsing to complete.", urlInMessageType: { $desc: "Include links in messages, <br/>please select the message type:", $inner: ["Include stratz match page link in match query and report messages", "Include stratz player page link in player information query messages", "Include Dota Encyclopedia hero page link in hero data query messages"] } }, rank: { rankBroadSwitch: "Rank change broadcast", rankBroadStar: "Star change broadcast", rankBroadLeader: "Leaderboard rank change broadcast", rankBroadFun: "Fun broadcast template" }, report: { $desc: "Summary Settings", dailyReportSwitch: "Daily Report Function", dailyReportHours: "Daily report time in hours", dailyReportShowCombi: "Show combinations in daily report", weeklyReportSwitch: "Weekly Report Function", weeklyReportDayHours: "Weekly report published on (day) at (hour)", weeklyReportShowCombi: "Show combinations in weekly report" }, template: { $desc: "Template Settings", template_match: "Template used to generate match information images, see https://sjtdev.github.io/koishi-plugin-dota2tracker/template-match.html for template display.", template_player: "Template used to generate player information images. (Currently only one template available)", template_hero: "Template used to generate hero information images. (Currently only one template available)", playerRankEstimate: "Estimate the rank of players without a rank in the player template <br>Estimated rank will be displayed as a gray image" } } };
+    module2.exports = { _config: { base: { $desc: "Basic Settings", STRATZ_API_TOKEN: "Required. API TOKEN from stratz.com, available at https://stratz.com/api.", dataParsingTimeoutMinutes: "Time to wait for match data parsing (in minutes). If the data parsing time exceeds the waiting time, the report will be generated directly without waiting for the parsing to complete.", urlInMessageType: { $desc: "Include links in messages, <br/>please select the message type:", $inner: ["Include stratz match page link in match query and report messages", "Include stratz player page link in player information query messages", "Include Dota Encyclopedia hero page link in hero data query messages"] }, proxyAddress: "Proxy address. Leave blank to disable the proxy." }, rank: { rankBroadSwitch: "Rank change broadcast", rankBroadStar: "Star change broadcast", rankBroadLeader: "Leaderboard rank change broadcast", rankBroadFun: "Fun broadcast template" }, report: { $desc: "Summary Settings", dailyReportSwitch: "Daily Report Function", dailyReportHours: "Daily report time in hours", dailyReportShowCombi: "Show combinations in daily report", weeklyReportSwitch: "Weekly Report Function", weeklyReportDayHours: "Weekly report published on (day) at (hour)", weeklyReportShowCombi: "Show combinations in weekly report" }, template: { $desc: "Template Settings", template_match: "Template used to generate match information images, see https://sjtdev.github.io/koishi-plugin-dota2tracker/template-match.html for template display.", template_player: "Template used to generate player information images. (Currently only one template available)", template_hero: "Template used to generate hero information images. (Currently only one template available)", playerRankEstimate: "Estimate the rank of players without a rank in the player template <br>Estimated rank will be displayed as a gray image" } } };
   }
 });
 
 // src/locales/zh-CN.schema.yml
 var require_zh_CN_schema = __commonJS({
   "src/locales/zh-CN.schema.yml"(exports2, module2) {
-    module2.exports = { _config: { base: { $desc: "基础设置", STRATZ_API_TOKEN: "※必须。stratz.com的API TOKEN，可在 https://stratz.com/api 获取。", dataParsingTimeoutMinutes: "等待比赛数据解析的时间（单位：分钟）。如果数据解析时间超过等待时间，将直接生成战报而不再等待解析完成。", urlInMessageType: { $desc: "在消息中附带链接，<br/>请选择消息类型：", $inner: ["在查询比赛与战报消息中附带stratz比赛页面链接", "在查询玩家信息消息中附带stratz玩家页面链接", "在查询英雄数据消息中附带刀塔百科对应英雄页面链接"] } }, rank: { rankBroadSwitch: "段位变动播报", rankBroadStar: "星级变动播报", rankBroadLeader: "冠绝名次变动播报", rankBroadFun: "整活播报模板" }, report: { $desc: "总结设置", dailyReportSwitch: "日报功能", dailyReportHours: "日报时间小时", dailyReportShowCombi: "日报是否显示组合", weeklyReportSwitch: "周报功能", weeklyReportDayHours: "周报发布于周（几）的（几）点", weeklyReportShowCombi: "周报是否显示组合" }, template: { $desc: "模板设置", template_match: "生成比赛信息图片使用的模板，见 https://sjtdev.github.io/koishi-plugin-dota2tracker/template-match.html 有模板展示。", template_player: "生成玩家信息图片使用的模板。（目前仅有一张模板）", template_hero: "生成英雄信息图片使用的模板。（目前仅有一张模板）", playerRankEstimate: "在player模板中对没有段位的玩家进行段位估算 <br>估算的段位将以灰色图片显示" } } };
+    module2.exports = { _config: { base: { $desc: "基础设置", STRATZ_API_TOKEN: "※必须。stratz.com的API TOKEN，可在 https://stratz.com/api 获取。", dataParsingTimeoutMinutes: "等待比赛数据解析的时间（单位：分钟）。如果数据解析时间超过等待时间，将直接生成战报而不再等待解析完成。", urlInMessageType: { $desc: "在消息中附带链接，<br/>请选择消息类型：", $inner: ["在查询比赛与战报消息中附带stratz比赛页面链接", "在查询玩家信息消息中附带stratz玩家页面链接", "在查询英雄数据消息中附带刀塔百科对应英雄页面链接"] }, proxyAddress: "代理地址，留空时不使用代理" }, rank: { rankBroadSwitch: "段位变动播报", rankBroadStar: "星级变动播报", rankBroadLeader: "冠绝名次变动播报", rankBroadFun: "整活播报模板" }, report: { $desc: "总结设置", dailyReportSwitch: "日报功能", dailyReportHours: "日报时间小时", dailyReportShowCombi: "日报是否显示组合", weeklyReportSwitch: "周报功能", weeklyReportDayHours: "周报发布于周（几）的（几）点", weeklyReportShowCombi: "周报是否显示组合" }, template: { $desc: "模板设置", template_match: "生成比赛信息图片使用的模板，见 https://sjtdev.github.io/koishi-plugin-dota2tracker/template-match.html 有模板展示。", template_player: "生成玩家信息图片使用的模板。（目前仅有一张模板）", template_hero: "生成英雄信息图片使用的模板。（目前仅有一张模板）", playerRankEstimate: "在player模板中对没有段位的玩家进行段位估算 <br>估算的段位将以灰色图片显示" } } };
   }
 });
 
@@ -665,8 +665,9 @@ var pluginDir = import_path.default.join(__dirname, "..");
 var CONFIGS = { STRATZ_API: { URL: "https://api.stratz.com/graphql", TOKEN: "" } };
 var http = null;
 var setTimeout;
+var proxyAddress;
 function init(params) {
-  ({ http, setTimeout, APIKEY: CONFIGS.STRATZ_API.TOKEN } = params);
+  ({ http, setTimeout, APIKEY: CONFIGS.STRATZ_API.TOKEN, proxyAddress } = params);
 }
 __name(init, "init");
 async function fetchData(query2) {
@@ -676,7 +677,8 @@ async function fetchData(query2) {
       "User-Agent": "STRATZ_API",
       "Content-Type": "application/json",
       Authorization: `Bearer ${CONFIGS.STRATZ_API.TOKEN}`
-    }
+    },
+    proxyAgent: proxyAddress || void 0
   });
 }
 __name(fetchData, "fetchData");
@@ -1382,8 +1384,11 @@ var globRequire_locales_template_yml = __glob({
 // src/index.ts
 var name = "dota2tracker";
 var usage = "";
-var inject = ["http", "database", "cron", "puppeteer", "cache"];
+var inject = {
+  required: ["http", "database", "cron", "puppeteer", "cache"]
+};
 var pluginDir2 = import_path2.default.resolve(__dirname, "..");
+var pluginVersion = require(import_path2.default.join(pluginDir2, "package.json")).version;
 var GraphqlLanguageEnum = /* @__PURE__ */ ((GraphqlLanguageEnum2) => {
   GraphqlLanguageEnum2["en-US"] = "ENGLISH";
   GraphqlLanguageEnum2["zh-CN"] = "S_CHINESE";
@@ -1393,7 +1398,8 @@ var Config = import_koishi2.Schema.intersect([
   import_koishi2.Schema.object({
     STRATZ_API_TOKEN: import_koishi2.Schema.string().required().role("secret"),
     dataParsingTimeoutMinutes: import_koishi2.Schema.number().default(60).min(0).max(1440),
-    urlInMessageType: import_koishi2.Schema.array(import_koishi2.Schema.union([import_koishi2.Schema.const("match"), import_koishi2.Schema.const("player"), import_koishi2.Schema.const("hero")])).role("checkbox")
+    urlInMessageType: import_koishi2.Schema.array(import_koishi2.Schema.union([import_koishi2.Schema.const("match"), import_koishi2.Schema.const("player"), import_koishi2.Schema.const("hero")])).role("checkbox"),
+    proxyAddress: import_koishi2.Schema.string()
   }).i18n(Object.keys(GraphqlLanguageEnum).reduce((acc, cur) => (acc[cur] = globRequire_locales_schema_yml(`./locales/${cur}.schema.yml`)._config.base, acc), {})),
   import_koishi2.Schema.intersect([
     import_koishi2.Schema.object({
@@ -1445,7 +1451,7 @@ var random = new import_koishi3.Random(() => Math.random());
 var days_30 = 2592e6;
 var constantLocales = {};
 async function apply(ctx, config) {
-  init({ http: ctx.http, setTimeout: ctx.setTimeout, APIKEY: config.STRATZ_API_TOKEN });
+  init({ http: ctx.http, setTimeout: ctx.setTimeout, APIKEY: config.STRATZ_API_TOKEN, proxyAddress: config.proxyAddress });
   for (const supportLanguageTag of Object.keys(GraphqlLanguageEnum)) {
     constantLocales[supportLanguageTag] = globRequire_locales_constants_json(`./locales/${supportLanguageTag}.constants.json`);
     ctx.i18n.define(supportLanguageTag, globRequire_locales_yml(`./locales/${supportLanguageTag}.yml`));
@@ -1612,13 +1618,13 @@ async function apply(ctx, config) {
     try {
       let queryLocal = await ctx.cache.get("dt_previous_query_results", String(matchId));
       let matchQuery;
-      if (queryLocal) {
-        matchQuery = queryLocal;
+      if (queryLocal?.data && queryLocal.pluginVersion == pluginVersion) {
+        matchQuery = queryLocal.data;
         ctx.cache.set("dt_previous_query_results", String(matchQuery.match.id), queryLocal, days_30);
       } else {
         matchQuery = await query("MatchInfo", { matchId });
         if (matchQuery.match?.parsedDateTime && matchQuery.match.players.filter((player) => player?.stats?.heroDamageReport?.dealtTotal).length > 0)
-          ctx.cache.set("dt_previous_query_results", String(matchQuery.match.id), matchQuery, days_30);
+          ctx.cache.set("dt_previous_query_results", String(matchQuery.match.id), { data: matchQuery, pluginVersion }, days_30);
       }
       return matchQuery;
     } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "koishi插件-追踪群友的DOTA2对局",
-  "version": "1.5.0-pre.1",
+  "version": "1.5.0-pre.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/template/match/match_2/charts.ejs

@@ -0,0 +1,237 @@
+<div id="charts">
+  <% const match = data; %>
+  <%
+  const mainData = match.radiantNetworthLeads ?? [];
+
+  const secondaryData = match.radiantExperienceLeads ?? [];
+
+  const maxValue = Math.max(...mainData.map(Math.abs), ...secondaryData.map(Math.abs));
+  const minValue = Math.min(...mainData);
+
+  const svgWidth = 400;
+  const svgHeight = 200;
+  const padding = 50;
+
+  // 以秒为步进单位，下方调用时需要×60，并且需要判断不满整数分钟时对durationSeconds取余补齐长度，
+  // 即padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))
+  const xScale = (svgWidth - padding * 2) / (match.durationSeconds - 1);
+  let yScale = (svgHeight - padding * 2) / (maxValue * 2);
+
+  // 格式化数字为千分位
+  const formatNumber = (num) => Math.floor(num).toLocaleString();
+
+  // 生成时间标签
+  const generateTimeLabels = (length) => {
+    const labels = [];
+    for (let i = 0; i < length; i += 10) {
+      labels.push(`${i.toString().padStart(2, '0')}:00`);
+    }
+    return labels;
+  };
+
+  const timeLabels = generateTimeLabels(mainData.length - 1).slice(0,Math.floor(match.durationSeconds / 60) % 10 > 5 ? undefined : -1);
+  const valueLabels = [maxValue, maxValue / 2, 0, maxValue / 2 * -1, maxValue * -1];
+  %>
+  <%
+  // 处理主数据点，分割正负区域
+  const mainPoints = mainData.map((value, index) => ({
+    value,
+    test: index * 60,
+    x: padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60)),
+    y: svgHeight / 2 - value * yScale
+  }));
+
+  let upperPoints = [];
+  let lowerPoints = [];
+
+  for (let i = 0; i < mainPoints.length; i++) {
+    const current = mainPoints[i];
+    const next = mainPoints[i + 1];
+
+    // 处理当前点
+    if (current.value >= 0) {
+      upperPoints.push(`${current.x},${current.y}`);
+    } else {
+      lowerPoints.push(`${current.x},${current.y}`);
+    }
+
+    // 处理跨零点的线段
+    if (next) {
+      if ((current.value >= 0 && next.value < 0) || (current.value < 0 && next.value >= 0)) {
+        // 计算线段与零轴的交点
+        const t = Math.abs(current.value) / (Math.abs(current.value) + Math.abs(next.value));
+        const x = current.x + t * (next.x - current.x);
+        const y = svgHeight / 2;
+        upperPoints.push(`${x},${y}`);
+        lowerPoints.push(`${x},${y}`);
+      }
+    }
+  }
+  // 闭合多边形路径
+  upperPoints.push(`${svgWidth - padding},${svgHeight / 2}`, `${padding},${svgHeight / 2}`);
+  lowerPoints.push(`${svgWidth - padding},${svgHeight / 2}`, `${padding},${svgHeight / 2}`);
+
+  // 添加胜率数据处理
+  const winRateMax = 1;
+  const winRateMin = 0;
+  const winRateScale = (svgHeight - padding * 2) / (winRateMax - winRateMin);
+  // 计算胜率折线的坐标
+  const winRatePoints = match.winRates ? [match.winRates[0]].concat(match.winRates).map((value, index) => ({
+    value,
+    x: padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60)),
+    y: svgHeight - padding - value * winRateScale
+  })) : undefined;
+  %>
+  <svg width="<%= svgWidth %>" height="<%= svgHeight %>" xmlns="http://www.w3.org/2000/svg">
+    <text x="50%" y="30" text-anchor="middle" font-size="16" font-weight="bold"><%= $t("dota2tracker.template.situation") %></text>
+    <image x="<%= padding %>" y="<%= padding %>" width="20" height="20" href="<%= utils.getImageUrl("logo_radiant") %>"/>
+    <image x="<%= padding %>" y="<%= svgHeight - padding * 1.4 %>" width="20" height="20" href="<%= utils.getImageUrl("logo_dire") %>"/>
+    <text x="<%= padding + 20 %>" y="<%= padding + 10 %>" dominant-baseline="middle" fill="#3c9028"><%= $t("dota2tracker.template.radiant") %></text>
+    <text x="<%= padding + 20 %>" y="<%= svgHeight - padding * 1.4  + 10 %>" dominant-baseline="middle" fill="#9c3628"><%= $t("dota2tracker.template.dire") %></text>
+    <!-- 横轴线与标签 -->
+    <% for (let i = 0; i < 5; i++) { %>
+      <% const y = padding + i * ((svgHeight - padding * 2) / 4) %>
+      <line x1="<%= padding %>" y1="<%= y %>" x2="<%= svgWidth - padding %>" y2="<%= y %>" stroke="gray" stroke-width="1" />
+      <text x="<%= padding - 2 %>" y="<%= y %>" text-anchor="end" dominant-baseline="middle" fill="#333a"><%= formatNumber(valueLabels[i]) %></text>
+    <% } %>
+
+    <!-- 纵轴线与标签 -->
+    <% for (let i = 0; i < mainData.length - 1; i += 10) { %>
+      <% const x = padding + i * xScale * 60 %>
+      <line x1="<%= x %>" y1="<%= padding %>" x2="<%= x %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
+      <text x="<%= x %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= timeLabels[i / 10] %></text>
+    <% } %>
+    <!-- 额外添加最后一个纵轴线与横轴时间标签 -->
+    <line x1="<%= svgWidth - padding %>" y1="<%= padding %>" x2="<%= svgWidth - padding %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
+    <text x="<%= svgWidth - padding %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= `${Math.floor(match.durationSeconds / 60)}:${(match.durationSeconds % 60).toString().padStart(2, '0')}` %></text>
+
+    <!-- 胜率折线 -->
+    <% if (match.winRates) { %>
+      <polyline points="<%= winRatePoints.map(point => `${point.x},${point.y}`).join(' ') %>" fill="none" stroke="lightgreen" stroke-width="3" />
+    <% } %>
+
+    <!-- 次要数据 -->
+    <polyline points="<%= secondaryData.map((value, index) => `${padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))},${svgHeight / 2 - value * yScale}`).join(' ') %>" fill="none" stroke="gray" stroke-width="1" />
+    <polygon points="<%= secondaryData.map((value, index) => `${padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))},${svgHeight / 2 - value * yScale}`).join(' ') %> <%= svgWidth - padding %>,<%= svgHeight / 2 %> <%= padding %>,<%= svgHeight / 2 %>" fill="rgba(128, 128, 128, 0.3)" />
+
+    <!-- 主要数据 -->
+    <polyline points="<%= mainData.map((value, index) => `${padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))},${svgHeight / 2 - value * yScale}`).join(' ') %>" fill="none" stroke="rgba(100, 100, 100, 0.3)" stroke-width="2" />
+
+    <!-- 正区域填充 -->
+    <polygon points="<%= upperPoints.join(' ') %>" fill="rgba(0, 255, 0, 0.3)" />
+
+    <!-- 负区域填充 -->
+    <polygon points="<%= lowerPoints.join(' ') %>" fill="rgba(255, 0, 0, 0.3)" />
+
+    <!-- 图例 -->
+    <g transform="translate(<%= padding %>, <%= svgHeight - 20 %>)">
+      <!-- 财产总和（折线1） -->
+      <g transform="translate(0, 0)">
+        <!-- 左半段（浅绿色） -->
+        <path d="M0,5 Q5,0 10,5 Z"
+              fill="rgba(0, 255, 0, 0.5)"/>
+
+        <!-- 右半段（浅红色） -->
+        <path d="M10,5 Q15,10 20,5 Z"
+              fill="rgba(255, 0, 0, 0.5)"/>
+
+        <!-- 灰色描边 -->
+        <path d="M0,5 Q5,0 10,5 T20,5"
+              fill="none"
+              stroke="rgba(100, 100, 100, 0.3)"
+              stroke-width="1"/>
+
+        <text x="30" y="7" font-size="12"><%= $t("dota2tracker.template.networth") %></text>
+      </g>
+
+      <!-- 经验（折线2） -->
+      <g transform="translate(120, 0)">
+        <path d="M0,5 Q5,0 10,5 T20,5"
+              fill="none"
+              stroke="gray"
+              stroke-width="1"/>
+        <text x="30" y="7" font-size="12"><%= $t("dota2tracker.template.experience") %></text>
+      </g>
+
+      <!-- 胜率（折线3） -->
+      <g transform="translate(220, 0)">
+        <path d="M0,5 Q5,0 10,5 T20,5"
+              fill="none"
+              stroke="lightgreen"
+              stroke-width="3"/>
+        <text x="30" y="7" font-size="12"><%= $t("dota2tracker.template.winrate") %></text>
+      </g>
+    </g>
+  </svg>
+  <%
+  // 计算每个玩家的财产总和数据
+  const playerNetworthData = match.players.map(player => player.stats.networthPerMinute.concat(player.networth));
+
+  // 找到所有玩家中财产总和的最大值
+  const maxNetworth = Math.max(...playerNetworthData.flat().map(Math.abs));
+
+  // 计算纵坐标轴的刻度
+  const networthValueLabels = [maxNetworth, maxNetworth * 0.75, maxNetworth * 0.5, maxNetworth * 0.25, 0];
+
+  // 获取颜色数据
+  const playerColors = dotaconstants.player_colors;
+
+  yScale = (svgHeight - padding * 2) / maxNetworth;
+  %>
+  <!-- 新增的经济图表 -->
+  <svg width="<%= svgWidth %>" height="<%= svgHeight %>" xmlns="http://www.w3.org/2000/svg">
+    <text x="50%" y="30" text-anchor="middle" font-size="16" font-weight="bold">经济</text>
+    <!-- 横轴线与标签 -->
+    <% for (let i = 0; i < 5; i++) { %>
+      <% const y = padding + i * ((svgHeight - padding * 2) / 4) %>
+      <line x1="<%= padding %>" y1="<%= y %>" x2="<%= svgWidth - padding %>" y2="<%= y %>" stroke="gray" stroke-width="1" />
+      <text x="<%= padding - 2 %>" y="<%= y %>" text-anchor="end" dominant-baseline="middle" fill="#333a"><%= formatNumber(networthValueLabels[i]) %></text>
+    <% } %>
+
+    <!-- 纵轴线与标签 -->
+    <% for (let i = 0; i < mainData.length - 1; i += 10) { %>
+      <% const x = padding + i * xScale * 60 %>
+      <line x1="<%= x %>" y1="<%= padding %>" x2="<%= x %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
+      <text x="<%= x %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= timeLabels[i / 10] %></text>
+    <% } %>
+    <!-- 额外添加最后一个纵轴线与横轴时间标签 -->
+    <line x1="<%= svgWidth - padding %>" y1="<%= padding %>" x2="<%= svgWidth - padding %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
+    <text x="<%= svgWidth - padding %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= `${Math.floor(match.durationSeconds / 60)}:${(match.durationSeconds % 60).toString().padStart(2, '0')}` %></text>
+
+    <!-- 绘制每个玩家的财产总和折线 -->
+    <% playerNetworthData.forEach((playerData, index) => { %>
+      <% const playerSlot = match.players[index].playerSlot; %>
+      <% const color = playerColors[playerSlot] || '#000000'; %>
+      <% const points = playerData.map((value, i) => `${padding + (i * 60 > match.durationSeconds ? ((((i - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (i * xScale * 60))},${svgHeight - padding - value * yScale}`); %>
+      <polyline points="<%= points.join(' ') %>" fill="none" stroke="<%= color %>" stroke-width="2" />
+    <% }) %>
+
+    <!-- 在第二个svg的最后添加以下图例代码 -->
+    <g transform="translate(<%= (svgWidth - (match.players.length * 30)) / 2 %>, <%= svgHeight - 27 %>)">
+      <% match.players.sort((a, b) => a.networth - b.networth).forEach((player, index) => { %>
+        <% const playerSlot = player.playerSlot; %>
+        <% const color = playerColors[playerSlot] || '#000000'; %>
+        <!-- 头像框 -->
+        <rect
+          x="<%= index * 30 %>"
+          y="0"
+          width="24"
+          height="24"
+          rx="6"
+          ry="6"
+          fill="#f0f0f0"
+          stroke="<%= color %>"
+          stroke-width="3"
+        />
+        <image
+          x="<%= index * 30 %>"
+          y="0"
+          width="24"
+          height="24"
+          href="<%= utils.getImageUrl(player.hero.shortName, ImageType.HeroIcons) %>"
+          clip-path="inset(0 round 6)"
+        />
+      <% }) %>
+    </g>
+  </svg>
+</div>

package/template/match/match_2/extra.css

@@ -1,12 +1,12 @@
 html {
-  overflow: auto;
+  overflow: visible;
 }
 
 body {
   /* width: 1200px; */
   display: flex;
   flex-direction: column;
-  overflow: auto;
+  overflow: visible;
 }
 
 #regular {
@@ -42,3 +42,10 @@ body {
 #charts > .title > .logo > img{
   width: 20px;
 }
+
+#extra > .tip {
+  width: 100%;
+  line-height: 4;
+  text-align: center;
+  color: #ccc;
+}

package/template/match/match_2+.ejs

@@ -6,251 +6,18 @@
     <title>Document</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" />
     <%- "<style>" %>
-      <%- include("./match_2/regular.css") %>
+      <%- include("./match_2/original.css") %>
       <%- include("./match_2/extra.css") %>
     <%- "</style>" %>
   </head>
   <body>
-    <section id="regular"><%- include('./match_2/regular') %></section>
+    <section id="regular"><%- include('./match_2/original') %></section>
     <section id="extra">
-      <div id="charts">
-        <% const match = data; %>
-        <%
-        const mainData = match.radiantNetworthLeads;
-
-        const secondaryData = match.radiantExperienceLeads;
-
-        const maxValue = Math.max(...mainData.map(Math.abs), ...secondaryData.map(Math.abs));
-        const minValue = Math.min(...mainData);
-
-        const svgWidth = 400;
-        const svgHeight = 200;
-        const padding = 50;
-
-        // 以秒为步进单位，下方调用时需要×60，并且需要判断不满整数分钟时对durationSeconds取余补齐长度，
-        // 即padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))
-        const xScale = (svgWidth - padding * 2) / (match.durationSeconds - 1);
-        let yScale = (svgHeight - padding * 2) / (maxValue * 2);
-
-        // 格式化数字为千分位
-        const formatNumber = (num) => Math.floor(num).toLocaleString();
-
-        // 生成时间标签
-        const generateTimeLabels = (length) => {
-          const labels = [];
-          for (let i = 0; i < length; i += 10) {
-            labels.push(`${i.toString().padStart(2, '0')}:00`);
-          }
-          return labels;
-        };
-
-        const timeLabels = generateTimeLabels(mainData.length - 1).slice(0,Math.floor(match.durationSeconds / 60) % 10 > 5 ? undefined : -1);
-        const valueLabels = [maxValue, maxValue / 2, 0, maxValue / 2 * -1, maxValue * -1];
-        %>
-        <%
-        // 处理主数据点，分割正负区域
-        const mainPoints = mainData.map((value, index) => ({
-          value,
-          test: index * 60,
-          x: padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60)),
-          y: svgHeight / 2 - value * yScale
-        }));
-
-        let upperPoints = [];
-        let lowerPoints = [];
-
-        for (let i = 0; i < mainPoints.length; i++) {
-          const current = mainPoints[i];
-          const next = mainPoints[i + 1];
-
-          // 处理当前点
-          if (current.value >= 0) {
-            upperPoints.push(`${current.x},${current.y}`);
-          } else {
-            lowerPoints.push(`${current.x},${current.y}`);
-          }
-
-          // 处理跨零点的线段
-          if (next) {
-            if ((current.value >= 0 && next.value < 0) || (current.value < 0 && next.value >= 0)) {
-              // 计算线段与零轴的交点
-              const t = Math.abs(current.value) / (Math.abs(current.value) + Math.abs(next.value));
-              const x = current.x + t * (next.x - current.x);
-              const y = svgHeight / 2;
-              upperPoints.push(`${x},${y}`);
-              lowerPoints.push(`${x},${y}`);
-            }
-          }
-        }
-        // 闭合多边形路径
-        upperPoints.push(`${svgWidth - padding},${svgHeight / 2}`, `${padding},${svgHeight / 2}`);
-        lowerPoints.push(`${svgWidth - padding},${svgHeight / 2}`, `${padding},${svgHeight / 2}`);
-
-        // 添加胜率数据处理
-        const winRateMax = 1;
-        const winRateMin = 0;
-        const winRateScale = (svgHeight - padding * 2) / (winRateMax - winRateMin);
-        // 计算胜率折线的坐标
-        const winRatePoints = match.winRates ? [match.winRates[0]].concat(match.winRates).map((value, index) => ({
-          value,
-          x: padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60)),
-          y: svgHeight - padding - value * winRateScale
-        })) : undefined;
-        %>
-        <svg width="<%= svgWidth %>" height="<%= svgHeight %>" xmlns="http://www.w3.org/2000/svg">
-          <text x="50%" y="30" text-anchor="middle" font-size="16" font-weight="bold"><%= $t("dota2tracker.template.situation") %></text>
-          <image x="<%= padding %>" y="<%= padding %>" width="20" height="20" href="<%= utils.getImageUrl("logo_radiant") %>"/>
-          <image x="<%= padding %>" y="<%= svgHeight - padding * 1.4 %>" width="20" height="20" href="<%= utils.getImageUrl("logo_dire") %>"/>
-          <text x="<%= padding + 20 %>" y="<%= padding + 10 %>" dominant-baseline="middle" fill="#3c9028"><%= $t("dota2tracker.template.radiant") %></text>
-          <text x="<%= padding + 20 %>" y="<%= svgHeight - padding * 1.4  + 10 %>" dominant-baseline="middle" fill="#9c3628"><%= $t("dota2tracker.template.dire") %></text>
-          <!-- 横轴线与标签 -->
-          <% for (let i = 0; i < 5; i++) { %>
-            <% const y = padding + i * ((svgHeight - padding * 2) / 4) %>
-            <line x1="<%= padding %>" y1="<%= y %>" x2="<%= svgWidth - padding %>" y2="<%= y %>" stroke="gray" stroke-width="1" />
-            <text x="<%= padding - 2 %>" y="<%= y %>" text-anchor="end" dominant-baseline="middle" fill="#333a"><%= formatNumber(valueLabels[i]) %></text>
-          <% } %>
-
-          <!-- 纵轴线与标签 -->
-          <% for (let i = 0; i < mainData.length - 1; i += 10) { %>
-            <% const x = padding + i * xScale * 60 %>
-            <line x1="<%= x %>" y1="<%= padding %>" x2="<%= x %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
-            <text x="<%= x %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= timeLabels[i / 10] %></text>
-          <% } %>
-          <!-- 额外添加最后一个纵轴线与横轴时间标签 -->
-          <line x1="<%= svgWidth - padding %>" y1="<%= padding %>" x2="<%= svgWidth - padding %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
-          <text x="<%= svgWidth - padding %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= `${Math.floor(match.durationSeconds / 60)}:${(match.durationSeconds % 60).toString().padStart(2, '0')}` %></text>
-
-          <!-- 胜率折线 -->
-          <% if (match.winRates) { %>
-            <polyline points="<%= winRatePoints.map(point => `${point.x},${point.y}`).join(' ') %>" fill="none" stroke="lightgreen" stroke-width="3" />
-          <% } %>
-
-          <!-- 次要数据 -->
-          <polyline points="<%= secondaryData.map((value, index) => `${padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))},${svgHeight / 2 - value * yScale}`).join(' ') %>" fill="none" stroke="gray" stroke-width="1" />
-          <polygon points="<%= secondaryData.map((value, index) => `${padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))},${svgHeight / 2 - value * yScale}`).join(' ') %> <%= svgWidth - padding %>,<%= svgHeight / 2 %> <%= padding %>,<%= svgHeight / 2 %>" fill="rgba(128, 128, 128, 0.3)" />
-
-          <!-- 主要数据 -->
-          <polyline points="<%= mainData.map((value, index) => `${padding + (index * 60 > match.durationSeconds ? ((((index - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (index * xScale * 60))},${svgHeight / 2 - value * yScale}`).join(' ') %>" fill="none" stroke="rgba(100, 100, 100, 0.3)" stroke-width="2" />
-
-          <!-- 正区域填充 -->
-          <polygon points="<%= upperPoints.join(' ') %>" fill="rgba(0, 255, 0, 0.3)" />
-
-          <!-- 负区域填充 -->
-          <polygon points="<%= lowerPoints.join(' ') %>" fill="rgba(255, 0, 0, 0.3)" />
-
-          <!-- 图例 -->
-          <g transform="translate(<%= padding %>, <%= svgHeight - 20 %>)">
-            <!-- 财产总和（折线1） -->
-            <g transform="translate(0, 0)">
-              <!-- 左半段（浅绿色） -->
-              <path d="M0,5 Q5,0 10,5 Z"
-                    fill="rgba(0, 255, 0, 0.5)"/>
-
-              <!-- 右半段（浅红色） -->
-              <path d="M10,5 Q15,10 20,5 Z"
-                    fill="rgba(255, 0, 0, 0.5)"/>
-
-              <!-- 灰色描边 -->
-              <path d="M0,5 Q5,0 10,5 T20,5"
-                    fill="none"
-                    stroke="rgba(100, 100, 100, 0.3)"
-                    stroke-width="1"/>
-
-              <text x="30" y="7" font-size="12"><%= $t("dota2tracker.template.networth") %></text>
-            </g>
-
-            <!-- 经验（折线2） -->
-            <g transform="translate(120, 0)">
-              <path d="M0,5 Q5,0 10,5 T20,5"
-                    fill="none"
-                    stroke="gray"
-                    stroke-width="1"/>
-              <text x="30" y="7" font-size="12"><%= $t("dota2tracker.template.experience") %></text>
-            </g>
-
-            <!-- 胜率（折线3） -->
-            <g transform="translate(220, 0)">
-              <path d="M0,5 Q5,0 10,5 T20,5"
-                    fill="none"
-                    stroke="lightgreen"
-                    stroke-width="3"/>
-              <text x="30" y="7" font-size="12"><%= $t("dota2tracker.template.winrate") %></text>
-            </g>
-          </g>
-        </svg>
-        <%
-        // 计算每个玩家的财产总和数据
-        const playerNetworthData = match.players.map(player => player.stats.networthPerMinute.concat(player.networth));
-
-        // 找到所有玩家中财产总和的最大值
-        const maxNetworth = Math.max(...playerNetworthData.flat().map(Math.abs));
-
-        // 计算纵坐标轴的刻度
-        const networthValueLabels = [maxNetworth, maxNetworth * 0.75, maxNetworth * 0.5, maxNetworth * 0.25, 0];
-
-        // 获取颜色数据
-        const playerColors = dotaconstants.player_colors;
-
-        yScale = (svgHeight - padding * 2) / maxNetworth;
-        %>
-        <!-- 新增的经济图表 -->
-        <svg width="<%= svgWidth %>" height="<%= svgHeight %>" xmlns="http://www.w3.org/2000/svg">
-          <text x="50%" y="30" text-anchor="middle" font-size="16" font-weight="bold">经济</text>
-          <!-- 横轴线与标签 -->
-          <% for (let i = 0; i < 5; i++) { %>
-            <% const y = padding + i * ((svgHeight - padding * 2) / 4) %>
-            <line x1="<%= padding %>" y1="<%= y %>" x2="<%= svgWidth - padding %>" y2="<%= y %>" stroke="gray" stroke-width="1" />
-            <text x="<%= padding - 2 %>" y="<%= y %>" text-anchor="end" dominant-baseline="middle" fill="#333a"><%= formatNumber(networthValueLabels[i]) %></text>
-          <% } %>
-
-          <!-- 纵轴线与标签 -->
-          <% for (let i = 0; i < mainData.length - 1; i += 10) { %>
-            <% const x = padding + i * xScale * 60 %>
-            <line x1="<%= x %>" y1="<%= padding %>" x2="<%= x %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
-            <text x="<%= x %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= timeLabels[i / 10] %></text>
-          <% } %>
-          <!-- 额外添加最后一个纵轴线与横轴时间标签 -->
-          <line x1="<%= svgWidth - padding %>" y1="<%= padding %>" x2="<%= svgWidth - padding %>" y2="<%= svgHeight - padding %>" stroke="lightgray" stroke-width="1" />
-          <text x="<%= svgWidth - padding %>" y="<%= svgHeight - padding + 15 %>" text-anchor="middle" fill="#333a"><%= `${Math.floor(match.durationSeconds / 60)}:${(match.durationSeconds % 60).toString().padStart(2, '0')}` %></text>
-
-          <!-- 绘制每个玩家的财产总和折线 -->
-          <% playerNetworthData.forEach((playerData, index) => { %>
-            <% const playerSlot = match.players[index].playerSlot; %>
-            <% const color = playerColors[playerSlot] || '#000000'; %>
-            <% const points = playerData.map((value, i) => `${padding + (i * 60 > match.durationSeconds ? ((((i - 1) * 60) + (match.durationSeconds % 60)) * xScale) : (i * xScale * 60))},${svgHeight - padding - value * yScale}`); %>
-            <polyline points="<%= points.join(' ') %>" fill="none" stroke="<%= color %>" stroke-width="2" />
-          <% }) %>
-
-          <!-- 在第二个svg的最后添加以下图例代码 -->
-          <g transform="translate(<%= (svgWidth - (match.players.length * 30)) / 2 %>, <%= svgHeight - 27 %>)">
-            <% match.players.forEach((player, index) => { %>
-              <% const playerSlot = player.playerSlot; %>
-              <% const color = playerColors[playerSlot] || '#000000'; %>
-              <!-- 头像占位符（后续可替换为实际图片） -->
-              <rect
-                x="<%= index * 30 %>"
-                y="0"
-                width="24"
-                height="24"
-                rx="6"
-                ry="6"
-                fill="#f0f0f0"
-                stroke="<%= color %>"
-                stroke-width="3"
-              />
-              <!-- 临时文字标识（调试用，完成后可移除） -->
-              <image
-                x="<%= index * 30 %>"
-                y="0"
-                width="24"
-                height="24"
-                href="<%= utils.getImageUrl(player.hero.shortName, ImageType.HeroIcons) %>"
-                clip-path="inset(0 round 6)"
-              />
-            <% }) %>
-          </g>
-        </svg>
-      </div>
+      <% if (data.parsedDateTime && data.radiantNetworthLeads && data.radiantExperienceLeads) { %>
+        <%- include('./match_2/charts') %>
+      <% } else { %>
+        <div class="tip">比赛未解析或无局势信息，无法展示更多数据。</div>
+      <% } %>
     </section>
   </body>
 </html>

package/template/match/match_2.ejs

@@ -6,10 +6,10 @@
     <title>Document</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" />
     <%- "<style>" %>
-      <%- include("./match_2/regular.css") %>
+      <%- include("./match_2/original.css") %>
     <%- "</style>" %>
   </head>
   <body>
-    <%- include('./match_2/regular') %>
+    <%- include('./match_2/original') %>
   </body>
 </html>