koishi-plugin-ets2-tools-tmp 3.4.0 → 3.4.2

package/lib/api/evmOpenApi.js

@@ -46,11 +46,13 @@ module.exports = {
     },
     /**
      * 查询在线玩家
+     * @param game 可选，2=美卡（接口不传默认欧卡）
      */
-    async mapPlayerList(http, serverId, ax, ay, bx, by) {
+    async mapPlayerList(http, serverId, ax, ay, bx, by, game) {
         let result = null
         try {
-            result = await requestWithFallback(http, `/map/playerList?aAxisX=${ax}&aAxisY=${ay}&bAxisX=${bx}&bAxisY=${by}&serverId=${serverId}`)
+            const gameParam = game ? `&game=${game}` : ''
+            result = await requestWithFallback(http, `/map/playerList?aAxisX=${ax}&aAxisY=${ay}&bAxisX=${bx}&bAxisY=${by}&serverId=${serverId}${gameParam}`)
         } catch {
             return {
                 error: true

package/lib/command/tmpPosition.js

@@ -6,6 +6,7 @@ const truckyAppApi = require('../api/truckyAppApi')
 const truckersMpApi = require('../api/truckersMpApi')
 const evmOpenApi = require('../api/evmOpenApi')
 const baiduTranslate = require('../util/baiduTranslate')
+const { AtsIds } = require('../util/constant')
 const common = require('../util/common')
 
 /**
@@ -69,12 +70,15 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       return '玩家离线'
     }
 
-    // 查询周边玩家，并处理数据
+    // 查询周边玩家，并处理数据（美卡需显式传 game=2，接口不传默认欧卡）
+    const atsServerIdList = AtsIds
+    const isAts = atsServerIdList.indexOf(playerMapInfo.data.server) !== -1
     let areaPlayersData = await evmOpenApi.mapPlayerList(ctx.http, playerMapInfo.data.server,
         playerMapInfo.data.x - 4000,
         playerMapInfo.data.y + 2500,
         playerMapInfo.data.x + 4000,
-        playerMapInfo.data.y - 2500)
+        playerMapInfo.data.y - 2500,
+        isAts ? 2 : undefined)
     let areaPlayerList = []
     if (!areaPlayersData.error) {
       areaPlayerList = areaPlayersData.data
@@ -94,9 +98,9 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     // promods服ID集合
     let promodsServerIdList = [50, 51]
 
-    // 构建地图数据
+    // 构建地图数据（在线的美卡服务器 → 用美卡地图）
     let data = {
-      mapType: promodsServerIdList.indexOf(playerMapInfo.data.server) !== -1 ? 'promods' : 'ets',
+      mapType: isAts ? 'ats' : (promodsServerIdList.indexOf(playerMapInfo.data.server) !== -1 ? 'promods' : 'ets'),
       avatar: playerInfo.data.smallAvatar,
       username: playerInfo.data.name,
       serverName: playerMapInfo.data.serverDetails.name,

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -3,6 +3,7 @@ const dayjsRelativeTime = require('dayjs/plugin/relativeTime');
 const dayjsLocaleZhCn = require('dayjs/locale/zh-cn');
 const guildBind = require('../../database/guildBind');
 const tmpIdPicker = require('../../util/tmpIdPicker');
+const { AtsIds } = require('../../util/constant');
 const truckyAppApi = require('../../api/truckyAppApi');
 const evmOpenApi = require('../../api/evmOpenApi');
 const baiduTranslate = require('../../util/baiduTranslate');
@@ -211,7 +212,10 @@ module.exports = async (ctx, cfg, session, tmpId) => {
             data.onlineCity = onlineCity;
             data.onlineX = playerMapInfo.data.x;
             data.onlineY = playerMapInfo.data.y;
-            data.onlineMapType = playerMapInfo.data.serverDetails.id === 50 ? 'promods' : 'ets';
+            // 美卡服务器(8/10/45)用美卡地图，Promods 用 Promods 地图，其余用欧卡地图
+            data.onlineMapType = playerMapInfo.data.serverDetails.id === 50
+                ? 'promods'
+                : (AtsIds.indexOf(playerMapInfo.data.serverDetails.id) !== -1 ? 'ats' : 'ets');
         } else if (playerInfo.data.lastOnlineTime) {
             data.lastOnlineTime = dayjs(playerInfo.data.lastOnlineTime).fromNow(false);
         }

package/lib/database/guildBind.js

@@ -1,9 +1,31 @@
+const evmOpenApi = require('../api/evmOpenApi');
 /**
  * TMP ID 绑定（支持一人绑定多个）
  * 表 tmp_guild_bind：一个绑定一行，同一 (platform, user_id) 可有多行；
  * get() 返回第一行（默认绑定），保持与旧版行为兼容。
  */
 module.exports = {
+    /**
+     * 补全缺失的玩家名（旧版本绑定的数据没有 tmp_name）：查接口并写回数据库。
+     * 并发补查，单个失败保持未知（下次遇到再补）。
+     * @returns 原数组（行对象已被就地更新）
+     */
+    async ensureNames(ctx, rows) {
+        const missing = (rows || []).filter(r => !r.tmp_name);
+        if (missing.length === 0) {
+            return rows;
+        }
+        await Promise.all(missing.map(async (row) => {
+            try {
+                const info = await evmOpenApi.playerInfo(ctx.http, row.tmp_id);
+                if (!info.error && info.data && info.data.name) {
+                    row.tmp_name = info.data.name;
+                    await ctx.database.set('tmp_guild_bind', row.id, { tmp_name: info.data.name });
+                }
+            } catch { } // 查询失败保持未知，下次遇到再补
+        }));
+        return rows;
+    },
     /**
      * 获取默认绑定（第一行，兼容旧逻辑）
      * @param db 数据源

package/lib/index.js

@@ -5,6 +5,7 @@ exports.apply = apply;
 
 const koishi_1 = require("koishi");
 const model = require('./database/model');
+const guildBind = require('./database/guildBind');
 const { ServerType } = require('./util/constant');
 const { MileageRankingType } = require('./util/constant');
 const { LeadRoleCallMessage, LeadRoleCallTime } = require('./util/constant');
@@ -269,6 +270,8 @@ function registerBaseCommands(ctx, cfg) {
                 if (bindings.length === 0) {
                     return '还没有绑定编号，使用「绑定 tmpId」添加';
                 }
+                // 旧绑定缺名字的先补查并写回
+                await guildBind.ensureNames(ctx, bindings);
                 const lines = bindings.map((b, i) => `${i + 1}. ${b.tmp_name || '未知'} (${b.tmp_id})`);
                 return `已绑定 ${bindings.length} 个编号：\n${lines.join('\n')}${bindings.length > 1 ? '\n查询时会列出序号供选择；使用「解绑 序号」可删除' : ''}`;
             });
@@ -282,6 +285,7 @@ function registerBaseCommands(ctx, cfg) {
                 if (bindings.length === 0) {
                     return '还没有绑定编号';
                 }
+                await guildBind.ensureNames(ctx, bindings);
                 if (!index) {
                     return '请输入要解绑的序号或 all（序号见「我的绑定」）';
                 }

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

@@ -51,13 +51,13 @@ let mapConfig = {
       ]
     }
   },
-  // 美卡（ATS）：换算参数来自瓦片导出配置 TileMapInfo.json
-  // （游戏坐标 x∈[-120098.891, 41144.094] y∈[-79127.37, 82115.62] 线性铺满 131072 网格）
+  // 美卡（ATS）：换算参数来自瓦片导出配置 TileMapInfo.json（tmp-ats-promods）
+  // （游戏坐标 x∈[-120835.742, 41880.945] y∈[-87127.17, 75589.516] 线性铺满 131072 网格）
   ats: {
-    tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ats-yellow/Tiles/{z}/{x}/{y}.png',
+    tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ats-promods-yellow/Tiles/{z}/{x}/{y}.png',
     multipliers: {
-      x: 97626.58,
-      y: 64321.45
+      x: 97335.94,
+      y: 70182.92
     },
     breakpoints: {},
     bounds: {
@@ -69,8 +69,8 @@ let mapConfig = {
     // 游戏地转地图坐标
     calculateMapCoordinate (x, y) {
       return [
-        x / 1.230185 + mapConfig.ats.multipliers.x,
-        y / 1.230185 + mapConfig.ats.multipliers.y
+        x / 1.2414298 + mapConfig.ats.multipliers.x,
+        y / 1.2414298 + mapConfig.ats.multipliers.y
       ];
     }
   }

package/lib/resource/position.html

@@ -171,6 +171,28 @@
             y / 2.598541 + mapConfig.promods.multipliers.y
           ]
         }
+      },
+      // 美卡（ATS）：换算参数来自瓦片导出配置 TileMapInfo.json（tmp-ats-promods）
+      ats: {
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ats-promods-yellow/Tiles/{z}/{x}/{y}.png',
+        multipliers: {
+          x: 97335.94,
+          y: 70182.92
+        },
+        breakpoints: {},
+        bounds: {
+          y: 131072,
+          x: 131072
+        },
+        maxZoom: 8,
+        minZoom: 0,
+        // 游戏地转地图坐标
+        calculateMapCoordinate (x, y) {
+          return [
+            x / 1.2414298 + mapConfig.ats.multipliers.x,
+            y / 1.2414298 + mapConfig.ats.multipliers.y
+          ];
+        }
       }
     }
 

package/lib/resource/query.html

@@ -1046,6 +1046,18 @@
         calculateMapCoordinate (x, y) {
           return [x / 2.598541 + mapConfig.promods.multipliers.x, y / 2.598541 + mapConfig.promods.multipliers.y];
         }
+      },
+      // 美卡（ATS）：换算参数来自瓦片导出配置 TileMapInfo.json（tmp-ats-promods）
+      ats: {
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ats-promods-yellow/Tiles/{z}/{x}/{y}.png',
+        multipliers: { x: 97335.94, y: 70182.92 },
+        breakpoints: {},
+        bounds: { y: 131072, x: 131072 },
+        maxZoom: 8,
+        minZoom: 0,
+        calculateMapCoordinate (x, y) {
+          return [x / 1.2414298 + mapConfig.ats.multipliers.x, y / 1.2414298 + mapConfig.ats.multipliers.y];
+        }
       }
     }
 

package/lib/resource/traffic.html

@@ -265,15 +265,15 @@
           return [x / 2.598541 + mapConfig.promods.multipliers.x, y / 2.598541 + mapConfig.promods.multipliers.y];
         }
       },
-      // 美卡（ATS）：换算参数来自瓦片导出配置 TileMapInfo.json
+      // 美卡（ATS）：换算参数来自瓦片导出配置 TileMapInfo.json（tmp-ats-promods）
       ats: {
-        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ats-yellow/Tiles/{z}/{x}/{y}.png',
-        multipliers: { x: 97626.58, y: 64321.45 },
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ats-promods-yellow/Tiles/{z}/{x}/{y}.png',
+        multipliers: { x: 97335.94, y: 70182.92 },
         breakpoints: {},
         bounds: { y: 131072, x: 131072 },
         maxZoom: 8, minZoom: 0,
         calculateMapCoordinate(x, y) {
-          return [x / 1.230185 + mapConfig.ats.multipliers.x, y / 1.230185 + mapConfig.ats.multipliers.y];
+          return [x / 1.2414298 + mapConfig.ats.multipliers.x, y / 1.2414298 + mapConfig.ats.multipliers.y];
         }
       }
     };

package/lib/util/tmpIdPicker.js

@@ -5,6 +5,7 @@
  */
 const MAX_PICK = 5;            // 单次多选上限
 const PICK_TIMEOUT = 60_000;   // 等待回复时长（毫秒）
+const guildBind = require('../database/guildBind');
 
 /**
  * key: `${platform}:${channelId}:${userId}` → { bindings, allowMulti, max, finish }
@@ -59,6 +60,8 @@ function register(ctx) {
  */
 async function pick(ctx, session, bindings, opts = {}) {
     if (!bindings || bindings.length === 0) return [];
+    // 旧绑定的行没有名字：先查接口补全并写回，避免列表显示"未知"
+    await guildBind.ensureNames(ctx, bindings);
     if (bindings.length === 1) return [String(bindings[0].tmp_id)];
     const allowMulti = opts.allowMulti !== false;
     const max = allowMulti ? MAX_PICK : 1;

package/package.json

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