From 1d2cda271a90ea1ad9b4347bafdc28daa02ea1c9 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 11 Aug 2023 23:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A0=E9=80=81=E9=97=A8=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/stonehenge/modelStonehenge.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/stonehenge/modelStonehenge.go b/modules/stonehenge/modelStonehenge.go
index 0b98cb552..126d2ea33 100644
--- a/modules/stonehenge/modelStonehenge.go
+++ b/modules/stonehenge/modelStonehenge.go
@@ -137,12 +137,16 @@ func (this *MStonehenge) AddNewEvent(event []int32, stone *pb.DBStonehenge) {
 // 完成事件 开启传送门
 func (this *MStonehenge) EventOpenRoom(event int32, stone *pb.DBStonehenge) {
 	stone.Rooms.Complete = true
-	if curRoomConf, err := this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err == nil {
-		for _, v := range curRoomConf.Condition {
-			if eventConf, err := this.module.configure.GetStoneEventDataById(event); err == nil {
-				if eventConf.EventType == v {
-					stone.Rooms.Complete = false
-					break
+	if roomConf, err := this.module.configure.GetStoneRoomDataById(stone.Rooms.Roomid); err == nil {
+		for _, v := range roomConf.Condition {
+			for k, ok := range stone.Rooms.Eventid {
+				if !ok {
+					if eventConf, err := this.module.configure.GetStoneEventDataById(k); err == nil {
+						if eventConf.EventType == v {
+							stone.Rooms.Complete = false
+							break
+						}
+					}
 				}
 			}
 			if !stone.Rooms.Complete {
@@ -150,4 +154,5 @@ func (this *MStonehenge) EventOpenRoom(event int32, stone *pb.DBStonehenge) {
 			}
 		}
 	}
+
 }