@sjtdev/koishi-plugin-dota2tracker 1.5.0-pre.2 → 1.5.0-pre.4

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>估算的段位将以灰色图片显示" } } };
   }
 });
 
@@ -610,7 +610,7 @@ var require_zh_CN_command = __commonJS({
 // src/locales/zh-CN.template.yml
 var require_zh_CN_template = __commonJS({
   "src/locales/zh-CN.template.yml"(exports2, module2) {
-    module2.exports = { dota2tracker: { template: { radiant: "天辉", dire: "夜魇", won: "获胜", lost: "失败", match_id_: "比赛编号：{0}", game_mode_: "模式：{0}", start_time_: "起始时间：{0}", end_time_: "结束时间：{0}", pick_order: "第{0}手", random: "随机", hero_damage_: "英雄伤害：{0}", building_damage_: "建筑伤害：{0}", damage_received_: "受到伤害：{0}", lasthit_: "补刀：{0}", deny_: "反补：{0}", "lh/dn_": "补刀：{0}/{1}", GPM: "GPM", XPM: "XPM", heal_: "治疗量：{0}", crowd_control_duration_: "控制时间：{0}", "GPM/XPM_": "GPM/XPM：{0}", lane: "对线", lane_: "对线：", lane_advantage: "对线优势", lane_disadvantage: "对线劣势", lane_stomp: "对线碾压", lane_stomped: "对线被碾", lane_tie: "对线平手", lane_jungle: "野区霸主", analysis_successful: "录像分析成功", analysis_incomplete: "分析结果不完整", kill: "击杀", kill_contribution_: "参战率：{0}", position: "位置", position_: "位置：", position_1: "优势路", position_2: "中路", position_3: "烈士路", position_4: "采灵芝", position_5: "工具人", position_undefined: "?", total_damage: "总伤害", total_gold: "总经济", total_experience: "总经验", radiant_won: "天辉获胜", dire_won: "夜魇获胜", duration_: "持续时间：{0}", region_: "地区：{0}", match_count_: "场次：", last25matches_: "最近25场：", winrate_: "胜率：", imp_: "表现：", lane_advantage_rate_: "线优率：", top10_: "全期场次前十的英雄：", hero: "英雄", all_matches_: "全期场次：", match_count: "场次", winrate: "胜率", imp: "表现", win_count: "胜场", lose_count: "败场", recently_heroes: "近期使用场次大于1的英雄：", recently_positions: "近25场各个位置的表现：", winning_streak: "连胜", losing_streak: "连败", id: "ID", mode: "模式", kda_kc: "KDA(参战率)", time: "时间", duration: "时长", rank: "段位", un_parsed: "（未解析）", combined_win_loss_summary: "组合胜负情况：", yesterdays_summary: "昨日总结", last_weeks_summary: "上周总结", report_won: "胜", report_lost: "负", report_winrate: "胜率", anonymous_player_1: "数据未公开", anonymous_player_2: "背景仅供展示目的，不属于{player}的数据。", rank_fun_up_message: "热烈祝贺群友 {avatar}{name} 在天梯中再获进步，<br/>由 {prev} 升为 {curr}，再接再厉，再创辉煌！", rank_fun_down_message: "{avatar}<br/>寄", titles: { MVP: "MVP-#FFA500", Soul: "魂-#66CCFF", Rich: "富-#FFD700", Wise: "睿-#8888FF", Controller: "控-#FF00FF", Nuker: "爆-#CC0088", Breaker: "破-#DD0000", Ghost: "鬼-#CCCCCC", Assister: "助-#006400", Demolisher: "拆-#FEDCBA", Healer: "奶-#00FF00", Tank: "耐-#84A1C7", Idle: "摸-#DDDDDD" }, situation: "局势", networth: "财产总和", experience: "经验" } } };
+    module2.exports = { dota2tracker: { template: { radiant: "天辉", dire: "夜魇", won: "获胜", lost: "失败", match_id_: "比赛编号：{0}", game_mode_: "模式：{0}", start_time_: "起始时间：{0}", end_time_: "结束时间：{0}", pick_order: "第{0}手", random: "随机", hero_damage_: "英雄伤害：{0}", building_damage_: "建筑伤害：{0}", damage_received_: "受到伤害：{0}", lasthit_: "补刀：{0}", deny_: "反补：{0}", "lh/dn_": "补刀：{0}/{1}", GPM: "GPM", XPM: "XPM", heal_: "治疗量：{0}", crowd_control_duration_: "控制时间：{0}", "GPM/XPM_": "GPM/XPM：{0}", lane: "对线", lane_: "对线：", lane_advantage: "对线优势", lane_disadvantage: "对线劣势", lane_stomp: "对线碾压", lane_stomped: "对线被碾", lane_tie: "对线平手", lane_jungle: "野区霸主", analysis_successful: "录像分析成功", analysis_incomplete: "分析结果不完整", kill: "击杀", kill_contribution_: "参战率：{0}", position: "位置", position_: "位置：", position_1: "优势路", position_2: "中路", position_3: "烈士路", position_4: "采灵芝", position_5: "工具人", position_undefined: "?", total_damage: "总伤害", total_gold: "总经济", total_experience: "总经验", radiant_won: "天辉获胜", dire_won: "夜魇获胜", duration_: "持续时间：{0}", region_: "地区：{0}", match_count_: "场次：", last25matches_: "最近25场：", winrate_: "胜率：", imp_: "表现：", lane_advantage_rate_: "线优率：", top10_: "全期场次前十的英雄：", hero: "英雄", all_matches_: "全期场次：", match_count: "场次", winrate: "胜率", imp: "表现", win_count: "胜场", lose_count: "败场", recently_heroes: "近期使用场次大于1的英雄：", recently_positions: "近25场各个位置的表现：", winning_streak: "连胜", losing_streak: "连败", id: "ID", mode: "模式", kda_kc: "KDA(参战率)", time: "时间", duration: "时长", rank: "段位", un_parsed: "（未解析）", combined_win_loss_summary: "组合胜负情况：", yesterdays_summary: "昨日总结", last_weeks_summary: "上周总结", report_won: "胜", report_lost: "负", report_winrate: "胜率", anonymous_player_1: "数据未公开", anonymous_player_2: "背景仅供展示目的，不属于{player}的数据。", rank_fun_up_message: "热烈祝贺群友 {avatar}{name} 在天梯中再获进步，<br/>由 {prev} 升为 {curr}，再接再厉，再创辉煌！", rank_fun_down_message: "{avatar}<br/>寄", titles: { MVP: "MVP-#FFA500", Soul: "魂-#66CCFF", Rich: "富-#FFD700", Wise: "睿-#8888FF", Controller: "控-#FF00FF", Nuker: "爆-#CC0088", Breaker: "破-#DD0000", Ghost: "鬼-#CCCCCC", Assister: "助-#006400", Demolisher: "拆-#FEDCBA", Healer: "奶-#00FF00", Tank: "耐-#84A1C7", Idle: "摸-#DDDDDD" }, situation: "局势", networth: "财产总和", experience: "经验", OUTCOME_MAP: { RADIANT_VICTORY: "天辉优势", RADIANT_STOMP: "天辉碾压", DIRE_VICTORY: "夜魇优势", DIRE_STOMP: "夜魇碾压", TIE: "势均力敌" }, lane_top: "上路", lane_mid: "中路", lane_bottom: "下路" } } };
   }
 });
 
@@ -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,7 +1384,9 @@ 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) => {
@@ -1394,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({
@@ -1446,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`));
@@ -1711,7 +1716,7 @@ async function apply(ctx, config) {
         }).then((response) => ctx.logger.info($t(GlobalLanguageTag, `dota2tracker.logger.parse_request_${response.stratz.matchRetry ? "sent" : "failed"}`, { matchId: matchQuery.match.id })));
       }
     } catch (error) {
-      session.send(session.text(".query_failed"));
+      session.send(session.text("commands.dota2tracker.query-match.messages.query_failed"));
       ctx.logger.error(error);
     }
   });

package/package.json

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

package/queries/MatchInfo.graphql

@@ -70,6 +70,10 @@ query MatchInfo($matchId: Long!) {
           stackCount
         }
         networthPerMinute
+        experiencePerMinute
+        killEvents{time}
+        deathEvents{time}
+        assistEvents{time}
       }
       heroDamage
       towerDamage

package/template/match/match_2/original.css

@@ -89,11 +89,11 @@ nav > .rank > img {
   flex-direction: column;
 }
 
-.panel {
+.players .panel {
   padding: 0 10px;
 }
 
-.panel {
+.players .panel {
   padding-top: 4px;
   height: 40px;
   border-top: 3px solid #fff;
@@ -101,21 +101,21 @@ nav > .rank > img {
   display: grid;
   grid-template-columns: 32px 56px 378px repeat(4,1fr);
 }
-.panel.radiant {
+.players .panel.radiant {
   border-color: #3c9028;
 }
-.panel.dire {
+.players .panel.dire {
   border-color: #9c3628;
 }
-.panel p{
+.players .panel p{
   line-height: 16px;
   margin-left: 8px;
 }
-.panel .win{
+.players .panel .win{
   font-size: 20px;
   line-height: 32px;
 }
-.panel .data{
+.players .panel .data{
   color: #aaa;
 }
 

package/template/match/match_2+/extra.css

@@ -0,0 +1,131 @@
+html {
+  overflow: visible;
+}
+
+body {
+  /* width: 1200px; */
+  display: flex;
+  flex-direction: column;
+  overflow: visible;
+}
+
+#regular {
+  width: 800px;
+}
+
+#extra {
+  display: flex;
+  width: 800px;
+  flex-direction: row;
+}
+
+#charts {
+  display: flex;
+  flex-direction: column;
+  width: 50%;
+}
+
+#charts > svg {
+  font-size: 10px;
+}
+
+#charts > .title {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+
+#charts > .title > .logo {
+  display: flex;
+  padding: 0 25px;
+}
+
+#charts > .title > .logo > img {
+  width: 20px;
+}
+
+#extra > .tip {
+  width: 100%;
+  line-height: 4;
+  text-align: center;
+  color: #ccc;
+}
+
+.lane_outcome {
+  display: flex;
+  flex-direction: column;
+  width: 386px;
+  margin-right: 14px;
+}
+
+.lane_outcome > .title {
+  width: 100%;
+  text-align: center;
+  padding: 0;
+  margin: 0;
+  line-height: 50px;
+}
+
+.lane_outcome .panel {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  justify-content: space-evenly;
+}
+
+.lane_outcome .panel .lane {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+.lane_outcome .panel .lane > .title {
+  width: 100%;
+  text-align: center;
+  height: 32px;
+}
+
+.lane_outcome .panel .lane > .title > p:nth-child(1){
+  font-size: 12px;
+}
+
+.lane_outcome .panel .lane > .title > p:nth-child(2){
+  font-size: 14px;
+}
+
+.lane_outcome .panel .details {
+  display: grid;
+  grid-template-columns: 24px 32px 44px auto 44px 32px 24px;
+  grid-template-rows: 1fr;
+  gap: 1px;
+  font-size: 12px;
+  height: 32px;
+  line-height: 32px;
+  align-items: center;
+}
+
+.lane_outcome .panel .lane img.hero{
+  width: 24px;
+  height: 24px;
+}
+
+.lane_outcome .panel .lane .kda {
+  height: 100%;
+  line-height: 32px;
+  text-align: center;
+  font-size: 10px;
+}
+
+.lane_outcome .panel .lane .graph {
+  height: 32px;
+  display: flex;
+  align-items: center;
+}
+
+.graph svg {
+  shape-rendering: crispEdges;
+}
+.graph text {
+  dominant-baseline: middle; /* 垂直居中 */
+  white-space: nowrap; /* 防止换行 */
+}

package/template/match/match_2+/lane_outcome.ejs

@@ -0,0 +1,143 @@
+<% const match = data; %>
+<%
+function generateLevelCircle(xp) {
+  const XP_LEVELS = dotaconstants.xp_level;
+  let level = XP_LEVELS.findIndex(l => xp < l) - 1;
+  if (level < 0) level = XP_LEVELS.length - 1;
+  const currentXP = xp - XP_LEVELS[level];
+  const nextXP = XP_LEVELS[level+1] - XP_LEVELS[level];
+  const percentage = currentXP / nextXP * 100;
+  // return { level, progress: currentXP / nextXP };
+  const config = {
+    radius: 12,
+    strokeColor: '#ffd700',
+    bgColor: '#eee',
+    strokeWidth: 2,
+    svgSize: 32,
+    showBackground: true,
+    // 新增文字配置
+    showText: true,             // 是否显示文字
+    textColor: '#333',          // 文字颜色
+    fontSize: 12 * 0.8,
+    fontWeight: 'bold',         // 字体粗细
+    // ...options
+  };
+
+  const center = config.svgSize / 2;
+  const circumference = 2 * Math.PI * config.radius;
+  const progress = circumference * (percentage / 100);
+  const gap = circumference - progress;
+
+  return `
+<svg width="${config.svgSize}" height="${config.svgSize}" viewBox="0 0 ${config.svgSize} ${config.svgSize}">
+  ${config.showBackground ? `
+  <circle cx="${center}" cy="${center}" r="${config.radius}"
+          fill="none" stroke="${config.bgColor}"
+          stroke-width="${config.strokeWidth}"/>
+  ` : ''}
+
+  <circle cx="${center}" cy="${center}" r="${config.radius}"
+          fill="none" stroke="${config.strokeColor}"
+          stroke-width="${config.strokeWidth}"
+          stroke-dasharray="${progress} ${gap}"
+          stroke-linecap="round"
+          transform="rotate(-90 ${center} ${center})"/>
+
+  ${config.showText ? `
+  <!-- 居中文字 -->
+  <text x="${center}" y="${center}"
+        text-anchor="middle"    // 水平居中
+        dominant-baseline="middle" // 垂直居中
+        fill="${config.textColor}"
+        font-size="${config.fontSize}px"
+        font-weight="${config.fontWeight}"
+        font-family="Arial, sans-serif">
+    ${level}
+  </text>
+  ` : ''}
+</svg>`;
+}
+
+function generateDetails(rivals) {
+  const svgHeight = 32;
+
+  rivals.sort((a, b) => b.isRadiant - a.isRadiant);
+  const gold = { radiant: rivals[0].stats.networthPerMinute.at(Math.min(10, rivals[0].stats.networthPerMinute.length - 1)), dire: rivals[1].stats.networthPerMinute.at(Math.min(10, rivals[1].stats.networthPerMinute.length - 1)) };
+  const kills = { radiant: rivals[0].stats.killEvents?.filter(e => e.time <= 600).length || 0, dire: rivals[1].stats.killEvents?.filter(e => e.time <= 600).length || 0 }
+  const deaths = { radiant: rivals[0].stats.deathEvents?.filter(e => e.time <= 600).length || 0, dire: rivals[1].stats.deathEvents?.filter(e => e.time <= 600).length || 0 }
+  const assists = { radiant: rivals[0].stats.assistEvents?.filter(e => e.time <= 600).length || 0, dire: rivals[1].stats.assistEvents?.filter(e => e.time <= 600).length || 0 }
+  const goldSplit = gold.radiant / (gold.radiant + gold.dire);
+  return `
+<div class="details">
+<img src="${utils.getImageUrl(rivals[0].hero.shortName, ImageType.HeroIcons)}" class="hero radiant" />
+${generateLevelCircle(rivals[0].stats.experiencePerMinute.slice(0, Math.min(11, rivals[0].stats.experiencePerMinute.length - 1)).reduce((a, b) => a + b, 0))}
+<p class="kda">${kills.radiant}/${deaths.radiant}/${assists.radiant}</p>
+<div class="graph">
+  <svg width="100%" height="${svgHeight}" viewBox="0 0 180 ${svgHeight}">
+
+    <!-- 经济差 -->
+    <g transform="translate(0,0)">
+      <rect y="9" width="180" height="14" fill="#9c3628"/>
+      <rect y="9" width="${180 * goldSplit}" height="14" fill="#3c9028"/>
+      <line x1="${180 * goldSplit}" y1="9" x2="${180 * goldSplit}" y2="25"
+          stroke="#fff" stroke-width="1"/>
+
+      <!-- 左侧数值（天辉） -->
+      <text x="5" y="50%"
+      dominant-baseline="middle"
+          fill="#fff"
+          font-size="10"
+          text-anchor="start">${gold.radiant}</text>
+
+      <!-- 右侧数值（夜魇） -->
+      <text x="175" y="50%"
+      dominant-baseline="middle"
+          fill="#fff"
+          font-size="10"
+          text-anchor="end">${gold.dire}</text>
+
+      <!-- 差值（上方） -->
+      <text x="${180 * goldSplit}"
+          y="5px"
+          dominant-baseline="middle"
+          fill="${gold.radiant > gold.dire ? "#3c9028" : "#9c3628"}"
+          font-size="10"
+          text-anchor="middle">+${Math.abs(gold.dire - gold.radiant)}</text>
+    </g>
+  </svg>
+</div>
+<p class="kda">${kills.dire}/${deaths.dire}/${assists.dire}</p>
+${generateLevelCircle(rivals[1].stats.experiencePerMinute.slice(0, Math.min(11, rivals[1].stats.experiencePerMinute.length - 1)).reduce((a, b) => a + b, 0))}
+<img src="${utils.getImageUrl(rivals[1].hero.shortName, ImageType.HeroIcons)}" class="hero dire" />
+</div>
+`
+}
+%>
+<div class="lane_outcome">
+  <h4 class="title">对线</h4>
+  <div class="panel">
+    <div class="lane">
+      <div class="title">
+        <p><%= $t("dota2tracker.template.lane_top") %></p>
+        <p class="<%= match.topLaneOutcome.split("_")[0].toLowerCase() %>"><%= $t("dota2tracker.template.OUTCOME_MAP."+match.topLaneOutcome) %></p>
+      </div>
+      <%- generateDetails(match.players.filter(p => (p.position.slice(-1) == 3 && p.isRadiant) || (p.position.slice(-1) == 1 && !p.isRadiant))) %>
+      <%- generateDetails(match.players.filter(p => (p.position.slice(-1) == 4 && p.isRadiant) || (p.position.slice(-1) == 5 && !p.isRadiant))) %>
+    </div>
+    <div class="lane">
+      <div class="title">
+        <p><%= $t("dota2tracker.template.lane_mid") %></p>
+        <p class="<%= match.midLaneOutcome.split("_")[0].toLowerCase() %>"><%= $t("dota2tracker.template.OUTCOME_MAP."+match.midLaneOutcome) %></p>
+      </div>
+      <%- generateDetails(match.players.filter(p => p.position.slice(-1) == 2)) %>
+    </div>
+    <div class="lane">
+      <div class="title">
+        <p><%= $t("dota2tracker.template.lane_bottom") %></p>
+        <p class="<%= match.bottomLaneOutcome.split("_")[0].toLowerCase() %>"><%= $t("dota2tracker.template.OUTCOME_MAP."+match.bottomLaneOutcome) %></p>
+      </div>
+      <%- generateDetails(match.players.filter(p => (p.position.slice(-1) == 1 && p.isRadiant) || (p.position.slice(-1) == 3 && !p.isRadiant))) %>
+      <%- generateDetails(match.players.filter(p => (p.position.slice(-1) == 5 && p.isRadiant) || (p.position.slice(-1) == 4 && !p.isRadiant))) %>
+    </div>
+  </div>
+</div>

package/template/match/match_2+.ejs

@@ -7,14 +7,15 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css" />
     <%- "<style>" %>
       <%- include("./match_2/original.css") %>
-      <%- include("./match_2/extra.css") %>
+      <%- include("./match_2+/extra.css") %>
     <%- "</style>" %>
   </head>
   <body>
     <section id="regular"><%- include('./match_2/original') %></section>
     <section id="extra">
       <% if (data.parsedDateTime && data.radiantNetworthLeads && data.radiantExperienceLeads) { %>
-        <%- include('./match_2/charts') %>
+        <%- include('./match_2+/charts') %>
+        <%- include('./match_2+/lane_outcome') %>
       <% } else { %>
         <div class="tip">比赛未解析或无局势信息，无法展示更多数据。</div>
       <% } %>

package/template/match/match_2/extra.css

@@ -1,51 +0,0 @@
-html {
-  overflow: visible;
-}
-
-body {
-  /* width: 1200px; */
-  display: flex;
-  flex-direction: column;
-  overflow: visible;
-}
-
-#regular {
-  width: 800px;
-}
-
-#extra {
-  display: flex;
-  width: 800px;
-}
-
-#charts {
-  display: flex;
-  flex-direction: row;
-  width: 100%;
-}
-
-#charts > svg {
-  font-size: 10px;
-}
-
-#charts > .title {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-
-#charts > .title > .logo {
-  display: flex;
-  padding: 0 25px;
-}
-
-#charts > .title > .logo > img{
-  width: 20px;
-}
-
-#extra > .tip {
-  width: 100%;
-  line-height: 4;
-  text-align: center;
-  color: #ccc;
-}