From 57d52b1fd34c44fe78c2f628261cc8d01653d314 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Thu, 27 Jul 2023 20:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/guildgve/api_challengefinish.go | 5 ++++-
 modules/guildgve/modelUniongve.go       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/guildgve/api_challengefinish.go b/modules/guildgve/api_challengefinish.go
index af6db35a7..fb80f38db 100644
--- a/modules/guildgve/api_challengefinish.go
+++ b/modules/guildgve/api_challengefinish.go
@@ -128,9 +128,12 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 				}
 				v.Record = append(v.Record, record)
 				go this.module.modelGuildGve.booshpchangepush(req.Guildid, info)
-				if v.Hp < 0 {
+				if v.Hp <= 0 {
 					v.Hp = 0
 					info.Kills++
+					if info.Fire == v.Boosid {
+						info.Fire = 0
+					}
 					info.Lastkilltime = configure.Now().Unix()
 					this.module.modelRank.updateRank(info)
 					go this.module.modelGuildGve.booskill(req.Guildid, req.Boosid, info)
diff --git a/modules/guildgve/modelUniongve.go b/modules/guildgve/modelUniongve.go
index c4d4002d6..6772955ac 100644
--- a/modules/guildgve/modelUniongve.go
+++ b/modules/guildgve/modelUniongve.go
@@ -249,7 +249,7 @@ func (this *ModelUniongve) booskill(unionid string, boosid int32, info *pb.DBGui
 			return
 		}
 		v.Boosid = conf.BossId
-		v.Hp = v.Hp
+		v.Hp = conf.Hp
 		v.Record = make([]*pb.DBGveRecord, 0)
 	}
 	if err = this.updateGuildGve(info); err != nil {