From 5abb015088dce42f8c2f6a93b12e5cb116807755 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Sat, 12 Aug 2023 00:53:28 +0800
Subject: [PATCH] update

---
 modules/stonehenge/api_event.go | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go
index b62526272..47243cffb 100644
--- a/modules/stonehenge/api_event.go
+++ b/modules/stonehenge/api_event.go
@@ -53,27 +53,19 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		}
 		return
 	}
+
 	// EventType29 特殊事件
-	if eventConf.EventType != EventType29 {
-		if v, ok := stone.Rooms.Eventid[req.Eventid]; !ok || v == true { // 不存在该事件
+	if eventConf.EventType != EventType29 && eventConf.EventType != EventType10 {
+		if stone.Rooms.Eventid[req.Eventid] { // 重复完成
 			errdata = &pb.ErrorData{
-				Code:    pb.ErrorCode_ReqParameterError,
-				Title:   pb.ErrorCode_ReqParameterError.ToString(),
+				Code:    pb.ErrorCode_StonehengeRepeatedReward,
+				Title:   pb.ErrorCode_StonehengeRepeatedReward.ToString(),
 				Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid),
 			}
 			return
 		}
 	}
 
-	_, bBox := stone.Rooms.Box[req.Eventid]
-	if stone.Rooms.Eventid[req.Eventid] { // 重复完成
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_StonehengeRepeatedReward,
-			Title:   pb.ErrorCode_StonehengeRepeatedReward.ToString(),
-			Message: fmt.Sprintf("req.Eventid err :%d", req.Eventid),
-		}
-		return
-	}
 	update["stageID"] = stone.StageID
 	if roomConf, err = this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err != nil {
 		errdata = &pb.ErrorData{
@@ -174,7 +166,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 			return
 		}
 		// 次数校验
-		if bBox && stone.Rooms.Box[req.Eventid] < eventConf.Value2 {
+		if stone.Rooms.Box[req.Eventid] < eventConf.Value2 {
 			user := this.module.ModuleUser.GetUser(session.GetUserId())
 			// 校验消耗是否
 			// if len(eventConf.CostItem) > 0 {