From d168499bfb9fdf49f7dc1350e2d85f52dd92ab9f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 27 Sep 2023 17:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E5=BE=81=E5=8F=8C=E5=80=8Dboss?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/activity/module.go       |  9 +++++++++
 modules/items/module.go          |  3 +++
 modules/stonehenge/api_event.go  | 24 ++++++++++++------------
 modules/stonehenge/api_finish.go | 12 +++++++++++-
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/modules/activity/module.go b/modules/activity/module.go
index 5a56a551b..b5313a426 100644
--- a/modules/activity/module.go
+++ b/modules/activity/module.go
@@ -240,11 +240,20 @@ func (this *Activity) HDCelebration(session comm.IUserSession, systemtype int32,
 					}
 				}
 				if conf, err := this.configure.GetHDCelebration(list.Val); err == nil {
+					bfound := false
 					for _, v1 := range conf.Bosstype {
 						if v1 == 0 { // bosstype 为0 表示所有的boss 类型都算
 							bosstype = 0
+							bfound = true
 							break
 						}
+						if v1 == bosstype {
+							bfound = true
+							break
+						}
+					}
+					if !bfound {
+						return false
 					}
 					if conf.Systemtype == systemtype {
 						list.Gotarr[bosstype] += 1
diff --git a/modules/items/module.go b/modules/items/module.go
index d1c3ebcc5..d321a4744 100644
--- a/modules/items/module.go
+++ b/modules/items/module.go
@@ -385,6 +385,9 @@ func (this *Items) CleanItemById(session comm.IUserSession, t string) (errdata *
 		}
 		if len(itmes) > 0 {
 			this.modelItems.DeleteUserPack(session.GetUserId(), itmes...)
+			for _, v := range itmes {
+				v.Amount = 0
+			}
 			this.itemsChangePush(session, itmes) //推送道具背包变化
 		}
 		return
diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go
index cc503c06f..8242b9157 100644
--- a/modules/stonehenge/api_event.go
+++ b/modules/stonehenge/api_event.go
@@ -441,18 +441,18 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		}
 	}
 
-	if stone.Rooms.Complete { // 完成关卡 发放当前关奖励
-		if conf := this.module.configure.GetStageConfByStageid(stone.StageID, stone.CurRoomIndes); conf != nil {
-			if len(conf.FirstReward) > 0 {
-				if errdata, reward = this.module.DispenseAtno(session, conf.FirstReward, true); errdata != nil {
-					return
-				}
-			}
-		}
-		// 记录首通
-		// stone.Reward[stone.StageID] = true
-		// update["reward"] = stone.Reward
-	}
+	// if stone.Rooms.Complete { // 完成关卡 发放当前关奖励
+	// 	if conf := this.module.configure.GetStageConfByStageid(stone.StageID, stone.CurRoomIndes); conf != nil {
+	// 		if len(conf.FirstReward) > 0 {
+	// 			if errdata, reward = this.module.DispenseAtno(session, conf.FirstReward, true); errdata != nil {
+	// 				return
+	// 			}
+	// 		}
+	// 	}
+	// 	// 记录首通
+	// 	// stone.Reward[stone.StageID] = true
+	// 	// update["reward"] = stone.Reward
+	// }
 	if len(eventConf.CostItem) > 0 {
 		if errdata = this.module.ConsumeRes(session, eventConf.CostItem, true); errdata != nil { //真正的消耗
 			return
diff --git a/modules/stonehenge/api_finish.go b/modules/stonehenge/api_finish.go
index 9c4e0cc77..8f6fa626b 100644
--- a/modules/stonehenge/api_finish.go
+++ b/modules/stonehenge/api_finish.go
@@ -20,6 +20,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
 		err         error
 		curintegral int32
 		atno        []*pb.UserAtno
+		reward      []*pb.UserAtno
 	)
 	update = make(map[string]interface{})
 	if errdata = this.FinishCheck(session, req); errdata != nil {
@@ -49,7 +50,16 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishR
 			}
 		}
 	}
-
+	if stone.Rooms.Complete { // 完成关卡 发放当前关奖励
+		if conf := this.module.configure.GetStageConfByStageid(stone.StageID, 1); conf != nil {
+			if len(conf.FirstReward) > 0 {
+				if errdata, reward = this.module.DispenseAtno(session, conf.FirstReward, true); errdata != nil {
+					return
+				}
+				atno = append(atno, reward...)
+			}
+		}
+	}
 	stone.StageID = 0
 	update["stageID"] = stone.StageID
 	stone.CurRoomIndes = 0