更新测试

cmd/robot/hero.go

@@ -27,26 +27,21 @@ var (
 			// enabled: true,
 			next: func(robot *Robot, rsp proto.Message) {
 				tcs := []*TestCase{}
-				if r, ok := rsp.(*pb.HeroListResp); ok {
+				if _, ok := rsp.(*pb.HeroListResp); ok {
-					for _, v := range r.List {
+					tc := &TestCase{
-						heroId := v.Id
+						desc:     "英雄升级",
-						tc := &TestCase{
+						mainType: string(comm.ModuleHero),
-							desc:     "英雄详情",
+						subType:  hero.StrengthenUplv,
-							mainType: string(comm.ModuleHero),
+						req: &pb.HeroStrengthenUplvReq{
-							subType:  hero.HeroSubTypeInfo,
+							HeroObjID: "62da0353ebe27f9446dd4a1d",
-							req: &pb.HeroInfoReq{
+							ExpCards: map[string]int32{
-								HeroId: heroId,
+								"62da19017944b60fd473df61": 1,
 							},
-							rsp: &pb.HeroInfoResp{},
+						},
-							// enabled: true,
+						rsp:     &pb.HeroStrengthenUplvResp{},
-							// print: func(rsp proto.Message) {
+						// enabled: true,
-							// 	r := rsp.(*pb.HeroInfoResp)
-							// 	fmt.Printf("%v\n", r)
-							// },
-
-						}
-						tcs = append(tcs, tc)
 					}
+					tcs = append(tcs, tc)
 				}
 				robot.addBuilders(tcs)
 			},
@@ -103,7 +98,7 @@ var (
 							req: &pb.HeroStrengthenUplvReq{
 								HeroObjID: heroId,
 								ExpCards: map[string]int32{
-									heroId: 1,
+									"62da19017944b60fd473df61": 1,
 								},
 							},
 							rsp:     &pb.HeroStrengthenUplvResp{},

cmd/robot/story.go

@@ -29,7 +29,7 @@ var (
 			mainType: string(comm.ModuleMainline),
 			subType:  mainline.MainlineChallengeResp,
 			req: &pb.MainlineChallengeReq{
-				ChapterId:  1,
+
 				MainlineId: 1,
 			},
 			rsp: &pb.MainlineChallengeResp{},

cmd/robot/task.go

@@ -29,7 +29,7 @@ var (
 					fmt.Printf("%v \n", v)
 				}
 			},
-			// enabled: true,
+			enabled: true,
 			next: func(robot *Robot, rsp proto.Message) {
 				tcs := []*TestCase{}
 				if v, ok := rsp.(*pb.TaskListResp); ok {

cmd/robot/user.go

@@ -41,11 +41,11 @@ var user_builders = []*TestCase{
 		req: &pb.UserAddResReq{
 			Res: &pb.UserAssets{
 				A: "hero",
-				T: "43001",
+				T: "42911",
 				N: 1,
 			},
 		},
-		rsp: &pb.UserAddResResp{},
+		rsp:     &pb.UserAddResResp{},
 		// enabled: true,
 	}, {
 		desc:     "获取配置",

modules/task/model_task.go

@@ -121,7 +121,6 @@ func (this *ModelTask) modifyUserTask(uid string, taskId string, data map[string
 
 //任务处理
 func (this *ModelTask) taskHandle(uid string, taskType comm.TaskType, taskParam *pb.TaskParam) (*pb.DBTask, error) {
-	//查询当前用户未完成的任务列表
 	data, err := this.moduleTask.configure.getTasks(int32(taskType))
 	if err != nil {
 		log.Errorf("taskHandle err %v", err)
@@ -129,10 +128,13 @@ func (this *ModelTask) taskHandle(uid string, taskType comm.TaskType, taskParam
 	}
 
 	for _, conf := range data {		
-		//不满足限定条件
+		if conf.RestrictiveCondition != 0 {
-		if taskParam.First != conf.RestrictiveCondition {
+			//不满足限定条件
-			continue
+			if taskParam.First < conf.RestrictiveCondition {
+				continue
+			}
 		}
+
 		//检查进度，执行处理器
 		if v, ok := this.checkTaskProgress(uid, conf); ok {
 			if tt, err := this.finishHandle(v, conf); err != nil {
@@ -140,7 +142,6 @@ func (this *ModelTask) taskHandle(uid string, taskType comm.TaskType, taskParam
 			} else {
 				return tt, nil
 			}
-
 		}
 	}
 	return nil, nil
@@ -168,7 +169,7 @@ func (this *ModelTask) finishHandle(userTask *pb.DBTask, config *cfg.Game_taskRo
 
 	userTask.Progress = progress
 	userTask.Status = 1
-	return nil, nil
+	return userTask, nil
 }
 
 //清空任务

modules/task/module.go

@@ -70,8 +70,10 @@ func (this *ModuleTask) SendToTask(session comm.IUserSession, taskType comm.Task
 	if task, err := this.modelTask.taskHandle(session.GetUserId(), taskType, taskPram); err != nil {
 		code = pb.ErrorCode_TaskHandle
 	} else {
-		if err := session.SendMsg(string(comm.ModuleTask), TaskSubTypeFinishedPush, &pb.TaskFinishedPush{TaskId: task.TaskId}); err != nil {
+		if task != nil {
-			this.modelTask.moduleTask.Errorf("SendToTask sendmsg err:%v", err)
+			if err := session.SendMsg(string(comm.ModuleTask), TaskSubTypeFinishedPush, &pb.TaskFinishedPush{TaskId: task.TaskId}); err != nil {
+				this.modelTask.moduleTask.Errorf("SendToTask sendmsg err:%v", err)
+			}
 		}
 	}
 	return