Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

comm/error.go

@@ -20,16 +20,16 @@ func NewCustomError(code pb.ErrorCode) error {
 	// 初次调用得用Wrap方法，进行实例化
 	return errors.Wrap(&CustomError{
 		Code:    code,
-		Message: code.String(),
+		Message: code.ToString(),
 	}, "")
 }
 
-//创建配置表错误对象
+// 创建配置表错误对象
 func NewNotFoundConfErr(moduleName string, filename string, id interface{}) error {
 	return fmt.Errorf("服务端配置未找到!模块:%s ,配置文件:%s,目标数据:%v", moduleName, filename, id)
 }
 
-//执行外部模块异常
+// 执行外部模块异常
-func NewExternalModuleErr(moduleName string, methodname string, parameter interface{}) error {
+func NewExternalModuleErr(moduleName string, methodname string, parameter ...interface{}) error {
-	return fmt.Errorf("执行外部模块错误 模块:%s ,配置文件:%s,错误信息:%v", moduleName, methodname, parameter)
+	return fmt.Errorf("执行外部模块错误 模块:%s ,配置文件:%s,目标数据:%v", moduleName, methodname, parameter)
 }

modules/sociaty/api_cross_agree.go

@@ -50,6 +50,8 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (
 		} else {
 			code = pb.ErrorCode_DBError
 		}
+		data.Title = code.ToString()
+		data.Message = err.Error()
 		this.module.Error("公会审核-同意",
 			log.Field{Key: "uid", Value: uid},
 			log.Field{Key: "申请人", Value: req.Uid},

modules/sociaty/api_cross_apply.go

@@ -40,15 +40,17 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
 	userEx, err := this.module.ModuleUser.GetUserExpand(uid)
 	if err != nil {
 		this.module.Error("GetRemoteUserExpand", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
-		code = pb.ErrorCode_UserSessionNobeing
+		code = pb.ErrorCode_UserNofound
 		data.Title = code.ToString()
+		data.Datastring = uid
+		data.Message = err.Error()
 		return
 	}
 
 	if utils.IsInCDHour(userEx.SociatyCd) {
 		code = pb.ErrorCode_SociatyCDLimit
 		data.Title = code.ToString()
-		data.Message = fmt.Sprintf("CD内")
+		data.Message = fmt.Sprintf("CD内[%v]不允许申请", userEx.SociatyCd)
 		return
 	}
 
@@ -56,30 +58,40 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
 	if this.module.modelSociaty.isMember(uid, sociaty) {
 		code = pb.ErrorCode_SociatyBelongTo
 		data.Title = code.ToString()
+		data.Datastring = sociaty.Id
+		data.Message = fmt.Sprintf("[%v]已经是公会[%v]成员", uid, sociaty.Name)
 		return
 	}
 
 	user := this.module.ModuleUser.GetUser(uid)
 	if user == nil {
-		code = pb.ErrorCode_UserSessionNobeing
+		code = pb.ErrorCode_UserNofound
+		data.Title = code.ToString()
+		data.Datastring = uid
 		return
 	}
 
 	// 是否达到入会等级
 	if user.Lv < sociaty.ApplyLv {
 		code = pb.ErrorCode_SociatyAppyLvNoEnough
+		data.Title = code.ToString()
+		data.Message = fmt.Sprintf("实际等级:%v 期望等级:%v", user.Lv, sociaty.ApplyLv)
 		return
 	}
 
 	// 是否已申请
 	if this.module.modelSociaty.isApplied(uid, sociaty) {
 		code = pb.ErrorCode_SociatyApplied
+		data.Title = code.ToString()
+		data.Message = fmt.Sprintf("[%v]已申请", sociaty.Name)
 		return
 	}
 
 	//判断申请人数是否超出最大允许申请数
 	if len(sociaty.ApplyRecord) >= int(this.module.globalConf.GuildAcceptApplyMax) {
 		code = pb.ErrorCode_SociatyApplyMax
+		data.Title = code.ToString()
+		data.Message = fmt.Sprintf("实际人数:%d 期望人数:%d", len(sociaty.ApplyRecord), int(this.module.globalConf.GuildAcceptApplyMax))
 		return
 	}
 
@@ -92,6 +104,8 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
 		} else {
 			code = pb.ErrorCode_DBError
 		}
+		data.Title = code.ToString()
+		data.Message = err.Error()
 		this.module.Error("公会申请",
 			log.Field{Key: "uid", Value: uid},
 			log.Field{Key: "sociatyId", Value: req.SociatyId},
@@ -103,7 +117,6 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.SociatyApplyReq) (
 	// 无需审核
 	if !isCheck {
 		// 触发任务条件
-		// this.module.ModuleRtask.SendToRtask(session, comm.Rtype109, 1)
 		go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype109, 1))
 	}
 	rsp := &pb.SociatyApplyResp{

modules/sociaty/module.go

@@ -242,7 +242,7 @@ type TaskParams struct {
 
 // 任务条件达成通知
 func (this *Sociaty) TCondFinishNotify(uid string, condIds []int32) {
-	log.Debug("公会任务",
+	log.Debug("公会任务通知",
 		log.Field{Key: "uid", Value: uid},
 		log.Field{Key: "condIds", Value: condIds})
 

modules/worldtask/api_accept.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-	"go_dreamfactory/utils"
 )
 
 // 任务接取
@@ -90,9 +89,17 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
 		a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf)
 	} else {
 		// 已完成的任务条件
-		rsp.CondiIds, _, err = a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
+		conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
 		if err == nil {
-			a.module.ModuleBuried.ActiveCondition(uid, utils.NoContain(rsp.CondiIds, curTaskConf.Completetask)...)
+			var unfinishCondIds []int32
+			for _, cond := range conds {
+				if cond.State == pb.BuriedItemFinishState_finish {
+					rsp.CondiIds = append(rsp.CondiIds, cond.Conid)
+				} else if cond.State == pb.BuriedItemFinishState_unfinish {
+					unfinishCondIds = append(unfinishCondIds, cond.Conid)
+				}
+			}
+			a.module.ModuleBuried.ActiveCondition(uid, unfinishCondIds...)
 		}
 	}
 

modules/worldtask/api_completetask.go

@@ -45,9 +45,16 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
 	myWorldtask.Uid = uid
 	wt := myWorldtask.CurrentTask[req.GroupId]
 
-	condIds, _, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId)
+	conds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId)
-	if err == nil && len(condIds) > 0 {
+	if err != nil {
-		wt.CondiIds = append(wt.CondiIds, condIds...)
+		code = pb.ErrorCode_ExternalModule
+		data.Title = code.ToString()
+		data.Message = comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error()
+	}
+	for _, cond := range conds {
+		if cond.State == pb.BuriedItemFinishState_finish {
+			wt.CondiIds = append(wt.CondiIds, cond.Conid)
+		}
 	}
 
 	myWorldtask.CurrentTask[req.GroupId] = wt

modules/worldtask/api_finish.go

@@ -99,20 +99,24 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 		}
 	}
 
-	var (
+	var condiFlag bool
-		condiFlag bool
-	)
-
 	// 检查当前任务的完成条件
 	for _, condId := range curTaskConf.Completetask {
 		if v, ok := userTask.CurrentTask[req.GroupId]; ok {
 			if _, ok := utils.Findx(v.CondiIds, condId); !ok {
-				//
+				conds, err := this.module.ModuleBuried.CheckCondition(uid, condId)
-				conIds, _, err := this.module.ModuleBuried.CheckCondition(uid, condId)
+				if err != nil {
-				if err == nil && len(conIds) > 0 {
+					code = pb.ErrorCode_ExternalModule
-					condiFlag = true
+					data = &pb.ErrorData{
-				} else {
+						Title:   code.ToString(),
-					condiFlag = false
+						Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, condId).Error(),
+					}
+					return
+				}
+				for _, cond := range conds {
+					if cond.Conid == condId && cond.State == pb.BuriedItemFinishState_finish {
+						condiFlag = true
+					}
 				}
 			} else {
 				condiFlag = true
@@ -162,18 +166,16 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
 	return
 }
 
-func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextTaskId int32) *pb.DBWorldtask {
+// Deprecated
+func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextTaskId int32) (*pb.DBWorldtask, error) {
 	//检查下个任务的完成条件
 	nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId)
 	if err != nil {
-		this.module.Error("config not found", log.Field{Key: "taskId", Value: nextTaskId})
+		return nil, err
-		return nil
-	}
-	if nextTaskConf == nil {
-		return nil
 	}
+
 	if nextTaskConf.Des == 1 || nextTaskConf.Des == 4 {
-		return nil
+		return nil, comm.NewCustomError(pb.ErrorCode_WorldtaskNoProcess)
 	}
 
 	if userTask.CurrentTask == nil {
@@ -191,37 +193,41 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT
 		userTask.CurrentTask[nextTaskConf.Group] = wt
 		update["currentTask"] = userTask.CurrentTask
 	} else {
-		for _, condiId := range nextTaskConf.Completetask {
+		nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
-			if condiId == 0 {
+		if ok {
-				continue
+			nwt.TaskId = nextTaskId
+			nwt.TaskType = nextTaskConf.Des
+		} else {
+			nwt = &pb.Worldtask{
+				TaskId:   nextTaskId,
+				TaskType: nextTaskConf.Des,
 			}
-			nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
-			if ok {
-				nwt.TaskId = nextTaskId
-				nwt.TaskType = nextTaskConf.Des
-			} else {
-				nwt = &pb.Worldtask{
-					TaskId:   nextTaskId,
-					TaskType: nextTaskConf.Des,
-				}
-			}
-
-			condIds, _, err := this.module.ModuleBuried.CheckCondition(uid, condiId)
-			if err == nil && len(condIds) > 0 {
-				nwt.CondiIds = condIds
-				userTask.CurrentTask[nextTaskConf.Group] = nwt
-				update["currentTask"] = userTask.CurrentTask
-			}
-
 		}
+
+		conds, err := this.module.ModuleBuried.CheckCondition(uid, nextTaskConf.Completetask...)
+		if err != nil {
+			this.module.Errorf("buried err:%v", err.Error())
+			return nil, err
+		}
+
+		var condIds []int32
+		for _, cond := range conds {
+			if cond.State == pb.BuriedItemFinishState_finish {
+				condIds = append(condIds, cond.Conid)
+			}
+		}
+
+		nwt.CondiIds = condIds
+		userTask.CurrentTask[nextTaskConf.Group] = nwt
+		update["currentTask"] = userTask.CurrentTask
 	}
 
 	if len(update) > 0 {
 		if err := this.module.modelWorldtask.Change(uid, update); err != nil {
 			this.module.Error("DB err", log.Field{Key: "err", Value: err.Error()})
-			return nil
+			return nil, err
 		}
 	}
 
-	return userTask
+	return userTask, nil
 }

modules/worldtask/model_worldtask.go

@@ -161,7 +161,8 @@ func (this *ModelWorldtask) checkCondi(uid string, condiId int32) bool {
 	return false
 }
 
-func (this *ModelWorldtask) updateCheckCond(uid string, userLv int32, userTask *pb.DBWorldtask, nextTaskId int32) *pb.DBWorldtask {
+// 更新当前任务的完成条件
+func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, userTask *pb.DBWorldtask, nextTaskId int32) *pb.DBWorldtask {
 	//检查下个任务的完成条件
 	nextTaskConf, err := this.moduleWorldtask.configure.getWorldtaskById(nextTaskId)
 	if err != nil {
@@ -194,49 +195,33 @@ func (this *ModelWorldtask) updateCheckCond(uid string, userLv int32, userTask *
 		userTask.CurrentTask[nextTaskConf.Group] = wt
 		update["currentTask"] = userTask.CurrentTask
 	} else {
-		for _, condiId := range nextTaskConf.Completetask {
+		nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
-			if condiId == 0 {
+		if ok {
-				continue
+			nwt.TaskId = nextTaskId
+			nwt.TaskType = nextTaskConf.Des
+		} else {
+			nwt = &pb.Worldtask{
+				TaskId:   nextTaskId,
+				TaskType: nextTaskConf.Des,
 			}
-			nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
-			if ok {
-				nwt.TaskId = nextTaskId
-				nwt.TaskType = nextTaskConf.Des
-			} else {
-				nwt = &pb.Worldtask{
-					TaskId:   nextTaskId,
-					TaskType: nextTaskConf.Des,
-				}
-			}
-			// if m, err := this.service.GetModule(comm.ModuleRtask); err == nil {
-			// 	iwt, ok := m.(comm.IRtask)
-			// 	if ok {
-			// 		if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success {
-			// 			this.moduleWorldtask.Debug("任务完成条件不满足",
-			// 				log.Field{Key: "uid", Value: uid},
-			// 				log.Field{Key: "taskId", Value: nextTaskId},
-			// 				log.Field{Key: "condiId", Value: condiId},
-			// 			)
-			// 		} else {
-			// 			if ok {
-			// 				nwt.CondiIds = append(nwt.CondiIds, condiId)
-			// 			} else {
-			// 				condiIds := []int32{condiId}
-			// 				nwt.CondiIds = condiIds
-			// 			}
-			// 		}
-			// 	}
-			// }
-			condIds, _, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, condiId)
-			if err == nil && len(condIds) > 0 {
-				nwt.CondiIds = condIds
-				userTask.CurrentTask[nextTaskConf.Group] = nwt
-				update["currentTask"] = userTask.CurrentTask
-			}
-			userTask.CurrentTask[nextTaskConf.Group] = nwt
-			update["currentTask"] = userTask.CurrentTask
-
 		}
+
+		conds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, nextTaskConf.Completetask...)
+		if err != nil {
+			this.moduleWorldtask.Errorf("buried err:%v", err.Error())
+			return nil
+		}
+
+		var condIds []int32
+		for _, cond := range conds {
+			if cond.State == pb.BuriedItemFinishState_finish {
+				condIds = append(condIds, cond.Conid)
+			}
+		}
+
+		nwt.CondiIds = condIds
+		userTask.CurrentTask[nextTaskConf.Group] = nwt
+		update["currentTask"] = userTask.CurrentTask
 	}
 
 	if len(update) > 0 {
@@ -261,7 +246,7 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId in
 
 	nextTask := make(map[int32]*pb.Worldtask)
 	for _, next := range nextTaskIds {
-		ut := this.updateCheckCond(session.GetUserId(), u.Lv, userTask, next)
+		ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, next)
 		if ut != nil {
 			for k, v := range ut.CurrentTask {
 				nextTask[k] = &pb.Worldtask{

modules/worldtask/module.go

@@ -58,8 +58,8 @@ func (this *Worldtask) Start() (err error) {
 	return
 }
 
-func (this *Worldtask) TCondFinishNotify(uid string, conids []int32) {
+func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
-	this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condIds", Value: conids})
+	this.Debug("世界任务完成条件通知", log.Field{Key: "uid", Value: uid}, log.Field{Key: "condIds", Value: conds})
 
 	session, ok := this.GetUserSession(uid)
 	if !ok {
@@ -85,14 +85,14 @@ func (this *Worldtask) TCondFinishNotify(uid string, conids []int32) {
 	finishedCondIds := []int32{}
 	for _, c := range this.worldtaskConf.GetDataList() {
 		for _, v := range c.Completetask {
-			for _, condId := range conids {
+			for _, cond := range conds {
-				if v == condId {
+				if v == cond.Conid {
 					//校验任务是否是当前任务
 					if task, ok := userTask.CurrentTask[c.Group]; ok {
 						if task.NpcStatus == 1 && c.Key == task.TaskId {
 							groupId = c.Group
 							taskId = c.Key
-							finishedCondIds = append(finishedCondIds, condId)
+							finishedCondIds = append(finishedCondIds, cond.Conid)
 						}
 					}
 					break