修正一些编译时的错误提示
This commit is contained in:
parent
2c3afe6e28
commit
edc9d78a36
@ -22,6 +22,14 @@ export class PartCompare {
|
|||||||
* 扣血数量
|
* 扣血数量
|
||||||
*/
|
*/
|
||||||
val: number;
|
val: number;
|
||||||
|
|
||||||
|
constructor(p0: string, p1: string, result: number, round: number, val: number) {
|
||||||
|
this.p0 = p0;
|
||||||
|
this.p1 = p1;
|
||||||
|
this.result = result;
|
||||||
|
this.round = round;
|
||||||
|
this.val = val;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PartResultMsg implements IMsg {
|
export class PartResultMsg implements IMsg {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import {Command} from "@colyseus/command";
|
import {Command} from "@colyseus/command";
|
||||||
import {CardGameState} from "../schema/CardGameState";
|
import {CardGameState} from "../schema/CardGameState";
|
||||||
import {DrawCommand} from "./DrawCommand";
|
import {GameResultCommand} from "./GameResultCommand";
|
||||||
import {GameStateConst} from "../../constants/GameStateConst";
|
import {GameStateConst} from "../../constants/GameStateConst";
|
||||||
import {singleton} from "../../common/Singleton";
|
import {singleton} from "../../common/Singleton";
|
||||||
import {GameEnv} from "../../cfg/GameEnv";
|
import {GameEnv} from "../../cfg/GameEnv";
|
||||||
@ -9,6 +9,7 @@ import {Wait} from "./Wait";
|
|||||||
import {PlayerStateConst} from "../../constants/PlayerStateConst";
|
import {PlayerStateConst} from "../../constants/PlayerStateConst";
|
||||||
import {Player} from "../schema/Player";
|
import {Player} from "../schema/Player";
|
||||||
import gameUtil from "../../utils/game.util";
|
import gameUtil from "../../utils/game.util";
|
||||||
|
import {PartCompare, PartResultMsg} from "../../message/PartResult";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 游戏中的结算轮
|
* 游戏中的结算轮
|
||||||
@ -102,39 +103,19 @@ export class PartResultCommand extends Command<CardGameState, {}> {
|
|||||||
}
|
}
|
||||||
let result = [];
|
let result = [];
|
||||||
let r0 = comparePlayer(t0[0], t1[0]);
|
let r0 = comparePlayer(t0[0], t1[0]);
|
||||||
result.push({
|
let obj0 = new PartCompare(r0.p0.id, r0.p1.id, r0.result, 0, r0.val);
|
||||||
p0: r0.p0.id,
|
result.push(obj0)
|
||||||
p1: r0.p1.id,
|
|
||||||
result: r0.result,
|
|
||||||
round: 0,
|
|
||||||
val: r0.val
|
|
||||||
})
|
|
||||||
let r1 = comparePlayer(t0[1], t1[1]);
|
let r1 = comparePlayer(t0[1], t1[1]);
|
||||||
result.push({
|
let obj1 = new PartCompare(r1.p0.id, r1.p0.id, r1.result, 0, r1.val);
|
||||||
p0: r1.p0.id,
|
result.push(obj1)
|
||||||
p1: r1.p1.id,
|
|
||||||
result: r1.result,
|
|
||||||
round: 0,
|
|
||||||
val: r1.val
|
|
||||||
})
|
|
||||||
if (r0.result == CompareEnum.P0DEAD && r1.next.has(1)) {
|
if (r0.result == CompareEnum.P0DEAD && r1.next.has(1)) {
|
||||||
let r2 = comparePlayer(t0[1], r1.next.get(1));
|
let r2 = comparePlayer(t0[1], r1.next.get(1));
|
||||||
result.push({
|
let obj2 = new PartCompare(r2.p0.id, r2.p0.id, r2.result, 0, r2.val);
|
||||||
p0: r2.p0.id,
|
result.push(obj2)
|
||||||
p1: r2.p1.id,
|
|
||||||
result: r2.result,
|
|
||||||
round: 1,
|
|
||||||
val: r2.val
|
|
||||||
})
|
|
||||||
} else if (r0.result == CompareEnum.P1DEAD && r1.next.has(0)) {
|
} else if (r0.result == CompareEnum.P1DEAD && r1.next.has(0)) {
|
||||||
let r2 = comparePlayer(t0[0], r1.next.get(0));
|
let r2 = comparePlayer(t0[0], r1.next.get(0));
|
||||||
result.push({
|
let obj2 = new PartCompare(r2.p0.id, r2.p0.id, r2.result, 0, r2.val);
|
||||||
p0: r2.p0.id,
|
result.push(obj2)
|
||||||
p1: r2.p1.id,
|
|
||||||
result: r2.result,
|
|
||||||
round: 1,
|
|
||||||
val: r2.val
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let deadCount0 = 0;
|
let deadCount0 = 0;
|
||||||
@ -149,7 +130,7 @@ export class PartResultCommand extends Command<CardGameState, {}> {
|
|||||||
if (deadCount0 == 2 || deadCount1 == 2) { // 游戏结束
|
if (deadCount0 == 2 || deadCount1 == 2) { // 游戏结束
|
||||||
return [new Wait().setPayload(time*1000) ,new GameResultCommand()];
|
return [new Wait().setPayload(time*1000) ,new GameResultCommand()];
|
||||||
} else { // 下发消息, 进入正常的下一轮
|
} else { // 下发消息, 进入正常的下一轮
|
||||||
this.room.bPartResult(result);
|
this.room.bPartResult(new PartResultMsg(result));
|
||||||
return [new Wait().setPayload(time*1000) ,new NextTurnCommand()];
|
return [new Wait().setPayload(time*1000) ,new NextTurnCommand()];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,12 +2,12 @@ import {PlayerHandler} from "../Handler/PlayerHandler";
|
|||||||
import {PetHandler} from "../Handler/PetHandler";
|
import {PetHandler} from "../Handler/PetHandler";
|
||||||
import { Skill } from "./Skill";
|
import { Skill } from "./Skill";
|
||||||
import { GameUnitType } from "./SkillConst";
|
import { GameUnitType } from "./SkillConst";
|
||||||
import { SKillEffectData, SkillInfoData, SkillInfoMsg } from "message/SkillInfo";
|
import { SKillEffectData, SkillInfoData, SkillInfoMsg } from "../../../message/SkillInfo";
|
||||||
|
|
||||||
export class SkillParam{
|
export class SkillParam{
|
||||||
cardid: number;
|
cardid: number;
|
||||||
cardpoint: number;
|
cardpoint: number;
|
||||||
edd_cnt: number;
|
edd_cnt: number;
|
||||||
srcplayer: PlayerHandler;
|
srcplayer: PlayerHandler;
|
||||||
dstplayer: PlayerHandler;
|
dstplayer: PlayerHandler;
|
||||||
dstpet: PetHandler;
|
dstpet: PetHandler;
|
||||||
@ -15,7 +15,7 @@ export class SkillParam{
|
|||||||
srcpet: PetHandler;
|
srcpet: PetHandler;
|
||||||
|
|
||||||
skill: Skill;
|
skill: Skill;
|
||||||
|
|
||||||
constructor(cardid: number, cardpoint: number, effcnt: number, srcplayer: PlayerHandler, srcpet: PetHandler,
|
constructor(cardid: number, cardpoint: number, effcnt: number, srcplayer: PlayerHandler, srcpet: PetHandler,
|
||||||
dstplayer: PlayerHandler, dstpet: PetHandler){
|
dstplayer: PlayerHandler, dstpet: PetHandler){
|
||||||
this.cardid = cardid;
|
this.cardid = cardid;
|
||||||
@ -107,4 +107,4 @@ export class SkillTarget{
|
|||||||
}
|
}
|
||||||
return msg;
|
return msg;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user