Merge branch 'master' of http://118.178.135.110:3000/fish/tower_client

# Conflicts:
#	assets/script/game/data/RoleData.ts

assets/script/game/common/LoginManager.ts

@@ -190,6 +190,11 @@ export class LoginManager {
             if (data.role_bag && data.role_bag.roles) {
                 RoleData.setData(data.role_bag.roles)
             }
+
+            if (data.fight_role) {
+                RoleData.setFightRole(data.fight_role)
+            }
+
             if (data.inverntory) {
                 if (data.inverntory.material) {
                     GoodsData.setAllGoods(data.inverntory.material)

assets/script/game/data/RoleData.ts

@@ -1,5 +1,4 @@
 import { RoleConf } from "../ui/tower/conf/RoleConf";
-import { UserData } from "./UserData";
 
 //服务器端返回的英雄数据
 interface RoleServer {
@@ -16,6 +15,8 @@ interface RoleServer {
 class Data {
 
     private _roles: { [id: string]: RoleServer } = {};
+    //上阵英雄
+    private _fightRole:Array<Number> = [];
     setData(data: {[id: string]:RoleServer}): void {
         let rConf = RoleConf.data;
         if (data) {
@@ -32,10 +33,29 @@ class Data {
         }
     }
 
-    getData(id: string): RoleServer {
+    getRoleDataByID(id: string | number): RoleServer {
+        if (typeof id === 'number') {
+            id = id.toString();
+        }
         return this._roles[id];
     }
 
+    //设置出战角色  data {"1":"xxx","2":"xxx","3":"xxx","4":"xxx"}
+    setFightRole(data) {
+        if(!data) return
+        this._fightRole = [0,0,0,0];
+        for(let i = 0; i < this._fightRole.length; i++) {
+            
+            this._fightRole[i] = Number(data[(i+1).toString()] || "0");
+        }
+    }
+
+    //获取出战角色
+    getFightRole() :[number,number,number,number]{
+        return [101,201,301,401];
+        // return this._fightRole;
+    }
+
 }
 
 export let RoleData = new Data;