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

modules/hero/api_drawCard.go

@@ -36,7 +36,6 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		atno        []*pb.UserAtno
 		IsBaodiPool bool             // 是否是保底卡池
 		appointmap  map[int32]string // 指定次数抽卡到指定卡池
-
 		reward      []*cfg.Gameatn   // 许愿石奖励
 	)
 	update = make(map[string]interface{})
@@ -247,8 +246,15 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 	tmp4 = this.module.ModuleTools.GetGlobalConf().RewardStar4
 	var tmp5 *cfg.Gameatn
 	tmp5 = this.module.ModuleTools.GetGlobalConf().RewardStar5
+
 	for i, heroId := range szCards {
-		HeroConf, _ := this.module.configure.GetHeroConfig(heroId)
+		if HeroConf, err := this.module.configure.GetHeroConfig(heroId); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Message: err.Error(),
+			}
+			return
+		} else {
 			szStar = append(szStar, HeroConf.Star) // 获得许愿石
 			if HeroConf.Star == 4 {
 				if rsp.Wish == nil {
@@ -277,6 +283,8 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 			}
 		}
 
+	}
+
 	var (
 		res    [][]*cfg.Gameatn
 		add    []*pb.DBHero

modules/hero/module.go

@@ -104,6 +104,7 @@ func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string,
 			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
 			Message: err.Error(),
 		}
+		return
 	}
 	hero, atno, err = this.modelHero.createHero(session, heroCfgId, num)
 	if err == nil {
@@ -119,6 +120,7 @@ func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string,
 			Title:   pb.ErrorCode_HeroCreate.ToString(),
 			Message: err.Error(),
 		}
+		return
 	}
 	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype1, 1, utils.ToInt32(heroCfgId)))
 	tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype30, heroCfgId, cfg.Color))

modules/robot/modulerobot_gm.go

@@ -58,7 +58,7 @@ func (this *ModuleRobot_GM) OncePipeline(robot IRobot) (err error) {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}
-	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:hero,13004,1"}); errdata != nil {
+	if _, errdata = robot.SendMessage("gm", "cmd", &pb.GMCmdReq{Cmod: "bingo:hero,34011,1"}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
 	}