From 02148af676dc9692d84e13209212724fdeeec04e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 11 Aug 2022 20:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E9=B8=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/api_resonance.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go
index 59833742c..9fbdd4171 100644
--- a/modules/hero/api_resonance.go
+++ b/modules/hero/api_resonance.go
@@ -57,7 +57,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 	for k, v := range szCostHero {
 		for _, v1 := range resonConfig.Heroneed {
 			if v1.A == comm.HeroType {
-				totalCostCard += 1
+				totalCostCard += v
 			}
 
 			_costHero, code = this.module.GetHeroByObjID(session.GetUserId(), k) // 查询消耗卡是否存在
@@ -67,18 +67,18 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 			if _costHero.Block {
 				code = pb.ErrorCode_HeroIsLock
 			}
-			if v1.T == _costHero.HeroID && (v1.N != v || _costHero.SameCount < v) {
-				code = pb.ErrorCode_HeroNoEnough
-				return
-			}
+			// if v1.T == _costHero.HeroID && v1.N != v {
+			// 	code = pb.ErrorCode_HeroNoEnough
+			// 	return
+			// }
 			_costMaphero[k] = _costHero
 		}
 	}
 
-	if int32(len(req.CostObjID)) != totalCostCard { // 总数消耗校验
-		code = pb.ErrorCode_HeroNoEnough // 消耗数量不对应
-		return
-	}
+	// if int32(len(req.CostObjID)) != int32(len(szCostHero)) { // 总数消耗校验
+	// 	code = pb.ErrorCode_HeroNoEnough // 消耗数量不对应
+	// 	return
+	// }
 	for k, v := range szCostHero {
 		c := this.module.DelCard(session.GetUserId(), _costMaphero[k], v)
 		if c != pb.ErrorCode_Success {
@@ -105,7 +105,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 	}
 	_hero.SameCount = 1
 	_hero.ResonateNum += 1
-	_hero.DistributionResonate += resonConfig.Energy
+	_hero.DistributionResonate += resonConfig.Energy * totalCostCard
 	_heroMap := map[string]interface{}{
 		"resonateNum":          _hero.ResonateNum,
 		"distributionResonate": _hero.DistributionResonate,