diff --git a/modules/pagoda/api_challenge.go b/modules/pagoda/api_challenge.go index 04c182d98..72ef7ee8c 100644 --- a/modules/pagoda/api_challenge.go +++ b/modules/pagoda/api_challenge.go @@ -39,9 +39,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.PagodaChalleng return } - if v, ok := pagoda.Data[req.Cid]; !ok { + if v, ok := pagoda.Data[conf.Tab]; !ok { if conf.LayerNum == 1 { - pagoda.Data[req.Cid] = 0 + pagoda.Data[conf.Tab] = 0 } else { code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配 return diff --git a/modules/pagoda/api_challengeover.go b/modules/pagoda/api_challengeover.go index ce8923022..4a7d1173e 100644 --- a/modules/pagoda/api_challengeover.go +++ b/modules/pagoda/api_challengeover.go @@ -47,9 +47,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal return } - if v, ok := pagoda.Data[req.Cid]; !ok { + if v, ok := pagoda.Data[conf.Tab]; !ok { if conf.LayerNum == 1 { - pagoda.Data[req.Cid] = 0 + pagoda.Data[conf.Tab] = 0 } else { code = pb.ErrorCode_PagodaLevlErr // 挑战关卡数据不匹配 return @@ -86,7 +86,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal } } - pagoda.Data[req.Cid] += 1 + pagoda.Data[conf.Tab] += 1 mapData["pagodaId"] = pagoda.PagodaId mapData["type"] = pagoda.Type diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index ae407e6bb..1d818039e 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -221,7 +221,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq nextProficiency := this.module.configure.GetSmithyProficileData(req.ReelId, stove.Data[req.ReelId].Lv+1) if nextProficiency != nil && nextProficiency.Proficiency <= stove.Data[req.ReelId].Value { // 提升熟练度 stove.Data[req.ReelId].Lv += 1 - stove.Data[req.ReelId].Value = 0 + // 校验是否解锁了新的图纸 if nextProficiency.Type == comm.SmithyReelType3 { stove.Data[nextProficiency.Value1] = &pb.Mastery{ diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 7dd8143c1..63d51799c 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -203,32 +203,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe ) return } - + // 发奖 + if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { + this.module.Error("资源发放", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "groupId", Value: req.GroupId}, + log.Field{Key: "taskId", Value: req.TaskId}, + log.Field{Key: "reword", Value: curTaskConf.Reword}, + log.Field{Key: "code", Value: code}, + ) + } + //判断是否配置了通知module - if len(curTaskConf.Module) == 0 { - // 发奖 - if code = this.module.DispenseRes(session, curTaskConf.Reword, true); code != pb.ErrorCode_Success { - this.module.Error("资源发放", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "groupId", Value: req.GroupId}, - log.Field{Key: "taskId", Value: req.TaskId}, - log.Field{Key: "reword", Value: curTaskConf.Reword}, - log.Field{Key: "code", Value: code}, - ) + for _, m := range curTaskConf.Module { + i, err := this.service.GetModule(core.M_Modules(m)) + if err != nil { + this.module.Errorln(err) + continue } - } else { - for _, m := range curTaskConf.Module { - i, err := this.service.GetModule(core.M_Modules(m)) - if err != nil { - this.module.Errorln(err) - continue - } - if ic, ok := i.(comm.ITaskComplete); ok { - ic.TaskComplete(session, req.TaskId) - } + if ic, ok := i.(comm.ITaskComplete); ok { + ic.TaskComplete(session, req.TaskId) } } + } //判断任务是否已完成 diff --git a/modules/worldtask/model_worldtask.go b/modules/worldtask/model_worldtask.go index e3fba5c7c..ad8e124a2 100644 --- a/modules/worldtask/model_worldtask.go +++ b/modules/worldtask/model_worldtask.go @@ -273,20 +273,18 @@ func (this *ModelWorldtask) taskFinish(session comm.IUserSession, groupId, taskI return } + this.moduleWorldtask.DispenseRes(session, curTaskConf.Reword, true) //判断是否配置了通知module - if len(curTaskConf.Module) == 0 { - this.moduleWorldtask.DispenseRes(session, curTaskConf.Reword, true) - } else { - for _, m := range curTaskConf.Module { - i, err := this.service.GetModule(core.M_Modules(m)) - if err != nil { - this.moduleWorldtask.Errorln(err) - continue - } + for _, m := range curTaskConf.Module { + i, err := this.service.GetModule(core.M_Modules(m)) + if err != nil { + this.moduleWorldtask.Errorln(err) + continue + } - if ic, ok := i.(comm.ITaskComplete); ok { - ic.TaskComplete(session, taskId) - } + if ic, ok := i.(comm.ITaskComplete); ok { + ic.TaskComplete(session, taskId) } } + }