From d0d557ac23d7a750c0b9a6034651ee8728294140 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Sat, 12 Aug 2023 00:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_stoneevent.json   | 80 ++++++++++++++++++++++++++++-----
 bin/json/game_stoneroom.json    |  6 +--
 modules/stonehenge/api_event.go |  2 +-
 3 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json
index c14155a04..3b4d8b921 100644
--- a/bin/json/game_stoneevent.json
+++ b/bin/json/game_stoneevent.json
@@ -11,7 +11,13 @@
     "Value2": 0,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -27,7 +33,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -43,7 +55,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -59,7 +77,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -75,7 +99,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -91,7 +121,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -107,7 +143,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -123,7 +165,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -139,7 +187,13 @@
     "Value2": 2,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
@@ -155,7 +209,13 @@
     "Value2": 1,
     "Value3": 0,
     "Value4": 0,
-    "CostItem": [],
+    "CostItem": [
+      {
+        "a": "item",
+        "t": "10000039",
+        "n": 1
+      }
+    ],
     "PostEvent": 0,
     "probability": 0
   },
diff --git a/bin/json/game_stoneroom.json b/bin/json/game_stoneroom.json
index ae346d807..b9f0d424c 100644
--- a/bin/json/game_stoneroom.json
+++ b/bin/json/game_stoneroom.json
@@ -32,7 +32,7 @@
     "EventStoreGroup": 0,
     "BossEvent": 0,
     "Condition": [
-      16
+      14
     ]
   },
   {
@@ -50,7 +50,7 @@
     "EventStoreGroup": 0,
     "BossEvent": 0,
     "Condition": [
-      16
+      14
     ]
   },
   {
@@ -86,7 +86,7 @@
     "EventStoreGroup": 0,
     "BossEvent": 0,
     "Condition": [
-      16
+      14
     ]
   },
   {
diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go
index 0422f5e3c..b62526272 100644
--- a/modules/stonehenge/api_event.go
+++ b/modules/stonehenge/api_event.go
@@ -66,7 +66,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 	}
 
 	_, bBox := stone.Rooms.Box[req.Eventid]
-	if stone.Rooms.Eventid[req.Eventid] || !bBox { // 重复完成
+	if stone.Rooms.Eventid[req.Eventid] { // 重复完成
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_StonehengeRepeatedReward,
 			Title:   pb.ErrorCode_StonehengeRepeatedReward.ToString(),