From 0a7146d2008dea2886d53b62194f33e513d149e0 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 1 Dec 2020 09:37:21 +0800
Subject: [PATCH] =?UTF-8?q?player=E5=A2=9E=E5=8A=A0=E8=8B=B1=E9=9B=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                          | 1 +
 package.json                        | 2 +-
 src/rooms/commands/OnJoinCommand.ts | 2 +-
 src/rooms/schema/Player.ts          | 5 ++++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eb79dd5..c727bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .idea
+.DS_Store
diff --git a/package.json b/package.json
index b9e5b25..ef8fbbf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "name": "my-app",
+  "name": "card_svr",
   "version": "1.0.0",
   "description": "npm init template for bootstrapping an empty Colyseus project",
   "main": "lib/index.js",
diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts
index 7062b61..85d80e7 100644
--- a/src/rooms/commands/OnJoinCommand.ts
+++ b/src/rooms/commands/OnJoinCommand.ts
@@ -8,7 +8,7 @@ export class OnJoinCommand extends Command<CardGameState, {
 }> {
 
     execute({client}: { client: Client }) {
-        this.state.players.set(client.sessionId, new Player());
+        this.state.players.set(client.sessionId, new Player(0));
         if (this.state.players.size >= this.room.maxClients) {
             this.room.lock();
             this.state.gameState = 1;
diff --git a/src/rooms/schema/Player.ts b/src/rooms/schema/Player.ts
index e2611ae..dac5da8 100644
--- a/src/rooms/schema/Player.ts
+++ b/src/rooms/schema/Player.ts
@@ -3,6 +3,8 @@ import {Card} from "./Card";
 import {Pet} from "./Pet";
 
 export class Player extends Schema {
+    @type("number")
+    heroId: number;
     /**
      * 手牌
      */
@@ -37,11 +39,12 @@ export class Player extends Schema {
 
 
     //TODO: set hp, ap from cfg
-    constructor() {
+    constructor(heroId: number) {
         super();
         this.state = 0;
         this.hp = 200;
         this.ap = 30;
+        this.heroId = heroId;
         for (let i = 0; i < 6; i++) {
             this.pets.set(i+'', new Pet());
         }