From 165b7fcf6272cc70ebff8f1498bfa79883463f26 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 30 Nov 2022 10:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E6=97=B6=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=B8=80=E4=B8=8B=E7=BE=81=E7=BB=8A=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/library/api_activationfetter.go | 19 +++++++++++++++++++
 modules/library/module.go               |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go
index 9054828d8..8eb217f3e 100644
--- a/modules/library/api_activationfetter.go
+++ b/modules/library/api_activationfetter.go
@@ -35,6 +35,25 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library
 	fetter.Activation = true
 	mapData := make(map[string]interface{}, 0)
 	mapData["activation"] = fetter.Activation
+	// 激活的时候算一下 当前羁绊等级
+	list := this.module.modelFetter.getHeroFetterList(session.GetUserId())
+	conf := this.configure.GetLibraryFetter(fetter.Fid, 1)
+	var minLv int32
+	for _, v1 := range conf.Hid {
+		for _, v := range list {
+			if v.Heroid == v1 {
+				if minLv == 0 {
+					minLv = v.Favorlv
+				}
+				if minLv > v.Favorlv {
+					minLv = v.Favorlv
+				}
+				break
+			}
+		}
+	}
+	fetter.Fetterlv = minLv
+	mapData["fetterlv"] = fetter.Fetterlv
 	this.module.modelLibrary.modifyLibraryDataByObjId(session.GetUserId(), fetter.Id, mapData)
 	rsp.Data = fetter
 	return
diff --git a/modules/library/module.go b/modules/library/module.go
index 73a4ab9e1..774c287ac 100644
--- a/modules/library/module.go
+++ b/modules/library/module.go
@@ -203,7 +203,10 @@ func (this *Library) AddHeroFetterData(uid, heroConfId string) (code pb.ErrorCod
 					for _, v1 := range conf.Hid {
 						for _, v := range list {
 							if v.Heroid == v1 {
-								if minLv < v.Favorlv {
+								if minLv == 0 {
+									minLv = v.Favorlv
+								}
+								if minLv > v.Favorlv {
 									minLv = v.Favorlv
 								}
 								break