Merge pull request #52 from wanderer-fly/master

Fix some issue
Wangsheng-Funeral-Parlor · Dec 8, 2023 · 89a846e · 89a846e
2 parents f01b58a + cf4d24e
commit 89a846e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 109 deletions.
diff --git a/src/dnsServer/nameserver.ts b/src/dnsServer/nameserver.ts
@@ -25,7 +25,7 @@ export default class NameServer {
   private udp: dgram.Socket
 
   private queue: QueryTask[]
-  private loop: NodeJS.Timer
+  private loop: NodeJS.Timeout
 
   private ip: string
   private port: number

diff --git a/src/kcpServer/dummyClient.ts b/src/kcpServer/dummyClient.ts
@@ -10,7 +10,7 @@ import Client from './client'
 import { PacketHead } from '@/types/kcp'
 
 export default class DummyClient extends Client {
-  private loop: NodeJS.Timer
+  private loop: NodeJS.Timeout
 
   constructor(server: KcpServer) {
     super(server, 0xFFFFFFFF, null)

diff --git a/src/kcpServer/game/manager/staminaManager.ts b/src/kcpServer/game/manager/staminaManager.ts
@@ -24,7 +24,7 @@ export default class StaminaManager extends BaseClass {
   private consumeAquaticAmount: number
   private curVehicleStamina: number
 
-  private timer: NodeJS.Timer
+  private timer: NodeJS.Timeout
 
   public constructor(entity: Avatar | Vehicle) {
     super()

diff --git a/src/kcpServer/index.ts b/src/kcpServer/index.ts
@@ -17,7 +17,7 @@ import Socket from './socket'
 const logger = new TLogger('KCPSRV', 0xc824ff)
 
 export default class KcpServer extends EventEmitter {
-  private loop: NodeJS.Timer
+  private loop: NodeJS.Timeout
   private frame: number
 
   server: Server

diff --git a/src/kcpServer/socket/worker/kcpWorker/index.ts b/src/kcpServer/socket/worker/kcpWorker/index.ts
@@ -33,7 +33,7 @@ export default class KcpWorker extends Worker {
   conv: number | null
 
   kcp: Kcp | null
-  timer: NodeJS.Timer | null
+  timer: NodeJS.Timeout | null
   connInfo: ConnectionInfo | null
 
   seqId: number

diff --git a/src/types/enum/fightProp.ts b/src/types/enum/fightProp.ts
diff --git a/src/types/game/playerInfo.ts b/src/types/game/playerInfo.ts