resolved conflict

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);

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

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<CardGameState, {client: Client,
-    cardId: string,
+    cardId: number,
     playerId: string,
     pos: number,
     effCards: string[]
     }> {
-    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<CardGameState, {client: Client,
                 break;
             }
         }
+        let dstplayer = this.state.players.get(playerId);
+        let dstpet;
+        if (pos != undefined) {
+            dstpet = dstplayer.pets.get(pos+'');
+        }
+        let cardpoint = 10;
+        let eff_cnt = effCards.length;
+        let data = {srcplayer: player, card: cardId, cardpoint, eff_cnt, dstplayer, dstpet}
+        this.room.battleMan.useCard(data);
         return [new TurnEndCommand()];
 
     }

src/rooms/logic/Handler/BattleHandler.ts

@@ -13,7 +13,7 @@ export class BattleHandler {
     private _cs: CardGameState;
 
     private _players: Map<Player, PlayerHandler> = new Map();
-    
+
     _room: Room;
 
     public init(cs: CardGameState, room: Room){
@@ -46,10 +46,10 @@ 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, dbpt_cnt: number, eff_cnt: number, dstplayer: Player, dstpet: Pet})
     {
         if(!obj || obj.card){
             return false;
@@ -65,14 +65,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
@@ -81,7 +81,7 @@ export class BattleHandler {
     };
 
     /**
-     * 确认玩家是否有换牌技能
+     * 确认玩家是否有换效果牌技能
      * @param aplayer 
      */
     public hasTransEffCardSkill(aplayer: Player): boolean{
@@ -106,7 +106,7 @@ export class BattleHandler {
     public onCardLinkOver(aplayer: Player, linkcards: Card[]){
 
     };
-    
+
     /**
      * 使用卡牌结束（暂时自动回调，无需外部触发）
      * @param obj ：使用卡牌相关操作
@@ -139,7 +139,7 @@ export class BattleHandler {
 
     /**
      * 玩家回合开始
-     * @param aplayer 
+     * @param aplayer
      */
     public onPlayerRoundStart(aplayer: Player){
 
@@ -147,9 +147,9 @@ export class BattleHandler {
 
     /**
      * 玩家回合结束
-     * @param aplayer 
+     * @param aplayer
      */
     public onPlayerRoundEnd(aplayer: Player){
 
     };
-}
+}

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);

src/rooms/logic/skill/SkillParam.ts

@@ -4,6 +4,7 @@ import {PetHandler} from "../Handler/PetHandler";
 export class SkillParam{
     cardid: number;
     cardpoint: number;
+    pt_cnt: number;
     eff_cnt: number; 
     srcplayer: PlayerHandler;
     dstplayer: PlayerHandler;