koishi-plugin-ets2-tools-tmp 3.3.6 → 3.3.62

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -55,16 +55,22 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         }
         tmpId = guildBindData.tmp_id;
     }
-    // 查询玩家信息
-    let playerInfo = await evmOpenApi.playerInfo(ctx.http, tmpId);
+    // 并行请求玩家信息与线上状态（互不依赖，避免串行等待）
+    const [playerInfo, playerMapInfo] = await Promise.all([
+        evmOpenApi.playerInfo(ctx.http, tmpId),
+        truckyAppApi.online(ctx.http, tmpId)
+    ]);
     if (playerInfo.error && playerInfo.code === 10001) {
         return '玩家不存在';
     }
     else if (playerInfo.error) {
         return '查询玩家信息失败，请重试';
     }
-    // 查询线上信息
-    let playerMapInfo = await truckyAppApi.online(ctx.http, tmpId);
+    // Steam游戏时长请求提前发起，与下方积分查询/翻译并行执行
+    const steamApiKey = cfg.steamApi?.key;
+    const steamGameTimePromise = (cfg.commands?.tmpQueryGameTime && steamApiKey)
+        ? evmOpenApi.steamGameTime(ctx.http, steamApiKey, playerInfo.data.steamId)
+        : null;
     // 拼接数据
     let data = {};
     data.showAvatar = cfg.tmpQuery?.showAvatar !== false;
@@ -94,8 +100,12 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         if (data.isOnline) {
             data.onlineStatus = '在线';
             data.onlineServerName = playerMapInfo.data.serverDetails.name;
-            data.onlineCountry = await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country);
-            data.onlineCity = await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName);
+            const [onlineCountry, onlineCity] = await Promise.all([
+                baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country),
+                baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName)
+            ]);
+            data.onlineCountry = onlineCountry;
+            data.onlineCity = onlineCity;
             data.onlineX = playerMapInfo.data.x;
             data.onlineY = playerMapInfo.data.y;
             data.onlineMapType = playerMapInfo.data.serverDetails.id === 50 ? 'promods' : 'ets';
@@ -157,17 +167,13 @@ module.exports = async (ctx, cfg, session, tmpId) => {
             }
         }
     }
-    // 查询Steam游戏时长
+    // 等待Steam游戏时长结果（请求已提前发起，与积分查询/翻译并行）
     data.ets2GameTime = null;
     data.atsGameTime = null;
-    if (cfg.commands?.tmpQueryGameTime) {
-        const steamApiKey = cfg.steamApi?.key;
-        if (steamApiKey) {
-            const steamId = playerInfo.data.steamId;
-            const gameTimes = await evmOpenApi.steamGameTime(ctx.http, steamApiKey, steamId);
-            data.ets2GameTime = gameTimes.ets2;
-            data.atsGameTime = gameTimes.ats;
-        }
+    if (steamGameTimePromise) {
+        const gameTimes = await steamGameTimePromise;
+        data.ets2GameTime = gameTimes.ets2;
+        data.atsGameTime = gameTimes.ats;
     }
     let page;
     try {

package/lib/command/tmpQuery/tmpQueryText.js

@@ -51,16 +51,22 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         }
         tmpId = guildBindData.tmp_id;
     }
-    // 查询玩家信息
-    let playerInfo = await evmOpenApi.playerInfo(ctx.http, tmpId);
+    // 并行请求玩家信息与线上状态（互不依赖，避免串行等待）
+    const [playerInfo, playerMapInfo] = await Promise.all([
+        evmOpenApi.playerInfo(ctx.http, tmpId),
+        truckyAppApi.online(ctx.http, tmpId)
+    ]);
     if (playerInfo.error && playerInfo.code === 10001) {
         return '玩家不存在';
     }
     else if (playerInfo.error) {
         return '玩家信息查询失败，请重试';
     }
-    // 查询线上信息
-    let playerMapInfo = await truckyAppApi.online(ctx.http, tmpId);
+    // Steam游戏时长请求提前发起，与下方积分查询并行执行
+    const steamApiKey = cfg.steamApi?.key;
+    const steamGameTimePromise = (cfg.commands?.tmpQueryGameTime && steamApiKey)
+        ? evmOpenApi.steamGameTime(ctx.http, steamApiKey, playerInfo.data.steamId)
+        : null;
     // 拼接消息模板
     let message = '';
     if (cfg.tmpQuery?.showAvatar) {
@@ -171,30 +177,20 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     if (playerMapInfo && !playerMapInfo.error) {
         message += '\n📶在线状态: ' + (playerMapInfo.data.online ? `在线🟢 (${playerMapInfo.data.serverDetails.name})` : '离线⚫');
         if (playerMapInfo.data.online) {
-            message += '\n🌍线上位置: ';
-            message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country);
-            message += ' - ';
-            message += await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName);
+            const [onlineCountry, onlineCity] = await Promise.all([
+                baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country),
+                baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName)
+            ]);
+            message += '\n🌍线上位置: ' + onlineCountry + ' - ' + onlineCity;
         }
         else if (playerInfo.data.lastOnlineTime) {
             message += '\n📶上次在线: ' + dayjs(playerInfo.data.lastOnlineTime).fromNow(false);
         }
     }
-    const steamID = playerInfo.data.steamId;
-    
-    // 查询Steam游戏时长
-    async function getSteamGameTimes(steamId) {
-        const steamApiKey = cfg.steamApi?.key;
-        if (!steamApiKey) {
-            return { ets2: null, ats: null };
-        }
-        return evmOpenApi.steamGameTime(ctx.http, steamApiKey, steamId);
-    }
-    
-    // 获取欧卡和美卡游戏时长
+    // 获取欧卡和美卡游戏时长（请求已提前发起，与积分查询/翻译并行）
     if (cfg.commands?.tmpQueryGameTime) {
-        const gameTimes = await getSteamGameTimes(steamID);
-        
+        const gameTimes = (await steamGameTimePromise) || { ets2: null, ats: null };
+
         // 添加游戏时长信息
         if (gameTimes.ets2) {
             message += '\n🎮欧卡游戏时长: ' + gameTimes.ets2;

package/lib/resource/package/ets-map.js

@@ -1,6 +1,6 @@
 let mapConfig = {
   ets: {
-    tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+    tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
     multipliers: {
       x: 70272,
       y: 76157
@@ -26,7 +26,7 @@ let mapConfig = {
     }
   },
   promods: {
-    tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+    tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
     multipliers: {
       x: 51953,
       y: 76024

package/lib/resource/position.html

@@ -121,7 +121,7 @@
   <script>
     let mapConfig = {
       ets: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: {
           x: 70272,
           y: 76157
@@ -147,7 +147,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: {
           x: 51953,
           y: 76024

package/lib/resource/query.html

@@ -351,6 +351,13 @@
       width: 100%;
       height: 180px;
       border-radius: 0 0 16px 16px;
+      /* 未加载到瓦片的区域使用卡片同款深蓝底色，避免白底突兀 */
+      background: #0f1439;
+    }
+
+    /* 瓦片暗色化：部分反转（0.6）让底色为浅中灰，色相回转 + 提饱和保持黄色道路鲜亮 */
+    .map-section .leaflet-tile-pane {
+      filter: invert(0.78) hue-rotate(180deg) saturate(1.35) brightness(2);
     }
 
     /* ===== SPONSOR SECTION ===== */
@@ -585,7 +592,7 @@
   <script>
     let mapConfig = {
       ets: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 70272, y: 76157 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },
@@ -596,7 +603,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 51953, y: 76024 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },
@@ -774,7 +781,7 @@
         map.unproject([mapConfig[mapType].bounds.x, 0], mapConfig[mapType].maxZoom)
       ));
       L.circleMarker(map.unproject(mapConfig[mapType].calculateMapCoordinate(x, y), 8), {
-        color: '#2f2f2f', weight: 2, fillColor: '#1cb715', fillOpacity: 1, radius: 5, zIndex: 1000
+        color: '#e2e8f0', weight: 2, fillColor: '#22c55e', fillOpacity: 1, radius: 5, zIndex: 1000
       }).addTo(map);
       map.setView(map.unproject(mapConfig[mapType].calculateMapCoordinate(x, y), 8), 5);
     }

package/lib/resource/traffic.html

@@ -246,7 +246,7 @@
   <script>
     let mapConfig = {
       ets: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 70272, y: 76157 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },
@@ -256,7 +256,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 51953, y: 76024 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ets2-tools-tmp",
   "description": "欧卡2 TruckersMP信息查询、车队平台查询及活动提醒",
-  "version": "3.3.6",
+  "version": "3.3.62",
   "contributors": [
     "opwop <slhp1013@qq.com>",
     "bot_actions <168329908@qq.com>"