koishi-plugin-tmp-bot 1.3.3 → 1.4.0

package/lib/command/tmpPosition.js

@@ -4,6 +4,7 @@ const guildBind = require('../database/guildBind')
 const truckyAppApi = require('../api/truckyAppApi')
 const truckersMpApi = require('../api/truckersMpApi')
 const baiduTranslate = require('../util/baiduTranslate')
+const common = require('../util/common')
 
 /**
  * 定位
@@ -38,7 +39,12 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       return '玩家离线'
     }
 
+    // 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,
@@ -54,6 +60,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
       await page.setViewport({ width: 1000, height: 1000 })
       await page.goto(`file:///${resolve(__dirname, '../resource/position.html')}`)
       await page.evaluate(`setData(${JSON.stringify(data)})`)
+      await common.sleep(100)
       await page.waitForNetworkIdle()
       const element = await page.$("#container");
       return (

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/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,45 @@
       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
 
-      let mapCoordinate = map.unproject(calculateMapCoordinate(data.x, data.y), 8)
-      L.circleMarker(mapCoordinate, {
-        color: '#3e9edc',       // 标记点边框颜色
-        fillColor: '#3e9edc',   // 标记点填充颜色
-        fillOpacity: 1,     // 标记点填充不透明度（0到1之间的值）
-        radius: 6           // 标记点半径（以像素为单位）
+      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);
 
-      // 移动地图到坐标
-      map.setView(mapCoordinate, 7);
+      // 移动地图到坐标，视角稍微向上移动
+      map.setView(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(data.x, data.y + 80), 8), 7);
     }
   </script>
 </body>

package/lib/util/common.js

@@ -0,0 +1,5 @@
+module.exports = {
+  sleep (ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+}

package/package.json

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