Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
7274faa9e9
@ -3,6 +3,7 @@ package user
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"go_dreamfactory/sys/wordfilter"
|
||||
"strings"
|
||||
)
|
||||
@ -27,6 +28,11 @@ func (this *apiComp) ModifynameCheck(session comm.IUserSession, req *pb.UserModi
|
||||
}
|
||||
|
||||
func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynameReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
user *pb.DBUser
|
||||
err error
|
||||
)
|
||||
|
||||
if errdata = this.ModifynameCheck(session, req); errdata != nil {
|
||||
return
|
||||
}
|
||||
@ -39,7 +45,14 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam
|
||||
this.sendMsg(session, UserSubTypeModifyName, resp)
|
||||
return
|
||||
}
|
||||
|
||||
if user, err = this.module.GetUser(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_UserSessionNobeing,
|
||||
Title: pb.ErrorCode_UserSessionNobeing.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
// expand, err := this.module.modelExpand.GetUserExpand(uid)
|
||||
// if err != nil {
|
||||
// errdata = &pb.ErrorData{
|
||||
@ -52,10 +65,12 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam
|
||||
|
||||
//校验名称修改次数
|
||||
// if expand.ModifynameCount <= 0 {
|
||||
// errdata = this.module.ConsumeRes(session, this.module.globalConf.HeroName, true)
|
||||
// if errdata != nil {
|
||||
// return
|
||||
// }
|
||||
if user.Name != "" {
|
||||
errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{this.module.globalConf.ChangeName}, true)
|
||||
if errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
// }
|
||||
|
||||
// //修改名称次数
|
||||
|
Loading…
Reference in New Issue
Block a user