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

modules/caravan/api_buyorsell.go

@@ -96,12 +96,15 @@ func (this *apiComp) BuyOrSell(session comm.IUserSession, req *pb.CaravanBuyOrSe
 			for i := caravan.Lv; i <= curLv-caravan.Lv; i++ {
 				if c, err := this.module.configure.GetCaravanLv(int32(i)); err == nil {
 					lvReward = append(lvReward, c.Reward...)
+					update["lv"] = curLv
+					update["baglimit"] = c.Bagtop
 				} else {
 					data.Message = err.Error()
 					code = pb.ErrorCode_ConfigNoFound
 					return
 				}
 			}
+			caravan.Lv = curLv
 		}
 		if len(lvReward) > 0 {
 			if reward := this.module.DispenseRes(session, lvReward, true); reward != pb.ErrorCode_Success {

modules/caravan/model_caravan.go

@@ -54,13 +54,15 @@ func (this *modelCaravan) getCaravanList(uid string) (result *pb.DBCaravan, err
 		result.Citystime = configure.Now().Unix()
 		result.Lv = 1
 		result.Curcity = this.module.configure.GetCaravanInitCity() // 获取默认城市
-		if conf, err := this.module.configure.GetCaravanLv(result.Lv); err != nil {
+		if conf, err := this.module.configure.GetCaravanLv(result.Lv); err == nil {
 			result.Baglimit = conf.Bagtop
 		}
 		this.module.InitCaravanCityData(uid, result) // 初始1级
 		this.module.InitCaravanItemData(uid, result)
 		this.Add(uid, result)
 		return
+	} else {
+		this.module.Errorf("getCaravanList error: %v,uid:%s", err, uid)
 	}
 	err = nil
 	return result, err

modules/hunting/api_challenge.go

@@ -38,7 +38,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
 	if v1, ok := hunting.Ps[req.BossType]; ok && v1 == 0 {
 
 		if code = this.module.ConsumeRes(session, cfgData.PsMg, true); code != pb.ErrorCode_Success { // 扣1点
-			data.Message = err.Error()
+
 			return
 		}
 	} else {
@@ -58,7 +58,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
 			N: ps,
 		}
 		if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success {
-			data.Message = err.Error()
+
 			return
 		}
 

modules/viking/api_challenge.go

@@ -39,7 +39,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 	if v1, ok := viking.Ps[req.BossId]; ok && v1 == 0 {
 
 		if code = this.module.ConsumeRes(session, cfgData.PsMg, true); code != pb.ErrorCode_Success { // 扣1点
-			data.Message = err.Error()
+
 			return
 		}
 	} else {
@@ -59,7 +59,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
 			N: ps,
 		}
 		if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success {
-			data.Message = err.Error()
+
 			return
 		}