From 4956cc6c9c3a778c189c530ff7133205189ac77a Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 27 Jul 2023 19:09:29 +0800
Subject: [PATCH] update

---
 modules/stonehenge/api_event.go | 11 +++++------
 pb/battle_db.pb.go              | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/stonehenge/api_event.go b/modules/stonehenge/api_event.go
index efd8f155a..48492e202 100644
--- a/modules/stonehenge/api_event.go
+++ b/modules/stonehenge/api_event.go
@@ -71,12 +71,11 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		return
 	}
 	if eventConf.EventType == EventType16 { // 捡垃圾事件 直接得奖励
-		if battleConf, err := this.module.configure.GetBattleConfById(eventConf.Value1); err == nil {
-			user := this.module.ModuleUser.GetUser(session.GetUserId())
-			if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(battleConf.RewardLottery, user.Vip, user.Lv); len(lotteryward) > 0 {
-				if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil {
-					this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
-				}
+
+		user := this.module.ModuleUser.GetUser(session.GetUserId())
+		if lotteryward := this.module.ModuleTools.GetGroupDataByLottery(eventConf.Value1, user.Vip, user.Lv); len(lotteryward) > 0 {
+			if errdata, reward = this.module.DispenseAtno(session, lotteryward, true); errdata != nil {
+				this.module.Debugf("Mline lotteryward DispenseRes err:+%v", lotteryward)
 			}
 		}
 	}
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index 39bdb5e5a..f8953cc6a 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -103,6 +103,7 @@ const (
 	PlayType_race         PlayType = 15 // 阵营 塔
 	PlayType_cycle        PlayType = 16 // 循环塔
 	PlayType_guildgve     PlayType = 17 //工会gve
+	PlayType_stone        PlayType = 18 // 石阵秘境
 )
 
 // Enum value maps for PlayType.
@@ -126,6 +127,7 @@ var (
 		15: "race",
 		16: "cycle",
 		17: "guildgve",
+		18: "stone",
 	}
 	PlayType_value = map[string]int32{
 		"null":         0,
@@ -146,6 +148,7 @@ var (
 		"race":         15,
 		"cycle":        16,
 		"guildgve":     17,
+		"stone":        18,
 	}
 )
 
@@ -819,7 +822,7 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a,
 	0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12,
 	0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76,
-	0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xf8, 0x01,
+	0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0x83, 0x02,
 	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75,
 	0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
 	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09,
@@ -835,13 +838,14 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x65, 0x74, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65,
 	0x6e, 0x70, 0x63, 0x10, 0x0e, 0x12, 0x08, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x10, 0x0f, 0x12,
 	0x09, 0x0a, 0x05, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75,
-	0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00,
-	0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42,
-	0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61,
-	0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04,
-	0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x12, 0x09, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x6e,
+	0x65, 0x10, 0x12, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65,
+	0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07,
+	0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10,
+	0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (