修复更新配置时无法更新当前玩家配置

shp241 · Jul 27, 2024 · 11269c2 · 11269c2
1 parent 9c87474
commit 11269c2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "@hyperzlib/node-reactive-config": "^1.0.1",
     "@lemonce3/mitm": "^0.8.2",
     "@pondwader/socks5-server": "^1.0.10",
+    "@types/tampermonkey": "^5.0.3",
     "@ungap/structured-clone": "^1.2.0",
     "ajv": "^8.17.1",
     "chalk": "4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/coyote/CoyoteController.ts b/server/coyote/CoyoteController.ts
@@ -85,7 +85,8 @@ export class CoyoteController {
     public setConfig(config: CoyoteGameConfig) {
         const currentConfig = config.find((item) => {
             return item.account_id === this.targetPlayer.account_id ||
-                item.nickname === this.targetPlayer.nickname
+                item.nickname === this.targetPlayer.nickname ||
+                item.isMe && this.targetPlayer.isMe;
         });
         if (!currentConfig) {
             logger.error(`未找到 ${this.targetPlayer.nickname} 的配置`);

diff --git a/server/gameRecords/Game.ts b/server/gameRecords/Game.ts
@@ -2,6 +2,7 @@ export interface GamePlayerInfo {
   account_id: number,
   nickname: string,
   seat: number,
+  isMe?: boolean,
 };
 
 export interface GameConstructorOptions {
@@ -22,6 +23,7 @@ export class Game {
         account_id: player.account_id,
         nickname: player.nickname,
         seat: seatList.indexOf(player.account_id),
+        isMe: player.account_id === meAccountId,
       }
     });
 

diff --git a/server/http/MajsoulEventController.ts b/server/http/MajsoulEventController.ts
diff --git a/server/http/router.ts b/server/http/router.ts
diff --git a/server/index.ts b/server/index.ts
@@ -19,7 +19,7 @@ if (!existsSync('config.json5')) {
 
 const config = new ReactiveConfig<ConfigType>('config.json5', {
   coyote: []
-})
+}, { autoInit: false })
 
 config.setLoadFilter((value: any) => {
   if (!validator.validateConfig(value)) {