koishi-plugin-tmp-bot 1.5.0 → 1.6.0

package/lib/command/tmpPosition.js

@@ -11,7 +11,6 @@ const common = require('../util/common')
  * 定位
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
-  // 5265655
   if (ctx.puppeteer) {
     if (tmpId && isNaN(tmpId)) {
       return `请输入正确的玩家编号`
@@ -41,12 +40,27 @@ 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]
@@ -62,7 +76,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       currentPlayerId: tmpId,
       centerX: playerMapInfo.data.x,
       centerY: playerMapInfo.data.y,
-      playerList: areaPlayersData.data
+      playerList: areaPlayerList
     }
 
     let page

package/lib/index.js

@@ -8,7 +8,6 @@ const tmpServer = require('./command/tmpServer');
 const tmpBind = require('./command/tmpBind');
 const tmpTraffic = require('./command/tmpTraffic');
 const tmpPosition = require('./command/tmpPosition');
-const api = require('./api/truckersMpMapApi');
 exports.name = 'tmp-bot';
 exports.inject = {
     required: ['database'],

package/lib/resource/position.html

@@ -208,9 +208,10 @@
         L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(player.X, player.Y), 8), {
           color: '#2f2f2f',       // 标记点边框颜色
           weight: 2,              // 标记点边框大小
-          fillColor: '#158cfb',   // 标记点填充颜色
-          fillOpacity: data.currentPlayerId === player.MpId.toString() ? 1 : 0.6, // 标记点填充不透明度（0到1之间的值）
-          radius: data.currentPlayerId === player.MpId.toString() ? 6 : 4         // 标记点半径（以像素为单位）
+          fillColor: data.currentPlayerId === player.MpId.toString() ? '#1cb715' : '#158cfb',   // 标记点填充颜色
+          fillOpacity: 1, // 标记点填充不透明度（0到1之间的值）
+          radius: 5,              // 标记点半径（以像素为单位）
+          zIndex: data.currentPlayerId === player.MpId.toString() ? 1000 : undefined
         }).addTo(map);
       }
 

package/package.json

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