From 60a708f82d13950159bbcb1144c1ade7fc8ae086 Mon Sep 17 00:00:00 2001 From: zhl Date: Thu, 3 Dec 2020 20:21:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3SkillMan=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=89=BE=E5=88=B0loadData=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/GConfig.ts | 2 +- src/rooms/logic/Handler/PetHandler.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/GConfig.ts b/src/common/GConfig.ts index 3bd0589..2a55b66 100644 --- a/src/common/GConfig.ts +++ b/src/common/GConfig.ts @@ -6,8 +6,8 @@ import {SkillCfg} from "../cfg/parsers/SkillCfg"; import {SystemCardCfg} from "../cfg/parsers/SystemCardCfg"; import {UnitCfg} from "../cfg/parsers/UnitCfg"; import {BaseConst} from "../constants/BaseConst"; +import SkillMan from "../rooms/logic/skill/SkillMan"; -let SkillMan = require('../rooms/logic/skill/SkillMan'); export function initData() { const rP = DataParser.regCommonParser.bind(DataParser); diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index dec37be..b6301ba 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -7,7 +7,7 @@ import SkillMan from "../skill/SkillMan"; import { EnhanceEffectType, PowerValueType } from "../skill/SkillConst"; import { PlayerHandler } from "./PlayerHandler"; -import { PetInfoMsg } from "message/PetInfo"; +import { PetInfoMsg } from "../../../message/PetInfo"; export class PetHandler { _pet: Pet; @@ -28,8 +28,8 @@ export class PetHandler { _isHero: boolean = false; - _selfskills: number[]; - _exskills: number[]; + _selfskills: number[] = []; + _exskills: number[] = []; public init(apet: Pet, owner: PlayerHandler){ this._pet = apet; @@ -143,7 +143,7 @@ export class PetHandler { public die(){ this._dieSkills.forEach((item: Skill)=>{ - + }); this._owner && this._owner.onPetDied(this); From 583aa8b61c4cb8e69ca91f3c18f0cccf25ab14b3 Mon Sep 17 00:00:00 2001 From: zhl Date: Thu, 3 Dec 2020 20:31:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=89=E5=8D=A1=E5=90=8E=E8=B0=83?= =?UTF-8?q?=E7=94=A8skill=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global.d.ts | 2 ++ src/rooms/commands/SelectPetCommand.ts | 16 ++++++++++++++-- src/rooms/logic/Handler/BattleHandler.ts | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/global.d.ts b/src/global.d.ts index 614a8aa..8d22373 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -16,8 +16,10 @@ declare global { */ import {Client, Room} from "colyseus"; import {PetInfoMsg} from "./message/PetInfo"; +import {BattleHandler} from "./rooms/logic/Handler/BattleHandler"; declare module "colyseus" { interface Room { + battleMan: BattleHandler; /** * 广播玩家加入房间 * @param data diff --git a/src/rooms/commands/SelectPetCommand.ts b/src/rooms/commands/SelectPetCommand.ts index 0d011c0..d30f86c 100644 --- a/src/rooms/commands/SelectPetCommand.ts +++ b/src/rooms/commands/SelectPetCommand.ts @@ -3,17 +3,20 @@ import { CardGameState } from "../schema/CardGameState"; import {Client} from "colyseus"; import {NextTurnCommand} from "./NextTurnCommand"; import {TurnEndCommand} from "./TurnEndCommand"; +import {Player} from "../schema/Player"; +import {Card} from "../schema/Card"; +import {Pet} from "../schema/Pet"; /** * 选择随从或者法术 */ export class SelectPetCommand extends Command { - execute({client, cardId, playerId, pos, effCards}: {client: Client, cardId: string, playerId: string, pos: number, effCards: string[]}) { + execute({client, cardId, playerId, pos, effCards} = this.payload) { let sessionId = this.state.currentTurn; let player = this.state.players.get(sessionId); let ap = 0; @@ -32,6 +35,15 @@ export class SelectPetCommand extends Command = new Map(); - + _room: Room; public init(cs: CardGameState, room: Room){ @@ -43,14 +43,14 @@ export class BattleHandler { }; - + /** * 使用卡片 - * @param obj + * @param obj */ public useCard(obj: - {srcplayer: Player, card: Card, cardpoint: number, eff_cnt: number, dstplayer: Player, dstpet: Pet}) + {srcplayer: Player, card: number, cardpoint: number, eff_cnt: number, dstplayer: Player, dstpet: Pet}) { if(!obj || obj.card){ return false; @@ -66,14 +66,14 @@ export class BattleHandler { return false; } - let ps = new SkillParam(obj.card.id, obj.cardpoint, obj.eff_cnt, ph, dstph, dstpt); + let ps = new SkillParam(obj.card, obj.cardpoint, obj.eff_cnt, ph, dstph, dstpt); ph.useCard(ps); }; /** * 使用技能 - * @param obj + * @param obj */ public useSkill(obj:{ srcplayer: Player, skillid: number, dstplayer: Player, dstpet: Pet @@ -98,7 +98,7 @@ export class BattleHandler { public onCardLinkOver(aplayer: Player, linkcards: Card[]){ }; - + /** * 使用卡牌结束（暂时自动回调，无需外部触发） * @param obj ：使用卡牌相关操作 @@ -131,7 +131,7 @@ export class BattleHandler { /** * 玩家回合开始 - * @param aplayer + * @param aplayer */ public onPlayerRoundStart(aplayer: Player){ @@ -139,9 +139,9 @@ export class BattleHandler { /** * 玩家回合结束 - * @param aplayer + * @param aplayer */ public onPlayerRoundEnd(aplayer: Player){ }; -} \ No newline at end of file +}