Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
3f26279a89
@ -90,6 +90,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP
|
|||||||
}
|
}
|
||||||
aeward = append(aeward, atno...)
|
aeward = append(aeward, atno...)
|
||||||
}
|
}
|
||||||
|
consumPs = info.Ps[req.Level]
|
||||||
if atno, errdata = this.module.ModuleUser.ConsumePsAddExp(session, consumPs); errdata != nil {
|
if atno, errdata = this.module.ModuleUser.ConsumePsAddExp(session, consumPs); errdata != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -109,7 +110,6 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP
|
|||||||
}
|
}
|
||||||
aeward = append(aeward, atno...)
|
aeward = append(aeward, atno...)
|
||||||
}
|
}
|
||||||
|
|
||||||
session.SendMsg(string(this.module.GetType()), "levelpass", &pb.MainlineLevelPassResp{
|
session.SendMsg(string(this.module.GetType()), "levelpass", &pb.MainlineLevelPassResp{
|
||||||
Level: req.Level,
|
Level: req.Level,
|
||||||
Star: star,
|
Star: star,
|
||||||
|
@ -1214,8 +1214,9 @@ func (this *User) ConsumePsAddExp(session comm.IUserSession, ps int32) (atno []*
|
|||||||
var addExp int32
|
var addExp int32
|
||||||
if ps <= 0 {
|
if ps <= 0 {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_ReqParameterError,
|
Code: pb.ErrorCode_ReqParameterError,
|
||||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||||
|
Message: "ConsumePsAddExp ps is zero",
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user