From 79a002afeaa7ee2cb4e661596e88af546aa298f1 Mon Sep 17 00:00:00 2001 From: zhl Date: Tue, 8 Dec 2020 18:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81,=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=B8=80=E4=BA=9Bwarning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global.d.ts | 17 ++++++++--------- src/rooms/GeneralRoom.ts | 14 ++++++-------- src/rooms/RoomExtMethod.ts | 5 +---- src/rooms/commands/AsyncSequence.ts | 9 --------- src/rooms/commands/BeginGameCommand.ts | 2 -- src/rooms/commands/ChangeCardCommand.ts | 2 +- src/rooms/commands/DrawCommand.ts | 3 +-- src/rooms/commands/EatCardCommand.ts | 4 ---- src/rooms/commands/EatConfirmCommand.ts | 3 +-- src/rooms/commands/NextSubCommand.ts | 4 +--- src/rooms/commands/NextTurnCommand.ts | 2 +- src/rooms/commands/OnJoinCommand.ts | 4 +--- src/rooms/commands/PartResultCommand.ts | 4 ++-- src/rooms/commands/PlayReadyCommand.ts | 2 +- src/rooms/commands/SelectHeroCommand.ts | 1 - src/rooms/commands/SelectPetCommand.ts | 8 ++------ src/rooms/commands/TurnEndCommand.ts | 1 - src/rooms/commands/ValidationCommand.ts | 12 ------------ src/rooms/schema/Card.ts | 2 +- 19 files changed, 27 insertions(+), 72 deletions(-) delete mode 100644 src/rooms/commands/AsyncSequence.ts delete mode 100644 src/rooms/commands/ValidationCommand.ts diff --git a/src/global.d.ts b/src/global.d.ts index fda3e45..420c0b6 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -1,4 +1,12 @@ import {IMsg} from "./message/IMsg"; +import {Client, Room} from "colyseus"; +import {PetInfoMsg} from "./message/PetInfo"; +import {BattleHandler} from "./rooms/logic/Handler/BattleHandler"; +import {SkillInfoMsg} from "./message/SkillInfo"; +import {PartResultMsg} from "./message/PartResult"; +import {RemovePetMsg} from "./message/RemovePetMsg"; +import {Dispatcher} from "@colyseus/command"; +import {Delayed} from "@gamestdio/timer/lib/Delayed"; export {}; @@ -12,15 +20,6 @@ declare global { } } -import {Client, Room} from "colyseus"; -import {PetInfoMsg} from "./message/PetInfo"; -import {BattleHandler} from "./rooms/logic/Handler/BattleHandler"; -import {SkillInfoData, SkillInfoMsg} from "./message/SkillInfo"; -import {PartResultMsg} from "./message/PartResult"; -import {RemovePetMsg} from "./message/RemovePetMsg"; -import {Dispatcher} from "@colyseus/command"; -import {Delayed} from "@gamestdio/timer/lib/Delayed"; -import {Player} from "./rooms/schema/Player"; /** * GeneralRoom 扩展方法 */ diff --git a/src/rooms/GeneralRoom.ts b/src/rooms/GeneralRoom.ts index 4428389..ce7100d 100644 --- a/src/rooms/GeneralRoom.ts +++ b/src/rooms/GeneralRoom.ts @@ -1,20 +1,18 @@ -import { Room, Client } from "colyseus"; -import { CardGameState } from "./schema/CardGameState"; -import { OnJoinCommand } from "./commands/OnJoinCommand"; -import { PlayReadyCommand} from "./commands/PlayReadyCommand"; -import { Dispatcher } from "@colyseus/command"; +import {Client, Room} from "colyseus"; +import {CardGameState} from "./schema/CardGameState"; +import {OnJoinCommand} from "./commands/OnJoinCommand"; +import {PlayReadyCommand} from "./commands/PlayReadyCommand"; +import {Dispatcher} from "@colyseus/command"; import {DiscardCommand} from "./commands/DiscardCommand"; -import {NextSubCommand} from "./commands/NextSubCommand"; import {SelectPetCommand} from "./commands/SelectPetCommand"; import {ChangeCardCommand} from "./commands/ChangeCardCommand"; import {SelectHeroCommand} from "./commands/SelectHeroCommand"; import {EatCardCommand} from "./commands/EatCardCommand"; import {GiveUpCommand} from "./commands/GiveUpCommand"; import {BattleHandler} from "./logic/Handler/BattleHandler"; -import {debugRoom, msgLog} from "../common/Debug"; +import {msgLog} from "../common/Debug"; import {Delayed} from "@gamestdio/timer/lib/Delayed"; import {IncomingMessage} from "http"; -import {BaseConst} from "../constants/BaseConst"; import {PlayerStateConst} from "../constants/PlayerStateConst"; diff --git a/src/rooms/RoomExtMethod.ts b/src/rooms/RoomExtMethod.ts index 5b16cb1..3674db2 100644 --- a/src/rooms/RoomExtMethod.ts +++ b/src/rooms/RoomExtMethod.ts @@ -1,10 +1,7 @@ -import {Client, Room} from "colyseus"; +import {Room} from "colyseus"; import gameUtil from "../utils/game.util"; -import {singleton} from "../common/Singleton"; -import {GameEnv} from "../cfg/GameEnv"; import {error} from "../common/Debug"; import {PlayerStateConst} from "../constants/PlayerStateConst"; -import {Player} from "./schema/Player"; /** * 一些常用的方法 diff --git a/src/rooms/commands/AsyncSequence.ts b/src/rooms/commands/AsyncSequence.ts deleted file mode 100644 index 6c3341f..0000000 --- a/src/rooms/commands/AsyncSequence.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Command } from "@colyseus/command"; -import { CardGameState } from "../schema/CardGameState"; -import {Wait} from "./Wait"; - -export class AsyncSequence extends Command { - execute() { - return [new Wait().setPayload(1), new Wait().setPayload(2), new Wait().setPayload(3)]; - } -} diff --git a/src/rooms/commands/BeginGameCommand.ts b/src/rooms/commands/BeginGameCommand.ts index 7798d11..ad9f886 100644 --- a/src/rooms/commands/BeginGameCommand.ts +++ b/src/rooms/commands/BeginGameCommand.ts @@ -1,11 +1,9 @@ - import {Command} from "@colyseus/command"; import {CardGameState} from "../schema/CardGameState"; import {GameStateConst} from "../../constants/GameStateConst"; import gameUtil from "../../utils/game.util"; import {singleton} from "../../common/Singleton"; import {GameEnv} from "../../cfg/GameEnv"; -import {Wait} from "./Wait"; import {NextTurnCommand} from "./NextTurnCommand"; /** diff --git a/src/rooms/commands/ChangeCardCommand.ts b/src/rooms/commands/ChangeCardCommand.ts index cde6ac2..160b166 100644 --- a/src/rooms/commands/ChangeCardCommand.ts +++ b/src/rooms/commands/ChangeCardCommand.ts @@ -46,7 +46,7 @@ export class ChangeCardCommand extends Command { if (this.state.round > 0) { let moreRoundTime = singleton(GameEnv).roundExtTime * 1000; let maxTime = 20 * 1000; - for (let [key, p] of this.state.players) { + for (let [, p] of this.state.players) { p.extraTime = Math.min(p.extraTime + moreRoundTime * 1000, maxTime); } } diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts index 13c7140..4d3a92b 100644 --- a/src/rooms/commands/OnJoinCommand.ts +++ b/src/rooms/commands/OnJoinCommand.ts @@ -3,8 +3,6 @@ import {CardGameState} from "../schema/CardGameState"; import {Player} from "../schema/Player"; import {Client} from "colyseus"; import {GameStateConst} from "../../constants/GameStateConst"; -import { BattleHandler } from "rooms/logic/Handler/BattleHandler"; -import {BaseConst} from "../../constants/BaseConst"; /** * 玩家成功加入房间 @@ -17,7 +15,7 @@ export class OnJoinCommand extends Command= this.room.maxClients) { - this.room.lock(); + this.room.lock().then(() => {}); this.state.gameState = GameStateConst.STATE_WAIT_PREPARE; } this.room.bUserJoin(`${client.sessionId}`, {except: client}); diff --git a/src/rooms/commands/PartResultCommand.ts b/src/rooms/commands/PartResultCommand.ts index c47de9c..9ca0d2c 100644 --- a/src/rooms/commands/PartResultCommand.ts +++ b/src/rooms/commands/PartResultCommand.ts @@ -97,7 +97,7 @@ export class PartResultCommand extends Command { let t0 = []; let t1 = []; - for (let [sessionId, player] of this.state.players) { + for (let [, player] of this.state.players) { if (player.team == 0) { t0.push(player); } else { @@ -123,7 +123,7 @@ export class PartResultCommand extends Command { let deadCount0 = 0; let deadCount1 = 0; - for (let [sessionId, player] of this.state.players) { + for (let [, player] of this.state.players) { if (player.team == 0 && player.state == PlayerStateConst.PLAYER_DEAD ) { deadCount0 ++; } else if (player.team == 1 && player.state == PlayerStateConst.PLAYER_DEAD ){ diff --git a/src/rooms/commands/PlayReadyCommand.ts b/src/rooms/commands/PlayReadyCommand.ts index 6b80588..7214649 100644 --- a/src/rooms/commands/PlayReadyCommand.ts +++ b/src/rooms/commands/PlayReadyCommand.ts @@ -15,7 +15,7 @@ export class PlayReadyCommand extends Command { - validate(n = this.payload) { - return n === 1; - } - - execute() { - throw new Error("This should never execute!") - } -} diff --git a/src/rooms/schema/Card.ts b/src/rooms/schema/Card.ts index 53a9267..c4210fc 100644 --- a/src/rooms/schema/Card.ts +++ b/src/rooms/schema/Card.ts @@ -1,4 +1,4 @@ -import {Schema, type, filter} from "@colyseus/schema"; +import {Schema, type} from "@colyseus/schema"; export class Card extends Schema {