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

comm/imodule.go

@@ -416,8 +416,6 @@ type (
 		BingoJumpTask(session IUserSession, groupId, rtaskId int32) error
 		// 通过任务ID bingo
 		JumpTaskByTaskId(session IUserSession, rtaskId int32) error
-		// 查询我的世界任务
-		GetMyWorldtask(uid string) *pb.DBWorldtask
 		//接取商队任务 //接口废弃
 		AcceptCaravanTask(session IUserSession, groupId int32) (task *pb.Worldtask, errdata *pb.ErrorData)
 		//更新接取任务

modules/dragon/model_dragon.go

@@ -120,18 +120,27 @@ func (this *ModelDragon) CreateDragon(session comm.IUserSession, dragons map[str
 				dragon.Property["csubtime"] = c.Csubtime
 			}
 		}
-		if !bNewDragon {
-			continue
-		}
+
 		for k := range this.module.configure.GetDragonAttributeConf() {
 			dragon.Lvitem[k] = 1
 		}
 
-		if dbModel != nil {
-			err = dbModel.AddList(uid, dragon.Id, dragon)
+		if bNewDragon {
+			if dbModel != nil {
+				err = dbModel.AddList(uid, dragon.Id, dragon)
+			} else {
+				err = this.AddList(uid, dragon.Id, dragon)
+			}
 		} else {
-			err = this.AddList(uid, dragon.Id, dragon)
+			update := make(map[string]interface{}, 0)
+			update["property"] = dragon.Property
+			if dbModel != nil {
+				err = dbModel.ChangeList(uid, dragon.Id, update)
+			} else {
+				err = this.ChangeList(uid, dragon.Id, update)
+			}
 		}
+
 		if err != nil {
 			errdata = &pb.ErrorData{
 				Code:    pb.ErrorCode_DBError,

modules/pagoda/api_getReward.go

@@ -3,6 +3,7 @@ package pagoda
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 )
 
 //参数校验
@@ -19,57 +20,67 @@ func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.PagodaGet
 func (this *apiComp) GetReward(session comm.IUserSession, req *pb.PagodaGetRewardReq) (errdata *pb.ErrorData) {
 
 	var (
-		atno []*pb.UserAtno
+		atno   []*pb.UserAtno
+		pagoda *pb.DBPagoda
+		err    error
+		_cfg   *cfg.GamePagodaTaskRewardData
 	)
 	if errdata = this.GetRewardCheck(session, req); errdata != nil {
 		return // 参数校验失败直接返回
 	}
 
-	if pagoda, err := this.module.modelPagoda.getPagodaList(session.GetUserId()); err != nil {
-		_cfg, err := this.module.configure.GetPagodaRewardconfig(req.Id)
-		if err != nil {
-			errdata = &pb.ErrorData{
-				Code:    pb.ErrorCode_ConfigNoFound,
-				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-				Message: err.Error(),
-			}
-			return
+	if pagoda, err = this.module.modelPagoda.getPagodaList(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: err.Error(),
 		}
-		// 校验是否能领取
-		if _cfg.LayerNum > pagoda.PagodaId {
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_PagodaConditionErr,
-				Title: pb.ErrorCode_PagodaConditionErr.ToString(),
-			}
-			return
-		}
-
-		if _, ok := pagoda.Reward[req.Id]; ok { // 校验是否重复领取
-			errdata = &pb.ErrorData{
-				Code:  pb.ErrorCode_PagodaGetRewardErr,
-				Title: pb.ErrorCode_PagodaGetRewardErr.ToString(),
-			}
-			return
-		}
-		if pagoda.Reward == nil {
-			pagoda.Reward = make(map[int32]bool, 0)
-		}
-		// 发奖励
-		if errdata, atno = this.module.DispenseAtno(session, _cfg.Reward, true); errdata != nil {
-			return
-		}
-		pagoda.Reward[req.Id] = true
-		mapData := make(map[string]interface{}, 0)
-		mapData["reward"] = pagoda.Reward
-		errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData)
-
-		session.SendMsg(string(this.module.GetType()), PagodaGetRewardResp, &pb.PagodaGetRewardResp{
-			Data: pagoda,
-			Atno: atno,
-		})
-		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
-			this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaGetRewardReq", atno)
-		})
+		return
 	}
+	_cfg, err = this.module.configure.GetPagodaRewardconfig(req.Id)
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+			Message: err.Error(),
+		}
+		return
+	}
+	// 校验是否能领取
+	if _cfg.LayerNum > pagoda.PagodaId {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_PagodaConditionErr,
+			Title: pb.ErrorCode_PagodaConditionErr.ToString(),
+		}
+		return
+	}
+
+	if _, ok := pagoda.Reward[req.Id]; ok { // 校验是否重复领取
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_PagodaGetRewardErr,
+			Title: pb.ErrorCode_PagodaGetRewardErr.ToString(),
+		}
+		return
+	}
+	if pagoda.Reward == nil {
+		pagoda.Reward = make(map[int32]bool, 0)
+	}
+	// 发奖励
+	if errdata, atno = this.module.DispenseAtno(session, _cfg.Reward, true); errdata != nil {
+		return
+	}
+	pagoda.Reward[req.Id] = true
+	mapData := make(map[string]interface{}, 0)
+	mapData["reward"] = pagoda.Reward
+	errdata = this.module.ModifyPagodaData(session.GetUserId(), mapData)
+
+	session.SendMsg(string(this.module.GetType()), PagodaGetRewardResp, &pb.PagodaGetRewardResp{
+		Data: pagoda,
+		Atno: atno,
+	})
+	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+		this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "PagodaGetRewardReq", atno)
+	})
+
 	return
 }