Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
9d16c57768
@ -17,6 +17,7 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq)
|
||||
if code = this.AccuseCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty == nil {
|
||||
|
@ -12,6 +12,7 @@ func (this *apiComp) ActivitylistCheck(session comm.IUserSession, req *pb.Sociat
|
||||
}
|
||||
|
||||
func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActivityListReq) (code pb.ErrorCode, data *pb.ErrorData) {
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty == nil {
|
||||
|
@ -20,6 +20,7 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA
|
||||
if code = this.ActivityreceiveCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty == nil {
|
||||
|
@ -21,6 +21,7 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (
|
||||
if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
sociaty := this.module.modelSociaty.getUserSociaty(uid)
|
||||
if sociaty == nil {
|
||||
|
@ -20,6 +20,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
|
||||
if code = a.AcceptCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
user := a.module.ModuleUser.GetUser(uid)
|
||||
if user == nil {
|
||||
|
@ -22,11 +22,10 @@ func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.Worldt
|
||||
}
|
||||
|
||||
func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode, data *pb.ErrorData) {
|
||||
|
||||
if code = this.BattlefinishCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
taskConf, err := this.module.configure.getWorldtaskById(req.TaskId)
|
||||
if err != nil || taskConf == nil {
|
||||
|
@ -23,7 +23,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat
|
||||
if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
data = &pb.ErrorData{}
|
||||
resp := &pb.WorldtaskBattleStartResp{}
|
||||
|
||||
battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId)
|
||||
|
@ -16,7 +16,7 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC
|
||||
if code = this.ChapterrewardCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
rsp := &pb.WorldtaskChapterrewardResp{}
|
||||
myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid)
|
||||
|
@ -17,6 +17,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
|
||||
if code = this.CompleteCondiCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
data = &pb.ErrorData{}
|
||||
rsp := &pb.WorldtaskCompleteCondiResp{}
|
||||
uid := session.GetUserId()
|
||||
|
||||
|
@ -23,7 +23,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
|
||||
if code = this.FinishCheck(session, req); code != pb.ErrorCode_Success {
|
||||
return
|
||||
}
|
||||
|
||||
data = &pb.ErrorData{}
|
||||
uid := session.GetUserId()
|
||||
|
||||
rsp := &pb.WorldtaskFinishResp{}
|
||||
|
@ -18,7 +18,7 @@ func (this *apiComp) MineCheck(session comm.IUserSession, req *pb.WorldtaskMineR
|
||||
|
||||
func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (code pb.ErrorCode, data *pb.ErrorData) {
|
||||
uid := session.GetUserId()
|
||||
|
||||
data = &pb.ErrorData{}
|
||||
user := this.module.ModuleUser.GetUser(uid)
|
||||
if user == nil {
|
||||
code = pb.ErrorCode_UserNofound
|
||||
|
Loading…
Reference in New Issue
Block a user