From 3bbb9ac9a6986a9981cd2bcda780ca29c8c04951 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Wed, 16 Nov 2022 17:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=B3=E5=8D=A1=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/combat/api_challengereceive.go | 14 ++++++++------
 modules/combat/api_drop.go             |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/combat/api_challengereceive.go b/modules/combat/api_challengereceive.go
index 3b22b038b..204ba5f12 100644
--- a/modules/combat/api_challengereceive.go
+++ b/modules/combat/api_challengereceive.go
@@ -57,6 +57,7 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
 			return
 		}
 
+		this.module.DispenseRes(session, manster.Award, true)
 		for _, v := range level.Passdroplist {
 			ispass := false
 			for _, v1 := range info.Passdrop {
@@ -81,14 +82,15 @@ func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatC
 				break
 			}
 		}
-		this.module.DispenseRes(session, manster.Award, true)
-	}
-	if pass {
-		if err = this.module.modelCombat.delInfo(session.GetUserId()); err != nil {
-			code = pb.ErrorCode_DBError
-			return
+		if pass {
+			if err = this.module.modelCombat.delInfo(session.GetUserId()); err != nil {
+				code = pb.ErrorCode_DBError
+				return
+			}
+			this.module.DispenseRes(session, level.Award, true)
 		}
 	}
+
 	session.SendMsg(string(this.module.GetType()), "challengereceive", &pb.CombatChallengeReceiveResp{Issucc: true, Pass: pass})
 	return
 }
diff --git a/modules/combat/api_drop.go b/modules/combat/api_drop.go
index 4175e6e51..9ed0a05b6 100644
--- a/modules/combat/api_drop.go
+++ b/modules/combat/api_drop.go
@@ -87,6 +87,7 @@ func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (cod
 			code = pb.ErrorCode_DBError
 			return
 		}
+		this.module.DispenseRes(session, level.Award, true)
 	}
 
 	session.SendMsg(string(this.module.GetType()), "drop", &pb.CombatDropResp{Code: code, Atns: atns, Pass: pass})