koishi-plugin-tmp-bot 1.4.0 → 1.6.0

package/lib/api/truckersMpMapApi.js

@@ -0,0 +1,26 @@
+const BASE_API = 'https://tracker.ets2map.com'
+
+module.exports = {
+  /**
+   * 区域查询玩家
+   */
+  async area (http, serverId, x1, y1, x2, y2) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/v3/area?x1=${x1}&y1=${y1}&x2=${x2}&y2=${y2}&server=${serverId}`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: !result || !result.Success
+    }
+    if (!data.error) {
+      data.data = result.Data
+    }
+    return data
+  }
+}

package/lib/command/tmpPosition.js

@@ -3,6 +3,7 @@ const { resolve } = require('path')
 const guildBind = require('../database/guildBind')
 const truckyAppApi = require('../api/truckyAppApi')
 const truckersMpApi = require('../api/truckersMpApi')
+const truckersMpMapApi = require('../api/truckersMpMapApi')
 const baiduTranslate = require('../util/baiduTranslate')
 const common = require('../util/common')
 
@@ -39,6 +40,28 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       return '玩家离线'
     }
 
+    // 查询周边玩家，并处理数据
+    let areaPlayersData = await truckersMpMapApi.area(ctx.http, playerMapInfo.data.server,
+        playerMapInfo.data.x - 4000,
+        playerMapInfo.data.y + 2500,
+        playerMapInfo.data.x + 4000,
+        playerMapInfo.data.y - 2500)
+    let areaPlayerList = []
+    if (!areaPlayersData.error) {
+      areaPlayerList = areaPlayersData.data
+      let index = areaPlayerList.findIndex((player) => {
+        return player.MpId.toString() === tmpId
+      })
+      if (index !== -1) {
+        areaPlayerList.splice(index, 1)
+      }
+    }
+    areaPlayerList.push({
+      X: playerMapInfo.data.x,
+      Y: playerMapInfo.data.y,
+      MpId: tmpId
+    })
+
     // promods服ID集合
     let promodsServerIdList = [50, 51]
 
@@ -50,8 +73,10 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       serverName: playerMapInfo.data.serverDetails.name,
       country: await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.country),
       realName: await baiduTranslate(ctx, cfg, playerMapInfo.data.location.poi.realName),
-      x: playerMapInfo.data.x,
-      y: playerMapInfo.data.y
+      currentPlayerId: tmpId,
+      centerX: playerMapInfo.data.x,
+      centerY: playerMapInfo.data.y,
+      playerList: areaPlayerList
     }
 
     let page

package/lib/resource/position.html

@@ -204,16 +204,19 @@
       document.getElementsByClassName('country')[0].innerText = data.country
       document.getElementsByClassName('real-name')[0].innerText = data.realName
 
-      L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(data.x, data.y), 8), {
-        color: '#2f2f2f',       // 标记点边框颜色
-        weight: 2,              // 标记点边框大小
-        fillColor: '#158cfb',   // 标记点填充颜色
-        fillOpacity: 1,         // 标记点填充不透明度（0到1之间的值）
-        radius: 6               // 标记点半径（以像素为单位）
-      }).addTo(map);
+      for (let player of data.playerList) {
+        L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(player.X, player.Y), 8), {
+          color: '#2f2f2f',       // 标记点边框颜色
+          weight: 2,              // 标记点边框大小
+          fillColor: data.currentPlayerId === player.MpId.toString() ? '#1cb715' : '#158cfb',   // 标记点填充颜色
+          fillOpacity: 1, // 标记点填充不透明度（0到1之间的值）
+          radius: 5,              // 标记点半径（以像素为单位）
+          zIndex: data.currentPlayerId === player.MpId.toString() ? 1000 : undefined
+        }).addTo(map);
+      }
 
       // 移动地图到坐标，视角稍微向上移动
-      map.setView(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(data.x, data.y + 80), 8), 7);
+      map.setView(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(data.centerX, data.centerY + 80), 8), 7);
     }
   </script>
 </body>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-tmp-bot",
   "description": "欧洲卡车模拟2 TMP查询机器人",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [