Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
03e7b66d1b
@ -71,6 +71,8 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
info.Lv = user.Lv
|
info.Lv = user.Lv
|
||||||
|
info.Name = user.Name
|
||||||
|
info.Avatar = user.Avatar
|
||||||
this.module.modelArena.recoverTicket(session, info)
|
this.module.modelArena.recoverTicket(session, info)
|
||||||
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
|
if err = this.module.modelArena.updateArenaUserInfo(info); err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
|
@ -132,7 +132,8 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k)
|
//err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k) // 太多地方配置无效装备 这地方暂时只打印错误日志
|
||||||
|
this.module.Errorf("cfg.Game_equipment not found equip id %s", k)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user