|
|
@@ -537,11 +537,11 @@ export default class GameData {
|
|
|
GameController.http.getInitGeneral(this.getInitGeneral.bind(this), parseInt(this.player.init_generals[0]));
|
|
|
}
|
|
|
else {
|
|
|
- let arr = data.generalpack.split(":");
|
|
|
+ let arr = data.generalpack;
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
- let brr = arr[i].split(",");
|
|
|
- let id = parseInt(brr[GENERALPROP.ID - GENERALPROP.PROP_START]);
|
|
|
- let vo: GeneralVO = this.createGeneralVO(id, 0, brr);
|
|
|
+ let o = arr[i];
|
|
|
+ let id =o.id;
|
|
|
+ let vo: GeneralVO = this.createGeneralVO(id, 0, arr[i]);
|
|
|
|
|
|
if (vo.pos >= 0 && vo.pos < 5) {
|
|
|
this.player.generals[vo.pos] = vo;
|
|
|
@@ -645,17 +645,18 @@ export default class GameData {
|
|
|
vo.fragment_compose = config.fragment_compose;
|
|
|
if (type == 0) {
|
|
|
//服务器数据
|
|
|
- vo.lv = parseInt(arg[GENERALPROP.LV - GENERALPROP.PROP_START]);
|
|
|
- vo.pos = parseInt(arg[GENERALPROP.POS - GENERALPROP.PROP_START]);
|
|
|
- vo.star = parseInt(arg[GENERALPROP.STAR - GENERALPROP.PROP_START]);
|
|
|
- vo.fragment = parseInt(arg[GENERALPROP.FRAGMENT - GENERALPROP.PROP_START]);
|
|
|
- if (parseInt(arg[GENERALPROP.STATUS - GENERALPROP.PROP_START]) == GENERALSTATUS.GET) {
|
|
|
+ let g = arg as GeneralProp;
|
|
|
+ vo.lv = g.lv
|
|
|
+ vo.pos = g.pos;
|
|
|
+ vo.star = g.star;
|
|
|
+ vo.fragment = g.fragment;
|
|
|
+ if (g.status == GENERALSTATUS.GET) {
|
|
|
vo.status = GENERALSTATUS.GET;
|
|
|
}
|
|
|
else {
|
|
|
vo.status = this.updateGeneralStatus(vo);
|
|
|
}
|
|
|
- vo.exp = parseInt(arg[GENERALPROP.EXP - GENERALPROP.PROP_START]);
|
|
|
+ vo.exp = g.exp;
|
|
|
}
|
|
|
else if (type == 1) {
|
|
|
vo.lv = this.player.getProp(PLAYERPROP.BARRACK);
|