@sjtdev/koishi-plugin-dota2tracker 1.2.10 → 1.2.11

package/changelog.md

@@ -1,3 +1,7 @@
+# 1.2.11
+**新增&改进**：
+- 对战报模板添加命石显示，微调了其他信息的显示效果以适配此改动。
+
 # 1.2.10
 **新增**：
 - 添加对新英雄`百戏大王`的支持。（战报播报、查询英雄等）
@@ -63,8 +67,8 @@
 - 将战报中的播报评语由随机选取改为固定种子：比赛ID+玩家SteamID+玩家位置，确保在不同调用时刻、次数及平台下，对同一场比赛中的玩家评语保持一致。
 - `查询玩家`指令图片中，玩家近期比赛表中未解析的场次参战率由"?%"改为估算值，显示为"≈xx%"。
 - `查询英雄`指令图片中，由于命石带来的属性数值无法确定作用方式（增加或是替换等），去除命石属性前的“+”，请结合命石说明自行判断。（7.37版本更新带来的API变动，导致使用指令查询某些英雄报错问题，暂无法解决）
-- 比赛图片模板`match_2`中，现在冠绝排名数字位置更准确了。
-- 比赛图片模板`match_2`中，比赛段位可以显示星级了。
+- 战报模板`match_2`中，现在冠绝排名数字位置更准确了。
+- 战报模板`match_2`中，比赛段位可以显示星级了。
 
 <details>
 <summary>为什么未解析的比赛需要“估算”？</summary>
@@ -82,8 +86,8 @@
 
 ##### pre.2
 **改进**：
-- 比赛图片模板`match_2`中，现在冠绝排名数字位置更准确了。
-- 比赛图片模板`match_2`中，比赛段位可以显示星级了。
+- 战报模板`match_2`中，现在冠绝排名数字位置更准确了。
+- 战报模板`match_2`中，比赛段位可以显示星级了。
 </details>
 
 # 1.2.7

package/lib/index.js

@@ -110,8 +110,12 @@ function MATCH_INFO(matchId) {
             id
             name
             shortName
+            facets {
+              facetId
+            }
           }
-          dotaPlus{
+          variant
+          dotaPlus {
             level
           }
           leaverStatus
@@ -168,7 +172,6 @@ function MATCH_INFO(matchId) {
           goldPerMinute
           experiencePerMinute
           heroHealing
-          
           stats {
             campStack
             heroDamageReport {
@@ -182,7 +185,7 @@ function MATCH_INFO(matchId) {
               }
             }
           }
-          additionalUnit{
+          additionalUnit {
             item0Id
             item1Id
             item2Id
@@ -194,7 +197,6 @@ function MATCH_INFO(matchId) {
             backpack2Id
             neutral0Id
           }
-
           isRandom
         }
         pickBans {
@@ -204,6 +206,13 @@ function MATCH_INFO(matchId) {
           order
         }
       }
+      constants {
+        facets {
+          id
+          color
+          icon
+        }
+      }
     }
     
 `;
@@ -564,7 +573,8 @@ function getImageUrl(image, type = "local" /* Local */, format = "png" /* png */
     return `https://cdn.cloudflare.steamstatic.com/apps/dota2/images/dota_react/${type}/${image}.${format}`;
 }
 __name(getImageUrl, "getImageUrl");
-function getFormattedMatchData(match) {
+function getFormattedMatchData(data) {
+  const { match, constants } = data;
   ["radiant", "dire"].forEach((team) => {
     match[team] = { killsCount: match[team + "Kills"]?.reduce((acc, cva) => acc + cva, 0) ?? 0, damageReceived: 0, heroDamage: 0, networth: 0, experience: 0 };
   });
@@ -772,6 +782,9 @@ function getFormattedMatchData(match) {
         }
       }
     }
+    if (player.variant != null) {
+      player.facet = constants.facets.find((facet) => facet.id == player.hero.facets[player.variant - 1].facetId);
+    }
   });
   let ComparisonMode;
   ((ComparisonMode2) => {
@@ -1383,7 +1396,7 @@ async function apply(ctx, config) {
         match = queryLocal[0].data;
         ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
       } else {
-        match = getFormattedMatchData((await query(MATCH_INFO(matchId))).data.match);
+        match = getFormattedMatchData((await query(MATCH_INFO(matchId))).data);
       }
       if (match && (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore((0, import_moment.default)().subtract(config.dataParsingTimeoutMinutes, "minutes")))) {
         session.send((ctx.config.urlInMessageType.some((type) => type == "match") ? "https://stratz.com/matches/" + matchId : "") + await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */)));
@@ -1735,7 +1748,7 @@ async function apply(ctx, config) {
             match = queryLocal[0].data;
             ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
           } else
-            match = getFormattedMatchData((await query(MATCH_INFO(pendingMatch.matchId))).data.match);
+            match = getFormattedMatchData((await query(MATCH_INFO(pendingMatch.matchId))).data);
           if (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore(now.subtract(config.dataParsingTimeoutMinutes, "minutes"))) {
             pendingMatches = pendingMatches.filter((item) => item.matchId != match.id);
             const img = await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */));

package/package.json

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

package/template/match/match_1.ejs

@@ -246,8 +246,9 @@
 
             .hero .player_avatar .position {
                 /* width: auto; */
+                line-height: 1.2;
                 text-align: right;
-                bottom: 1px;
+                top: 3px;
                 right: 0;
                 color: #cccccc;
                 text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.5), 1px -1px 0 rgba(0, 0, 0, 0.5), -1px 1px 0 rgba(0, 0, 0, 0.5), 1px 1px 0 rgba(0, 0, 0, 0.5); /* 描边效果 */
@@ -275,6 +276,40 @@
                 text-shadow: 0 0 4px black;
             }
 
+            .hero .player_avatar .facet {
+                width: 24px;
+                height: 24px;
+                position: absolute;
+                right: 0;
+                bottom: 0;
+                border-radius: 4px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+            }
+            .hero .player_avatar .facet img{
+                width: 18px;
+                height: 18px;
+            }
+            .hero > .player_avatar > .facet.Red {
+                background: linear-gradient(to right, #9f3c3c, #4a2026);
+            }
+            .hero > .player_avatar > .facet.Yellow {
+                background: linear-gradient(to right, #c8a45c, #6f3d21);
+            }
+            .hero > .player_avatar > .facet.Green {
+                background: linear-gradient(to right, #a2b23e, #2d5a18);
+            }
+            .hero > .player_avatar > .facet.Blue {
+                background: linear-gradient(to right, #547ea6, #2a385e);
+            }
+            .hero > .player_avatar > .facet.Purple {
+                background: linear-gradient(to right, #675cae, #261c44);
+            }
+            .hero > .player_avatar > .facet.Gray {
+                background: linear-gradient(to right, #adb6be, #4e5557);
+            }
+
             .hero .player_info {
                 /* width: 210px; */
                 text-align: center;
@@ -726,6 +761,10 @@
                             <p class="party_mark${player.partyId != null ? " party_" + match.party[player.partyId] : ""}"></p>
                             <p class="position p${Math.floor(player.order / 4) + 1}">${player.isRandom ? "随机" : `第<span>${player.order == null ? "?" : player.order + 1}</span>手`}<br/>${d2a.position[player.position?.slice(-1)]??""}</p>
                             <p class="level">${player.level}</p>
+                            ${player.facet ? `
+                            <div class="facet ${player.facet.color}">
+                                <img src="${utils.getImageUrl(player.facet.icon, ImageType.IconsFacets)}">
+                            </div>` : ""}
                         </div>
                         <div class="player_info">
                             <summary class="player_name">${escapeHTML(player.steamAccount.name)}</summary>

package/template/match/match_2.ejs

@@ -167,9 +167,9 @@
 
             .player > .hero_avatar > .party_line {
                 position: absolute;
-                height: 100%;
+                height: 2px;
                 top: 0;
-                width: 3px;
+                width: 100%;
             }
 
             .player > .hero_avatar > .party_mark {
@@ -178,8 +178,8 @@
                 text-align: center;
                 width: 16px;
                 font-size: 10px;
-                top: 2px;
-                left: 5px;
+                top: 3px;
+                left: 1px;
                 background-color: rgba(0, 0, 0, 0.8);
             }
 
@@ -231,6 +231,41 @@
                 content: "IV";
             }
 
+            .player > .hero_avatar > .facet {
+                position: absolute;
+                left: 4px;
+                left: 0;
+                bottom: 0;
+                width: 16px;
+                height: 16px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                z-index: 1;
+            }
+            .player > .hero_avatar > .facet > img {
+                width: 12px;
+                height: 12px;
+            }
+            .player > .hero_avatar > .facet.Red {
+                background: linear-gradient(to right, #9f3c3c, #4a2026);
+            }
+            .player > .hero_avatar > .facet.Yellow {
+                background: linear-gradient(to right, #c8a45c, #6f3d21);
+            }
+            .player > .hero_avatar > .facet.Green {
+                background: linear-gradient(to right, #a2b23e, #2d5a18);
+            }
+            .player > .hero_avatar > .facet.Blue {
+                background: linear-gradient(to right, #547ea6, #2a385e);
+            }
+            .player > .hero_avatar > .facet.Purple {
+                background: linear-gradient(to right, #675cae, #261c44);
+            }
+            .player > .hero_avatar > .facet.Gray {
+                background: linear-gradient(to right, #adb6be, #4e5557);
+            }
+
             .player > .rank {
                 position: relative;
                 grid-row: 1 / span 3;
@@ -487,6 +522,10 @@
             <div class="player ${player.team}${player.hero.id==80?" bear":""}" style="order: ${player.team==="radiant"?1:100};">
                 <div class="hero_avatar row-1${player.partyId != null ? " party_" + match.party[player.partyId] : ""}">
                     <img src="${utils.getImageUrl(player.hero.shortName, ImageType.Heroes)}" />
+                    ${player.facet ? `
+                    <div class="facet ${player.facet.color}">
+                        <img src="${utils.getImageUrl(player.facet.icon, ImageType.IconsFacets)}">
+                    </div>` : ""}
                     <p class="level">${player.level}</p>
                     <p class="party_line"></p>
                     <p class="party_mark"></p>