@sjtdev/koishi-plugin-dota2tracker 1.1.2-beta.5 → 1.1.2-hotfix

package/lib/index.js

@@ -536,7 +536,7 @@ function getFormattedMatchData(match) {
     match[player.team].experience += Math.floor(player.experiencePerMinute / 60 * match.durationSeconds);
     player.titles = [];
     player.mvpScore = // 计算MVP分数
-    player.kills * 5 + player.assists * 3 + player.stats.heroDamageReport.dealtTotal.stunDuration / 100 * 0.1 + (player.stats.heroDamageReport.dealtTotal.slowDuration + player.stats.heroDamageReport.dealtTotal.disableDuration) / 100 * 0.05 + player.heroDamage * 1e-3 + player.towerDamage * 0.01 + player.heroHealing * 2e-3 + player.imp * 0.25;
+    player.kills * 5 + player.assists * 3 + player.stats.heroDamageReport.dealtTotal.stunDuration / 100 * 0.1 + player.stats.heroDamageReport.dealtTotal.disableDuration / 100 * 0.05 + player.stats.heroDamageReport.dealtTotal.slowDuration / 100 * 0.025 + player.heroDamage * 1e-3 + player.towerDamage * 0.01 + player.heroHealing * 2e-3 + player.imp * 0.25;
     player.order = heroOrderList[player.hero.id];
     if (player.partyId != null) {
       if (!match.party[player.partyId])
@@ -695,7 +695,7 @@ function getFormattedMatchData(match) {
   findMaxByProperty("networth").titles.push({ name: "富", color: "#FFD700" });
   findMaxByProperty("experiencePerMinute").titles.push({ name: "睿", color: "#8888FF" });
   match.players.reduce(
-    (max, player) => player.stats.heroDamageReport.dealtTotal.stunDuration + player.stats.heroDamageReport.dealtTotal.disableDuration + player.stats.heroDamageReport.dealtTotal.slowDuration / 2 > max.stats.heroDamageReport.dealtTotal.stunDuration + max.stats.heroDamageReport.dealtTotal.disableDuration + max.stats.heroDamageReport.dealtTotal.slowDuration / 2 ? player : max
+    (max, player) => player.stats.heroDamageReport.dealtTotal.stunDuration + player.stats.heroDamageReport.dealtTotal.disableDuration / 2 + player.stats.heroDamageReport.dealtTotal.slowDuration / 4 > max.stats.heroDamageReport.dealtTotal.stunDuration + max.stats.heroDamageReport.dealtTotal.disableDuration / 2 + max.stats.heroDamageReport.dealtTotal.slowDuration / 4 ? player : max
   ).titles.push({ name: "控", color: "#FF00FF" });
   findMaxByProperty("heroDamage").titles.push({ name: "爆", color: "#CC0088" });
   findMaxByProperty("kills", "heroDamage").titles.push({ name: "破", color: "#DD0000" });
@@ -1170,7 +1170,6 @@ async function apply(ctx, config) {
       if (subscribedPlayers.length <= 20) {
         try {
           const memberList = await session.bot.getGuildMemberList(session.event.guild.id);
-          ctx.logger.info(JSON.stringify(memberList.data));
           let queryRes = await query(PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD(subscribedPlayers.map((player) => player.steamId)));
           if (queryRes.status == 200) {
             const users = subscribedPlayers.map((subscribedPlayer) => {
@@ -1178,12 +1177,11 @@ async function apply(ctx, config) {
               const queryMember = memberList.data.find((member) => member.user?.id == subscribedPlayer.userId);
               return { ...subscribedPlayer, ...queryPlayer, ...queryMember };
             });
-            console.log(users);
             session.send(await ctx.puppeteer.render(genImageHTML(users, "guild_member" /* GuildMember */, "guild_member" /* GuildMember */)));
           } else
             throw 0;
         } catch (error) {
-          console.error(error);
+          ctx.logger.error(error);
           session.send("查询群友失败。");
         }
       }
@@ -1210,7 +1208,7 @@ async function apply(ctx, config) {
         session.send("比赛尚未解析，将在解析完成后发布。");
       }
     } catch (error) {
-      console.error(error);
+      ctx.logger.error(error);
       session.send("获取比赛信息失败。");
       ctx.database.remove("dt_previous_query_results", { matchId: parseInt(matchId) });
     }
@@ -1309,9 +1307,10 @@ async function apply(ctx, config) {
           player.heroesPerformanceTop10 = playerExtra.heroesPerformance.slice(0, 10);
         } else
           throw 0;
+        console.log(player);
         session.send(await ctx.puppeteer.render(genImageHTML(player, config.template_player, "player" /* Player */)));
       } catch (error) {
-        console.error(error);
+        ctx.logger.error(error);
         session.send("获取玩家信息失败。");
       }
     }
@@ -1366,7 +1365,7 @@ async function apply(ctx, config) {
         } else
           throw 0;
       } catch (error) {
-        console.error(error);
+        ctx.logger.error(error);
         session.send("获取数据失败");
         return;
       }
@@ -1417,7 +1416,7 @@ async function apply(ctx, config) {
           );
         }
       } catch (error) {
-        console.error(error);
+        ctx.logger.error(error);
         session.send("获取数据失败");
         return;
       }
@@ -1521,7 +1520,7 @@ KDA：${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)} [${
           } else
             ctx.logger.info("比赛 %d 尚未解析完成，继续等待。", match.id);
         } catch (error) {
-          console.error(error);
+          ctx.logger.error(error);
           ctx.database.remove("dt_previous_query_results", { matchId: pendingMatch.matchId });
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "",
-  "version": "1.1.2-beta.5",
+  "version": "1.1.2-hotfix",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/template/guild_member/guild_member.ejs

@@ -147,8 +147,8 @@
                 </div>
                 <div class="avatar steam">
                     <p>${user.steamAccount.seasonLeaderboardRank??""}</p>
-                    <img class="rank" src="${utils.getImageUrl('star_' + player.rank.star)}" alt="" />
-                    <img class="rank" src="${utils.getImageUrl('medal_' +(player.inTop100??player.rank.medal))}" alt="" />
+                    <img class="rank" src="${utils.getImageUrl('star_' + user.rank.star)}" alt="" />
+                    <img class="rank" src="${utils.getImageUrl('medal_' +(user.inTop100??user.rank.medal))}" alt="" />
                     <img class="avatar" src="${user.steamAccount.avatar}" alt="" />
                 </div>
             </div>

package/template/player/player_1.ejs

@@ -395,7 +395,7 @@
                 matchCount : currentPositionMatches.length,
                 winCount : winCount,
                 loseCount : currentPositionMatches.length - winCount,
-                imp : Math.round(currentPositionMatches.reduce((acc,match)=>acc+match.players[0].imp,0)/currentPositionMatches.length)
+                imp : currentPositionMatches.length>0? Math.round(currentPositionMatches.reduce((acc,match)=>acc+match.players[0].imp,0)/currentPositionMatches.length):"-"
             })
         }
         const highestCountsPosition = {
@@ -475,7 +475,7 @@
                     .map((position) => `
                     <span><img src="${utils.getImageUrl(position.icon,ImageType.Items)}"></span>
                     <span class="count">${position.matchCount}</span>
-                    <span class="win_rate">${((position.winCount / position.matchCount) * 100).toFixed(0)}%</span>
+                    <span class="win_rate">${position.matchCount>0?(((position.winCount / position.matchCount) * 100).toFixed(0)):"-"}%</span>
                     <span class="imp">${(position.imp > 0 ? "+" : "") + position.imp}</span>
                     <span class="win" style="${position.winCount == 0 ? "visibility:hidden;" : ""}width: ${position.winCount * pixelOfPerMatchInPosition}px">${position.winCount}</span>
                     <span class="lose" style="${position.matchCount - position.winCount == 0 ? "visibility:hidden;" : ""}width: ${(position.matchCount - position.winCount) * pixelOfPerMatchInPosition}px">${position.matchCount - position.winCount}</span>`).join("") %>
@@ -518,14 +518,14 @@
                         <td><img alt="" src="${utils.getImageUrl(match.players[0].hero.shortName, ImageType.HeroIcons)}" /></td>
                         <td style="line-height: 20px">
                             <p>${((match.players[0].kills + match.players[0].assists) / Math.max(1, match.players[0].deaths)).toFixed(2)} (${(((match.players[0].kills + match.players[0].assists) /
-                            (match.players[0].isRadiant ? match.radiantKills.reduce((acc, cva) => acc + cva, 0) : match.direKills.reduce((acc, cva) => acc + cva, 0))) * 100).toFixed(0)}%)</p>
+                            (match.players[0].isRadiant ? match.radiantKills?.reduce((acc, cva) => acc + cva, 0) : match.direKills?.reduce((acc, cva) => acc + cva, 0))) * 100)?.toFixed(0)}%)</p>
                             <p>${match.players[0].kills}/${match.players[0].deaths}/${match.players[0].assists}</p>
                         </td>
                         <td><div class="player_lane ${match.laneResult}">${laneSVG[match.laneResult]}</div></td>
                         <td style="line-height: 20px">${moment(new Date(match.startDateTime * 1000)).format("YYYY-MM-DD HH:mm:ss").slice(2)}</td>
                         <td>${utils.sec2time(match.durationSeconds)}</td>
                         <td>${(match.players[0].imp > 0 ? "+" : "") + match.players[0].imp}</td>
-                        <td><img class="medal" src="${utils.getImageUrl("medal_" + match.rank.toString().split("")[0])}" style="width: 100%" /></td>
+                        <td><img class="medal" src="${utils.getImageUrl("medal_" + match.rank?.toString().split("")[0])}" style="width: 100%" /></td>
                     </tr>`).join("")%>
                 </tbody>
             </table>