From 5aefe222704ab627702c315837d3447e5fc06ada Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 4 Jul 2022 17:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8B=B1=E9=9B=84=E5=85=B1?=
 =?UTF-8?q?=E9=B8=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/dbservice/db_comp.go        |  2 +-
 modules/hero/api_chouka.go          |  8 +++++---
 modules/hero/api_resonance.go       | 13 ++-----------
 modules/hero/api_resonanceReset.go  |  4 +---
 modules/hero/api_resonanceSelect.go |  2 +-
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/modules/dbservice/db_comp.go b/modules/dbservice/db_comp.go
index 2fd0bed63..366d945e1 100644
--- a/modules/dbservice/db_comp.go
+++ b/modules/dbservice/db_comp.go
@@ -148,7 +148,7 @@ func (this *DB_Comp) Model_UpdateDBByLog(uid string) (err error) {
 			for _, v := range data.D[2].(bson.D) {
 				Query[v.Key] = v.Value
 			}
-			_, err = this.DB.UpdateMany(core.SqlTable(_tableName), Where, bson.M{"$set": Query})
+			_, err = this.DB.UpdateMany(core.SqlTable(_tableName), Where, bson.M{"$set": Query}) //, new(options.UpdateOptions).SetUpsert(true)
 			if err != nil {
 				log.Errorf("Update %s db err:%v", core.SqlTable(_tableName), err)
 				ErrorLogCount[data.ID]++
diff --git a/modules/hero/api_chouka.go b/modules/hero/api_chouka.go
index d135d9905..8746a36fb 100644
--- a/modules/hero/api_chouka.go
+++ b/modules/hero/api_chouka.go
@@ -5,15 +5,17 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
+
+	"google.golang.org/protobuf/proto"
 )
 
-func (this *apiComp) ChoukaCheck(session comm.IUserSession, req *pb.HeroChoukaReq) (result map[string]interface{}, code comm.ErrorCode) {
-	result = make(map[string]interface{})
+func (this *apiComp) ChoukaCheck(session comm.IUserSession, req *pb.HeroChoukaReq) (code pb.ErrorCode) {
+
 	return
 }
 
 //抽卡
-func (this *apiComp) Chouka(session comm.IUserSession, req *pb.HeroChoukaReq) (code pb.ErrorCode) {
+func (this *apiComp) Chouka(session comm.IUserSession, req *pb.HeroChoukaReq) (code pb.ErrorCode, data proto.Message) {
 	rsp := &pb.HeroChoukaResp{}
 
 	defer func() {
diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go
index f47e3cdca..c1ee3c6e9 100644
--- a/modules/hero/api_resonance.go
+++ b/modules/hero/api_resonance.go
@@ -21,7 +21,6 @@ func (this *apiComp) ResonanceCheck(session comm.IUserSession, req *pb.HeroReson
 /// 英雄共鸣
 func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceReq) (code pb.ErrorCode, data proto.Message) {
 
-	bCheckOk := true
 	_hero, code := this.module.GetHero(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在
 	if code != pb.ErrorCode_Success {
 		return
@@ -58,19 +57,11 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 	for _, v := range resonConfig.Need {
 		if v.A == "hero" && v.T == strconv.Itoa(int(_costHero.HeroID)) {
 			if req.Amount != v.N {
-				code = pb.ErrorCode_ReqParameterError
+				code = pb.ErrorCode_HeroNoEnough // 消耗数量不对应
 				return
-			} else {
-				bCheckOk = true
-				break
 			}
 		}
 	}
-	if !bCheckOk { // 配置校验不通过
-		code = pb.ErrorCode_HeroNoEnough
-		return
-	}
-	bCheckOk = true
 	// 金币校验
 	for _, v := range resonConfig.Need {
 		if v.A == "attr" { // 查询玩家身上资源是否满足
@@ -82,7 +73,7 @@ func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceR
 		}
 	}
 
-	code = this.module.DelCard(req.CostObjID, req.Amount)
+	code = this.module.DelCard(req.CostObjID, req.Amount) // 删除材料卡
 	if code != pb.ErrorCode_Success {
 		code = pb.ErrorCode_DBError
 		return
diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go
index 81d161cb9..e75e97f04 100644
--- a/modules/hero/api_resonanceReset.go
+++ b/modules/hero/api_resonanceReset.go
@@ -31,9 +31,7 @@ func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroReson
 	if code != pb.ErrorCode_Success {
 		return
 	}
-	if code != pb.ErrorCode_Success {
-		return
-	}
+
 	if _hero.ResonateNum <= 0 { // 没有共鸣 不允许重置
 		code = pb.ErrorCode_HeroNoResonate
 		return
diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go
index d9ad511b3..87d7c4875 100644
--- a/modules/hero/api_resonanceSelect.go
+++ b/modules/hero/api_resonanceSelect.go
@@ -53,7 +53,7 @@ func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroR
 		code = pb.ErrorCode_ConfigNoFound
 		return
 	}
-
+	// 修改玩家属性
 	property := make(map[string]int32, 0)
 	switch req.UseType {
 	case 1: