koishi-plugin-tmp-bot 1.3.4 → 1.5.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')
 
@@ -10,6 +11,7 @@ const common = require('../util/common')
  * 定位
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
+  // 5265655
   if (ctx.puppeteer) {
     if (tmpId && isNaN(tmpId)) {
       return `请输入正确的玩家编号`
@@ -39,14 +41,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)
+
+    // promods服ID集合
+    let promodsServerIdList = [50, 51]
+
+    // 构建地图数据
     let data = {
+      mapType: promodsServerIdList.indexOf(playerMapInfo.data.server) !== -1 ? 'promods' : 'ets',
       avatar: playerInfo.data.smallAvatar,
       username: playerInfo.data.name,
       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: areaPlayersData.data
     }
 
     let page

package/lib/command/tmpQuery.js

@@ -11,7 +11,9 @@ const userGroup = {
   'Player': '玩家',
   'Retired Legend': '退役',
   'Game Developer': '游戏开发者',
-  'Retired Team Member': '退休团队成员'
+  'Retired Team Member': '退休团队成员',
+  'Add-On Team': 'Add-On Team',
+  'Game Moderator': 'Game Moderator'
 }
 
 /**

package/lib/index.js

@@ -8,6 +8,7 @@ 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

@@ -113,25 +113,61 @@
     </div>
   </div>
   <script>
-    let multipliers = {
-      x: 71292,
-      y: 60412
-    }
-    let breakpoints = {
-      uk: {
-        x: -31056.8,
-        y: -5832.867
+    let mapConfig = {
+      ets: {
+        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        multipliers: {
+          x: 71292,
+          y: 60412
+        },
+        breakpoints: {
+          uk: {
+            x: -31056.8,
+            y: -5832.867
+          }
+        },
+        bounds: {
+          y: 131072,
+          x: 131072
+        },
+        maxZoom: 8,
+        minZoom: 2,
+        // 游戏地转地图坐标
+        calculateMapCoordinate (x, y) {
+          return [
+            x / 1.325928 + mapConfig.ets.multipliers.x,
+            y / 1.325928 + mapConfig.ets.multipliers.y
+          ];
+        }
+      },
+      promods: {
+        tileUrl: 'https://tiles.truckyapp.com/promods/05102019/{z}/{x}/{y}.png',
+        multipliers: {
+          x: 41828,
+          y: 77369
+        },
+        breakpoints: {
+          uk: {
+            x: -31056.8,
+            y: -5832.867
+          }
+        },
+        bounds: {
+          y: 131072,
+          x: 131072
+        },
+        maxZoom: 8,
+        minZoom: 2,
+        // 游戏地转地图坐标
+        calculateMapCoordinate (x, y) {
+          return [
+            x / 2.303589 + mapConfig.promods.multipliers.x,
+            y / 2.303589 + mapConfig.promods.multipliers.y
+          ]
+        }
       }
     }
 
-    // 游戏地转地图坐标
-    function calculateMapCoordinate(x, y) {
-      return [
-        x / 1.325928 + multipliers.x,
-        y / 1.325928 + multipliers.y
-      ];
-    }
-
     // 定义地图
     let map = L.map('map', {
       attributionControl: false,
@@ -139,45 +175,47 @@
       zoomControl: false
     });
 
-    // 边界
-    let bounds = L.latLngBounds(
-      map.unproject([0, 131072], 2),
-      map.unproject([131072, 0], 2)
-    );
+    function setData(data) {
+      // 边界
+      let bounds = L.latLngBounds(
+        map.unproject([0, mapConfig[data.mapType].bounds.y], mapConfig[data.mapType].maxZoom),
+        map.unproject([mapConfig[data.mapType].bounds.x, 0], mapConfig[data.mapType].maxZoom)
+      );
 
-    // 瓦片地图
-    L.tileLayer("https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png", {
-      minZoom: 2,
-      maxZoom: 10,
-      maxNativeZoom: 8,
-      tileSize: 512,
-      bounds: bounds,
-      reuseTiles: true
-    }).addTo(map);
-    map.setMaxBounds(
-      new L.LatLngBounds(
-        map.unproject([0, 131072], 8),
-        map.unproject([131072, 0], 8)
-      )
-    );
+      // 瓦片地图
+      L.tileLayer(mapConfig[data.mapType].tileUrl, {
+        minZoom: 2,
+        maxZoom: 10,
+        maxNativeZoom: 8,
+        tileSize: 512,
+        bounds: bounds,
+        reuseTiles: true
+      }).addTo(map);
+      map.setMaxBounds(
+        new L.LatLngBounds(
+          map.unproject([0, mapConfig[data.mapType].bounds.y], mapConfig[data.mapType].maxZoom),
+          map.unproject([mapConfig[data.mapType].bounds.x, 0], mapConfig[data.mapType].maxZoom)
+        )
+      );
 
-    function setData(data) {
       document.getElementsByClassName('avatar')[0].src = data.avatar
       document.getElementsByClassName('username')[0].innerText = data.username
       document.getElementsByClassName('server-name')[0].innerText = data.serverName
       document.getElementsByClassName('country')[0].innerText = data.country
       document.getElementsByClassName('real-name')[0].innerText = data.realName
 
-      L.circleMarker(map.unproject(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: '#158cfb',   // 标记点填充颜色
+          fillOpacity: data.currentPlayerId === player.MpId.toString() ? 1 : 0.6, // 标记点填充不透明度（0到1之间的值）
+          radius: data.currentPlayerId === player.MpId.toString() ? 6 : 4         // 标记点半径（以像素为单位）
+        }).addTo(map);
+      }
 
       // 移动地图到坐标，视角稍微向上移动
-      map.setView(map.unproject(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.3.4",
+  "version": "1.5.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [