From 961a2e8bcf8e1fe8e31b3389b745f4efac598d8a Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 30 May 2023 17:21:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E9=81=97=E6=BC=8F=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caravan/model_caravan.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/caravan/model_caravan.go b/modules/caravan/model_caravan.go
index 56378a5c5..9aa1d8fbc 100644
--- a/modules/caravan/model_caravan.go
+++ b/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

From 4b89fd4362f34968be0e1b14adb82babee947103 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 30 May 2023 17:38:41 +0800
Subject: [PATCH 2/2] update

---
 modules/caravan/api_buyorsell.go | 3 +++
 modules/hunting/api_challenge.go | 4 ++--
 modules/viking/api_challenge.go  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/caravan/api_buyorsell.go b/modules/caravan/api_buyorsell.go
index 4bf3855de..4c1f582a6 100644
--- a/modules/caravan/api_buyorsell.go
+++ b/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 {
diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go
index 8c16a253d..d14ae74df 100644
--- a/modules/hunting/api_challenge.go
+++ b/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
 		}
 
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index 9e11c5f0e..96743d95e 100644
--- a/modules/viking/api_challenge.go
+++ b/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
 		}