diff --git a/bin/json/game_bufflottery.json b/bin/json/game_bufflottery.json
new file mode 100644
index 000000000..09d8d0cce
--- /dev/null
+++ b/bin/json/game_bufflottery.json
@@ -0,0 +1,98 @@
+[
+  {
+    "Id": 1,
+    "GroupId": 100001,
+    "GroupType": 1,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1001,
+    "SubGroupType": 1,
+    "buffID": 251023111,
+    "SubGroupNum": 3,
+    "BuffWt": 50,
+    "TypeWt": 60
+  },
+  {
+    "Id": 2,
+    "GroupId": 100001,
+    "GroupType": 1,
+    "SubGroupWt": 0,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "buffID": 251023112,
+    "SubGroupNum": 0,
+    "BuffWt": 50,
+    "TypeWt": 60
+  },
+  {
+    "Id": 3,
+    "GroupId": 100001,
+    "GroupType": 1,
+    "SubGroupWt": 0,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "buffID": 200000001,
+    "SubGroupNum": 0,
+    "BuffWt": 50,
+    "TypeWt": 60
+  },
+  {
+    "Id": 4,
+    "GroupId": 100001,
+    "GroupType": 1,
+    "SubGroupWt": 0,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "buffID": 200000002,
+    "SubGroupNum": 0,
+    "BuffWt": 50,
+    "TypeWt": 60
+  },
+  {
+    "Id": 5,
+    "GroupId": 100002,
+    "GroupType": 2,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1001,
+    "SubGroupType": 1,
+    "buffID": 253005111,
+    "SubGroupNum": 2,
+    "BuffWt": 50,
+    "TypeWt": 60
+  },
+  {
+    "Id": 6,
+    "GroupId": 100002,
+    "GroupType": 0,
+    "SubGroupWt": 0,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "buffID": 253005112,
+    "SubGroupNum": 0,
+    "BuffWt": 50,
+    "TypeWt": 60
+  },
+  {
+    "Id": 7,
+    "GroupId": 100002,
+    "GroupType": 0,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1002,
+    "SubGroupType": 2,
+    "buffID": 225002011,
+    "SubGroupNum": 1,
+    "BuffWt": 500,
+    "TypeWt": 600
+  },
+  {
+    "Id": 8,
+    "GroupId": 100002,
+    "GroupType": 0,
+    "SubGroupWt": 0,
+    "SubGroupId": 1002,
+    "SubGroupType": 0,
+    "buffID": 225002012,
+    "SubGroupNum": 0,
+    "BuffWt": 500,
+    "TypeWt": 600
+  }
+]
\ No newline at end of file
diff --git a/bin/json/game_eventlottery.json b/bin/json/game_eventlottery.json
new file mode 100644
index 000000000..1b1c2d8d0
--- /dev/null
+++ b/bin/json/game_eventlottery.json
@@ -0,0 +1,46 @@
+[
+  {
+    "Id": 1,
+    "GroupId": 1001001,
+    "GroupType": 2,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1001,
+    "SubGroupType": 1,
+    "EventID": 10000001,
+    "SubGroupNum": 1,
+    "EventWt": 50
+  },
+  {
+    "Id": 2,
+    "GroupId": 1001001,
+    "GroupType": 0,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "EventID": 10000002,
+    "SubGroupNum": 0,
+    "EventWt": 100
+  },
+  {
+    "Id": 3,
+    "GroupId": 1001001,
+    "GroupType": 0,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1002,
+    "SubGroupType": 2,
+    "EventID": 10000003,
+    "SubGroupNum": 2,
+    "EventWt": 500
+  },
+  {
+    "Id": 4,
+    "GroupId": 1001001,
+    "GroupType": 0,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1002,
+    "SubGroupType": 0,
+    "EventID": 10000004,
+    "SubGroupNum": 0,
+    "EventWt": 500
+  }
+]
\ No newline at end of file
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index fc188f11c..41b79e12c 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -10,9 +10,7 @@
     "EditorStage": 0,
     "venturemodel": "Person/10000/10000M.prefab",
     "ventureavatar": [
-      "zxgq_js_44005",
-      "zxgq_js_44006",
-      "zxgq_js_44004"
+      "zxgq_js_44005"
     ],
     "heroimg": "zxgq_js_34004",
     "bubbletext": {
@@ -109,8 +107,7 @@
     "EditorStage": 0,
     "venturemodel": "Person/10000/10000W.prefab",
     "ventureavatar": [
-      "zxgq_js_44005",
-      "zxgq_js_44004"
+      "zxgq_js_44005"
     ],
     "heroimg": "attr_diamond",
     "bubbletext": {
@@ -207,8 +204,7 @@
     "EditorStage": 0,
     "venturemodel": "Person/10000/10000M.prefab",
     "ventureavatar": [
-      "zxgq_js_44005",
-      "zxgq_js_44006"
+      "zxgq_js_44005"
     ],
     "heroimg": "attr_diamond",
     "bubbletext": {
@@ -305,9 +301,7 @@
     "EditorStage": 0,
     "venturemodel": "Person/10000/10000W.prefab",
     "ventureavatar": [
-      "zxgq_js_44005",
-      "zxgq_js_44006",
-      "zxgq_js_44004"
+      "zxgq_js_44005"
     ],
     "heroimg": "zxgq_js_34004",
     "bubbletext": {
diff --git a/bin/json/game_roomlottery.json b/bin/json/game_roomlottery.json
new file mode 100644
index 000000000..fee0c4196
--- /dev/null
+++ b/bin/json/game_roomlottery.json
@@ -0,0 +1,68 @@
+[
+  {
+    "Id": 1,
+    "GroupId": 100001,
+    "GroupType": 1,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1001,
+    "SubGroupType": 1,
+    "RoomID": 100001,
+    "SubGroupNum": 1,
+    "RoomWt": 50
+  },
+  {
+    "Id": 2,
+    "GroupId": 100001,
+    "GroupType": 0,
+    "SubGroupWt": 0,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "RoomID": 100002,
+    "SubGroupNum": 0,
+    "RoomWt": 50
+  },
+  {
+    "Id": 3,
+    "GroupId": 100001,
+    "GroupType": 0,
+    "SubGroupWt": 0,
+    "SubGroupId": 1001,
+    "SubGroupType": 0,
+    "RoomID": 100003,
+    "SubGroupNum": 0,
+    "RoomWt": 50
+  },
+  {
+    "Id": 4,
+    "GroupId": 100002,
+    "GroupType": 2,
+    "SubGroupWt": 1000,
+    "SubGroupId": 1001,
+    "SubGroupType": 1,
+    "RoomID": 100004,
+    "SubGroupNum": 1,
+    "RoomWt": 50
+  },
+  {
+    "Id": 5,
+    "GroupId": 100002,
+    "GroupType": 0,
+    "SubGroupWt": 0,
+    "SubGroupId": 0,
+    "SubGroupType": 0,
+    "RoomID": 100005,
+    "SubGroupNum": 0,
+    "RoomWt": 50
+  },
+  {
+    "Id": 6,
+    "GroupId": 100002,
+    "GroupType": 0,
+    "SubGroupWt": 500,
+    "SubGroupId": 1002,
+    "SubGroupType": 1,
+    "RoomID": 100006,
+    "SubGroupNum": 1,
+    "RoomWt": 50
+  }
+]
\ No newline at end of file
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index 7ceef39a9..bbad631a7 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -250,14 +250,14 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 				}
 			}
 			//抽出5星英雄后A次抽奖内不会再抽到5星英雄（普通卡池+阵营卡池）
-			if heroRecord.Race[req.DrawType] >= cfgGlobal.DrawCardContinuousRestrictionStar5 && Is5Star {
-				if IsBaodiPool {
-					strPool[len(strPool)-1] = drawConf.P3pool
-				} else {
-					strPool[len(strPool)-1] = drawConf.N3pool
-				}
-				Is5Star = false
-			}
+			// if heroRecord.Race[req.DrawType] >= cfgGlobal.DrawCardContinuousRestrictionStar5 && Is5Star {
+			// 	if IsBaodiPool {
+			// 		strPool[len(strPool)-1] = drawConf.P3pool
+			// 	} else {
+			// 		strPool[len(strPool)-1] = drawConf.N3pool
+			// 	}
+			// 	Is5Star = false
+			// }
 		}
 	}
 	// 通过卡池获得最终的英雄
diff --git a/modules/stonehenge/api_selecthero.go b/modules/stonehenge/api_selecthero.go
index 68cf24b9a..f25ef4fdf 100644
--- a/modules/stonehenge/api_selecthero.go
+++ b/modules/stonehenge/api_selecthero.go
@@ -16,6 +16,7 @@ func (this *apiComp) SelectHero(session comm.IUserSession, req *pb.StonehengeSel
 	var (
 		stone  *pb.DBStonehenge
 		update map[string]interface{}
+		heros  []*pb.DBHero
 	)
 	update = make(map[string]interface{})
 	if errdata = this.SelectHeroCheck(session, req); errdata != nil {
@@ -33,11 +34,16 @@ func (this *apiComp) SelectHero(session comm.IUserSession, req *pb.StonehengeSel
 				}
 				return
 			} else {
-				newHero := new(pb.DBHero)
-				*newHero = *hero
-				stone.Hero[hero.HeroID] = newHero
+				heros = append(heros, hero)
+				// newHero := new(pb.DBHero)
+				// *newHero = *hero
+				// //stone.Hero[hero.HeroID] = newHero
+				// CreateBattleServer()
 			}
 		}
+		if stone.Hero, errdata = this.module.battle.CreateRolesByHeros(heros); errdata != nil {
+			return
+		}
 		update["hero"] = stone.Hero
 		this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
 	} else {
diff --git a/modules/stonehenge/modelStonehenge.go b/modules/stonehenge/modelStonehenge.go
index ab54edb84..4bab722f7 100644
--- a/modules/stonehenge/modelStonehenge.go
+++ b/modules/stonehenge/modelStonehenge.go
@@ -39,7 +39,6 @@ func (this *MStonehenge) GetStonehengeData(uid string) *pb.DBStonehenge {
 		stone.Uid = uid
 		stone.Rooms = nil // 注意初始房间为空
 		stone.Userbuff = make(map[int32]int32, 0)
-		stone.Hero = make(map[string]*pb.DBHero, 0)
 		stone.Reward = make(map[int32]bool, 0)
 		stone.Addweight = make(map[int32]int32, 0)
 		stone.Rtime = configure.Now().Unix()
diff --git a/modules/stonehenge/modelworldbuff.go b/modules/stonehenge/modelworldbuff.go
index b100b2a46..9c5eb2363 100644
--- a/modules/stonehenge/modelworldbuff.go
+++ b/modules/stonehenge/modelworldbuff.go
@@ -38,7 +38,6 @@ func (this *MWorldBuff) GetStonehengeData(uid string) *pb.DBStonehenge {
 		stone.Uid = uid
 		stone.Rooms = nil // 注意初始房间为空
 		stone.Userbuff = make(map[int32]int32, 0)
-		stone.Hero = make(map[string]*pb.DBHero, 0)
 		stone.Reward = make(map[int32]bool, 0)
 		stone.Addweight = make(map[int32]int32, 0)
 		stone.Rtime = configure.Now().Unix()
diff --git a/pb/stonehenge_db.pb.go b/pb/stonehenge_db.pb.go
index 9fad1fae2..5693034e6 100644
--- a/pb/stonehenge_db.pb.go
+++ b/pb/stonehenge_db.pb.go
@@ -26,11 +26,11 @@ type RoomData struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Event      map[int32]bool  `protobuf:"bytes,1,rep,name=event,proto3" json:"event" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //房间的事件信息 true 表示已完成
-	Portal     []int32         `protobuf:"varint,2,rep,packed,name=portal,proto3" json:"portal"`                                                                                 // 传送门id
-	Selectbuff []int32         `protobuf:"varint,3,rep,packed,name=selectbuff,proto3" json:"selectbuff"`                                                                         //  给前端显示的buff 组
-	Group      map[int32]int32 `protobuf:"bytes,4,rep,name=group,proto3" json:"group" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 事件组
-	Complete   bool            `protobuf:"varint,5,opt,name=complete,proto3" json:"complete"`                                                                                    // 房间是否通关
+	Event      map[int32]bool `protobuf:"bytes,1,rep,name=event,proto3" json:"event" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //房间的事件信息 true 表示已完成
+	Portal     []int32        `protobuf:"varint,2,rep,packed,name=portal,proto3" json:"portal"`                                                                                 // 传送门id
+	Selectbuff []int32        `protobuf:"varint,3,rep,packed,name=selectbuff,proto3" json:"selectbuff"`                                                                         //  给前端显示的buff 组
+	// map<int32,int32> group = 4; // 事件组
+	Complete bool `protobuf:"varint,5,opt,name=complete,proto3" json:"complete"` // 房间是否通关
 }
 
 func (x *RoomData) Reset() {
@@ -86,13 +86,6 @@ func (x *RoomData) GetSelectbuff() []int32 {
 	return nil
 }
 
-func (x *RoomData) GetGroup() map[int32]int32 {
-	if x != nil {
-		return x.Group
-	}
-	return nil
-}
-
 func (x *RoomData) GetComplete() bool {
 	if x != nil {
 		return x.Complete
@@ -105,17 +98,18 @@ type DBStonehenge struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id           string             `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
-	Uid          string             `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
-	StageID      int32              `protobuf:"varint,3,opt,name=stageID,proto3" json:"stageID"`                                                                                               // 关卡id
-	CurRoomIndes int32              `protobuf:"varint,4,opt,name=curRoomIndes,proto3" json:"curRoomIndes"`                                                                                     // 当前房间索引 初始 0 每通关一次+1
-	Rooms        *RoomData          `protobuf:"bytes,5,opt,name=rooms,proto3" json:"rooms"`                                                                                                    // 当前房间信息
-	Envbuff      []int32            `protobuf:"varint,6,rep,packed,name=envbuff,proto3" json:"envbuff"`                                                                                        // 环境buff 不能被更改
-	Userbuff     map[int32]int32    `protobuf:"bytes,7,rep,name=userbuff,proto3" json:"userbuff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`    // 玩家获得的buff key buff 类型
-	Hero         map[string]*DBHero `protobuf:"bytes,8,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`              // 英雄信息
-	Reward       map[int32]bool     `protobuf:"bytes,9,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`        // 是否首通 key:stageid
-	Addweight    map[int32]int32    `protobuf:"bytes,10,rep,name=addweight,proto3" json:"addweight" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 选择buff权重增加 key 类型
-	Rtime        int64              `protobuf:"varint,11,opt,name=rtime,proto3" json:"rtime"`                                                                                                  // 刷新时间
+	Id           string          `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
+	Uid          string          `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+	StageID      int32           `protobuf:"varint,3,opt,name=stageID,proto3" json:"stageID"`                                                                                               // 关卡id
+	CurRoomIndes int32           `protobuf:"varint,4,opt,name=curRoomIndes,proto3" json:"curRoomIndes"`                                                                                     // 当前房间索引 初始 0 每通关一次+1
+	Rooms        *RoomData       `protobuf:"bytes,5,opt,name=rooms,proto3" json:"rooms"`                                                                                                    // 当前房间信息
+	Envbuff      []int32         `protobuf:"varint,6,rep,packed,name=envbuff,proto3" json:"envbuff"`                                                                                        // 环境buff 不能被更改
+	Userbuff     map[int32]int32 `protobuf:"bytes,7,rep,name=userbuff,proto3" json:"userbuff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`    // 玩家获得的buff key buff 类型
+	Hero         []*BattleRole   `protobuf:"bytes,8,rep,name=hero,proto3" json:"hero"`                                                                                                      // 英雄信息
+	Reward       map[int32]bool  `protobuf:"bytes,9,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`        // 是否首通 key:stageid
+	Addweight    map[int32]int32 `protobuf:"bytes,10,rep,name=addweight,proto3" json:"addweight" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 选择buff权重增加 key 类型
+	Rtime        int64           `protobuf:"varint,11,opt,name=rtime,proto3" json:"rtime"`                                                                                                  // 刷新时间
+	Etime        int64           `protobuf:"varint,12,opt,name=etime,proto3" json:"etime"`                                                                                                  // 结算时间
 }
 
 func (x *DBStonehenge) Reset() {
@@ -199,7 +193,7 @@ func (x *DBStonehenge) GetUserbuff() map[int32]int32 {
 	return nil
 }
 
-func (x *DBStonehenge) GetHero() map[string]*DBHero {
+func (x *DBStonehenge) GetHero() []*BattleRole {
 	if x != nil {
 		return x.Hero
 	}
@@ -227,73 +221,71 @@ func (x *DBStonehenge) GetRtime() int64 {
 	return 0
 }
 
+func (x *DBStonehenge) GetEtime() int64 {
+	if x != nil {
+		return x.Etime
+	}
+	return 0
+}
+
 var File_stonehenge_stonehenge_db_proto protoreflect.FileDescriptor
 
 var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{
 	0x0a, 0x1e, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2f, 0x73, 0x74, 0x6f,
 	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74,
-	0x61, 0x12, 0x2a, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x14, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x45, 0x76, 0x65, 0x6e,
-	0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a,
-	0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70,
-	0x6f, 0x72, 0x74, 0x61, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62,
-	0x75, 0x66, 0x66, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x62, 0x75, 0x66, 0x66, 0x12, 0x2a, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x04,
+	0x1a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f,
+	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
+	0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01,
 	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x1a, 0x38, 0x0a,
-	0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x47, 0x72, 0x6f, 0x75, 0x70,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x01, 0x22, 0x8c, 0x05, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
-	0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x22,
-	0x0a, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64,
-	0x65, 0x73, 0x12, 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f,
-	0x6f, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06,
-	0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x12, 0x37, 0x0a,
-	0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x55,
-	0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x75, 0x73,
-	0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x12, 0x2b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x08,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
-	0x6e, 0x67, 0x65, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68,
-	0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
-	0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
-	0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74,
-	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
-	0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x40, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72,
-	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45,
-	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x45, 0x76, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e,
+	0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x45, 0x6e,
+	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0xd4, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
+	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c,
+	0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73,
+	0x12, 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d,
+	0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03,
+	0x28, 0x05, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x12, 0x37, 0x0a, 0x08, 0x75,
+	0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
+	0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x55, 0x73, 0x65,
+	0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x62, 0x75, 0x66, 0x66, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
+	0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
+	0x65, 0x6e, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42,
+	0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74,
+	0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
+	0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a,
+	0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -308,32 +300,28 @@ func file_stonehenge_stonehenge_db_proto_rawDescGZIP() []byte {
 	return file_stonehenge_stonehenge_db_proto_rawDescData
 }
 
-var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{
 	(*RoomData)(nil),     // 0: RoomData
 	(*DBStonehenge)(nil), // 1: DBStonehenge
 	nil,                  // 2: RoomData.EventEntry
-	nil,                  // 3: RoomData.GroupEntry
-	nil,                  // 4: DBStonehenge.UserbuffEntry
-	nil,                  // 5: DBStonehenge.HeroEntry
-	nil,                  // 6: DBStonehenge.RewardEntry
-	nil,                  // 7: DBStonehenge.AddweightEntry
-	(*DBHero)(nil),       // 8: DBHero
+	nil,                  // 3: DBStonehenge.UserbuffEntry
+	nil,                  // 4: DBStonehenge.RewardEntry
+	nil,                  // 5: DBStonehenge.AddweightEntry
+	(*BattleRole)(nil),   // 6: BattleRole
 }
 var file_stonehenge_stonehenge_db_proto_depIdxs = []int32{
 	2, // 0: RoomData.event:type_name -> RoomData.EventEntry
-	3, // 1: RoomData.group:type_name -> RoomData.GroupEntry
-	0, // 2: DBStonehenge.rooms:type_name -> RoomData
-	4, // 3: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry
-	5, // 4: DBStonehenge.hero:type_name -> DBStonehenge.HeroEntry
-	6, // 5: DBStonehenge.reward:type_name -> DBStonehenge.RewardEntry
-	7, // 6: DBStonehenge.addweight:type_name -> DBStonehenge.AddweightEntry
-	8, // 7: DBStonehenge.HeroEntry.value:type_name -> DBHero
-	8, // [8:8] is the sub-list for method output_type
-	8, // [8:8] is the sub-list for method input_type
-	8, // [8:8] is the sub-list for extension type_name
-	8, // [8:8] is the sub-list for extension extendee
-	0, // [0:8] is the sub-list for field type_name
+	0, // 1: DBStonehenge.rooms:type_name -> RoomData
+	3, // 2: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry
+	6, // 3: DBStonehenge.hero:type_name -> BattleRole
+	4, // 4: DBStonehenge.reward:type_name -> DBStonehenge.RewardEntry
+	5, // 5: DBStonehenge.addweight:type_name -> DBStonehenge.AddweightEntry
+	6, // [6:6] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_stonehenge_stonehenge_db_proto_init() }
@@ -341,7 +329,7 @@ func file_stonehenge_stonehenge_db_proto_init() {
 	if File_stonehenge_stonehenge_db_proto != nil {
 		return
 	}
-	file_hero_hero_db_proto_init()
+	file_battle_battle_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_stonehenge_stonehenge_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RoomData); i {
@@ -374,7 +362,7 @@ func file_stonehenge_stonehenge_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_stonehenge_stonehenge_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/stonehenge_msg.pb.go b/pb/stonehenge_msg.pb.go
index 6349799d3..fdbd43c0e 100644
--- a/pb/stonehenge_msg.pb.go
+++ b/pb/stonehenge_msg.pb.go
@@ -20,6 +20,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// 获取关卡信息
 type StonehengeGetListReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -63,7 +64,8 @@ type StonehengeGetListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Data *DBStonehenge `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+	Data   *DBStonehenge `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+	Boosid []int32       `protobuf:"varint,2,rep,packed,name=boosid,proto3" json:"boosid"`
 }
 
 func (x *StonehengeGetListResp) Reset() {
@@ -105,6 +107,13 @@ func (x *StonehengeGetListResp) GetData() *DBStonehenge {
 	return nil
 }
 
+func (x *StonehengeGetListResp) GetBoosid() []int32 {
+	if x != nil {
+		return x.Boosid
+	}
+	return nil
+}
+
 // 选择英雄
 type StonehengeSelectHeroReq struct {
 	state         protoimpl.MessageState
@@ -158,7 +167,7 @@ type StonehengeSelectHeroResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Hero map[string]*DBHero `protobuf:"bytes,1,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Hero []*BattleRole `protobuf:"bytes,1,rep,name=hero,proto3" json:"hero"`
 }
 
 func (x *StonehengeSelectHeroResp) Reset() {
@@ -193,7 +202,7 @@ func (*StonehengeSelectHeroResp) Descriptor() ([]byte, []int) {
 	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *StonehengeSelectHeroResp) GetHero() map[string]*DBHero {
+func (x *StonehengeSelectHeroResp) GetHero() []*BattleRole {
 	if x != nil {
 		return x.Hero
 	}
@@ -295,6 +304,400 @@ func (x *StonehengeSelectBuffResp) GetAddweight() map[int32]int32 {
 	return nil
 }
 
+// 进入关卡
+type StonehengeGotoRoomReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Portal int32 `protobuf:"varint,1,opt,name=portal,proto3" json:"portal"` //传送门id
+}
+
+func (x *StonehengeGotoRoomReq) Reset() {
+	*x = StonehengeGotoRoomReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeGotoRoomReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeGotoRoomReq) ProtoMessage() {}
+
+func (x *StonehengeGotoRoomReq) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeGotoRoomReq.ProtoReflect.Descriptor instead.
+func (*StonehengeGotoRoomReq) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *StonehengeGotoRoomReq) GetPortal() int32 {
+	if x != nil {
+		return x.Portal
+	}
+	return 0
+}
+
+type StonehengeGotoRoomResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Room *RoomData `protobuf:"bytes,1,opt,name=room,proto3" json:"room"`
+}
+
+func (x *StonehengeGotoRoomResp) Reset() {
+	*x = StonehengeGotoRoomResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeGotoRoomResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeGotoRoomResp) ProtoMessage() {}
+
+func (x *StonehengeGotoRoomResp) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeGotoRoomResp.ProtoReflect.Descriptor instead.
+func (*StonehengeGotoRoomResp) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *StonehengeGotoRoomResp) GetRoom() *RoomData {
+	if x != nil {
+		return x.Room
+	}
+	return nil
+}
+
+// 完成事件
+type StonehengeEventReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Eventid int32  `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"` //事件id
+	Param1  string `protobuf:"bytes,2,opt,name=param1,proto3" json:"param1"`
+	Param2  string `protobuf:"bytes,3,opt,name=param2,proto3" json:"param2"`
+	Param3  string `protobuf:"bytes,4,opt,name=param3,proto3" json:"param3"`
+}
+
+func (x *StonehengeEventReq) Reset() {
+	*x = StonehengeEventReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeEventReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeEventReq) ProtoMessage() {}
+
+func (x *StonehengeEventReq) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeEventReq.ProtoReflect.Descriptor instead.
+func (*StonehengeEventReq) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{8}
+}
+
+func (x *StonehengeEventReq) GetEventid() int32 {
+	if x != nil {
+		return x.Eventid
+	}
+	return 0
+}
+
+func (x *StonehengeEventReq) GetParam1() string {
+	if x != nil {
+		return x.Param1
+	}
+	return ""
+}
+
+func (x *StonehengeEventReq) GetParam2() string {
+	if x != nil {
+		return x.Param2
+	}
+	return ""
+}
+
+func (x *StonehengeEventReq) GetParam3() string {
+	if x != nil {
+		return x.Param3
+	}
+	return ""
+}
+
+type StonehengeEventResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Eventid  int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"`   //事件id
+	NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id
+}
+
+func (x *StonehengeEventResp) Reset() {
+	*x = StonehengeEventResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeEventResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeEventResp) ProtoMessage() {}
+
+func (x *StonehengeEventResp) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeEventResp.ProtoReflect.Descriptor instead.
+func (*StonehengeEventResp) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{9}
+}
+
+func (x *StonehengeEventResp) GetEventid() int32 {
+	if x != nil {
+		return x.Eventid
+	}
+	return 0
+}
+
+func (x *StonehengeEventResp) GetNewEvent() int32 {
+	if x != nil {
+		return x.NewEvent
+	}
+	return 0
+}
+
+//获取房间信息
+type StonehengeGetRoomInfoReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *StonehengeGetRoomInfoReq) Reset() {
+	*x = StonehengeGetRoomInfoReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeGetRoomInfoReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeGetRoomInfoReq) ProtoMessage() {}
+
+func (x *StonehengeGetRoomInfoReq) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeGetRoomInfoReq.ProtoReflect.Descriptor instead.
+func (*StonehengeGetRoomInfoReq) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{10}
+}
+
+type StonehengeGetRoomInfoResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Room *RoomData `protobuf:"bytes,1,opt,name=room,proto3" json:"room"`
+}
+
+func (x *StonehengeGetRoomInfoResp) Reset() {
+	*x = StonehengeGetRoomInfoResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeGetRoomInfoResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeGetRoomInfoResp) ProtoMessage() {}
+
+func (x *StonehengeGetRoomInfoResp) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeGetRoomInfoResp.ProtoReflect.Descriptor instead.
+func (*StonehengeGetRoomInfoResp) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{11}
+}
+
+func (x *StonehengeGetRoomInfoResp) GetRoom() *RoomData {
+	if x != nil {
+		return x.Room
+	}
+	return nil
+}
+
+// 结算
+type StonehengeFinishReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *StonehengeFinishReq) Reset() {
+	*x = StonehengeFinishReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[12]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeFinishReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeFinishReq) ProtoMessage() {}
+
+func (x *StonehengeFinishReq) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[12]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeFinishReq.ProtoReflect.Descriptor instead.
+func (*StonehengeFinishReq) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{12}
+}
+
+type StonehengeFinishResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Data *DBStonehenge `protobuf:"bytes,1,opt,name=data,proto3" json:"data"`
+}
+
+func (x *StonehengeFinishResp) Reset() {
+	*x = StonehengeFinishResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *StonehengeFinishResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*StonehengeFinishResp) ProtoMessage() {}
+
+func (x *StonehengeFinishResp) ProtoReflect() protoreflect.Message {
+	mi := &file_stonehenge_stonehenge_msg_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use StonehengeFinishResp.ProtoReflect.Descriptor instead.
+func (*StonehengeFinishResp) Descriptor() ([]byte, []int) {
+	return file_stonehenge_stonehenge_msg_proto_rawDescGZIP(), []int{13}
+}
+
+func (x *StonehengeFinishResp) GetData() *DBStonehenge {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 var File_stonehenge_stonehenge_msg_proto protoreflect.FileDescriptor
 
 var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
@@ -302,40 +705,66 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
 	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x1e, 0x73, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2f, 0x73, 0x74,
 	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
-	0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a,
-	0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
-	0x6e, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x17, 0x53, 0x74, 0x6f,
-	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72,
-	0x6f, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x03, 0x68, 0x69, 0x64, 0x22, 0x95, 0x01, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65,
-	0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x37, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x23, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72,
-	0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x1a, 0x40, 0x0a, 0x09,
-	0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1d, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
-	0x65, 0x72, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x35,
-	0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x66,
-	0x66, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x66,
-	0x66, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa0, 0x01, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
-	0x65, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x46, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
-	0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70,
-	0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64,
-	0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x1a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x74, 0x6f,
+	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
+	0x71, 0x22, 0x52, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47,
+	0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f,
+	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a,
+	0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x62,
+	0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+	0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71,
+	0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x68,
+	0x69, 0x64, 0x22, 0x3b, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
+	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f,
+	0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22,
+	0x35, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75,
+	0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75,
+	0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa0, 0x01, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65,
+	0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52,
+	0x65, 0x73, 0x70, 0x12, 0x46, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+	0x6e, 0x67, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x42, 0x75, 0x66, 0x66, 0x52, 0x65, 0x73,
+	0x70, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x41,
+	0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2f, 0x0a, 0x15, 0x53, 0x74, 0x6f,
+	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
+	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x22, 0x37, 0x0a, 0x16, 0x53, 0x74,
+	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72,
+	0x6f, 0x6f, 0x6d, 0x22, 0x76, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
+	0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65,
+	0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e,
+	0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70,
+	0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
+	0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x4b, 0x0a, 0x13, 0x53,
+	0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+	0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x1a, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e,
+	0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
+	0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d,
+	0x22, 0x15, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69,
+	0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65,
+	0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
+	0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -350,29 +779,39 @@ func file_stonehenge_stonehenge_msg_proto_rawDescGZIP() []byte {
 	return file_stonehenge_stonehenge_msg_proto_rawDescData
 }
 
-var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
 var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
-	(*StonehengeGetListReq)(nil),     // 0: StonehengeGetListReq
-	(*StonehengeGetListResp)(nil),    // 1: StonehengeGetListResp
-	(*StonehengeSelectHeroReq)(nil),  // 2: StonehengeSelectHeroReq
-	(*StonehengeSelectHeroResp)(nil), // 3: StonehengeSelectHeroResp
-	(*StonehengeSelectBuffReq)(nil),  // 4: StonehengeSelectBuffReq
-	(*StonehengeSelectBuffResp)(nil), // 5: StonehengeSelectBuffResp
-	nil,                              // 6: StonehengeSelectHeroResp.HeroEntry
-	nil,                              // 7: StonehengeSelectBuffResp.AddweightEntry
-	(*DBStonehenge)(nil),             // 8: DBStonehenge
-	(*DBHero)(nil),                   // 9: DBHero
+	(*StonehengeGetListReq)(nil),      // 0: StonehengeGetListReq
+	(*StonehengeGetListResp)(nil),     // 1: StonehengeGetListResp
+	(*StonehengeSelectHeroReq)(nil),   // 2: StonehengeSelectHeroReq
+	(*StonehengeSelectHeroResp)(nil),  // 3: StonehengeSelectHeroResp
+	(*StonehengeSelectBuffReq)(nil),   // 4: StonehengeSelectBuffReq
+	(*StonehengeSelectBuffResp)(nil),  // 5: StonehengeSelectBuffResp
+	(*StonehengeGotoRoomReq)(nil),     // 6: StonehengeGotoRoomReq
+	(*StonehengeGotoRoomResp)(nil),    // 7: StonehengeGotoRoomResp
+	(*StonehengeEventReq)(nil),        // 8: StonehengeEventReq
+	(*StonehengeEventResp)(nil),       // 9: StonehengeEventResp
+	(*StonehengeGetRoomInfoReq)(nil),  // 10: StonehengeGetRoomInfoReq
+	(*StonehengeGetRoomInfoResp)(nil), // 11: StonehengeGetRoomInfoResp
+	(*StonehengeFinishReq)(nil),       // 12: StonehengeFinishReq
+	(*StonehengeFinishResp)(nil),      // 13: StonehengeFinishResp
+	nil,                               // 14: StonehengeSelectBuffResp.AddweightEntry
+	(*DBStonehenge)(nil),              // 15: DBStonehenge
+	(*BattleRole)(nil),                // 16: BattleRole
+	(*RoomData)(nil),                  // 17: RoomData
 }
 var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{
-	8, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
-	6, // 1: StonehengeSelectHeroResp.hero:type_name -> StonehengeSelectHeroResp.HeroEntry
-	7, // 2: StonehengeSelectBuffResp.addweight:type_name -> StonehengeSelectBuffResp.AddweightEntry
-	9, // 3: StonehengeSelectHeroResp.HeroEntry.value:type_name -> DBHero
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
+	15, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
+	16, // 1: StonehengeSelectHeroResp.hero:type_name -> BattleRole
+	14, // 2: StonehengeSelectBuffResp.addweight:type_name -> StonehengeSelectBuffResp.AddweightEntry
+	17, // 3: StonehengeGotoRoomResp.room:type_name -> RoomData
+	17, // 4: StonehengeGetRoomInfoResp.room:type_name -> RoomData
+	15, // 5: StonehengeFinishResp.data:type_name -> DBStonehenge
+	6,  // [6:6] is the sub-list for method output_type
+	6,  // [6:6] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_stonehenge_stonehenge_msg_proto_init() }
@@ -381,7 +820,7 @@ func file_stonehenge_stonehenge_msg_proto_init() {
 		return
 	}
 	file_stonehenge_stonehenge_db_proto_init()
-	file_hero_hero_db_proto_init()
+	file_battle_battle_db_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_stonehenge_stonehenge_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StonehengeGetListReq); i {
@@ -455,6 +894,102 @@ func file_stonehenge_stonehenge_msg_proto_init() {
 				return nil
 			}
 		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeGotoRoomReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeGotoRoomResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeEventReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeEventResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeGetRoomInfoReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeGetRoomInfoResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeFinishReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_stonehenge_stonehenge_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StonehengeFinishResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -462,7 +997,7 @@ func file_stonehenge_stonehenge_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   15,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/sys/configure/structs/Game.Bufflottery.go b/sys/configure/structs/Game.Bufflottery.go
new file mode 100644
index 000000000..9264c8c58
--- /dev/null
+++ b/sys/configure/structs/Game.Bufflottery.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameBufflottery struct {
+    _dataMap map[int32]*GameBufflotteryData
+    _dataList []*GameBufflotteryData
+}
+
+func NewGameBufflottery(_buf []map[string]interface{}) (*GameBufflottery, error) {
+	_dataList := make([]*GameBufflotteryData, 0, len(_buf))
+	dataMap := make(map[int32]*GameBufflotteryData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameBufflotteryData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameBufflottery{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameBufflottery) GetDataMap() map[int32]*GameBufflotteryData {
+    return table._dataMap
+}
+
+func (table *GameBufflottery) GetDataList() []*GameBufflotteryData {
+    return table._dataList
+}
+
+func (table *GameBufflottery) Get(key int32) *GameBufflotteryData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.BufflotteryData.go b/sys/configure/structs/Game.BufflotteryData.go
new file mode 100644
index 000000000..c750c8425
--- /dev/null
+++ b/sys/configure/structs/Game.BufflotteryData.go
@@ -0,0 +1,53 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameBufflotteryData struct {
+    Id int32
+    GroupId int32
+    GroupType int32
+    SubGroupWt int32
+    SubGroupId int32
+    SubGroupType int32
+    BuffID int32
+    SubGroupNum int32
+    BuffWt int32
+    TypeWt int32
+}
+
+const TypeId_GameBufflotteryData = 1547284068
+
+func (*GameBufflotteryData) GetTypeId() int32 {
+    return 1547284068
+}
+
+func (_v *GameBufflotteryData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupId"].(float64); !_ok_ { err = errors.New("GroupId error"); return }; _v.GroupId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupType"].(float64); !_ok_ { err = errors.New("GroupType error"); return }; _v.GroupType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupWt"].(float64); !_ok_ { err = errors.New("SubGroupWt error"); return }; _v.SubGroupWt = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupId"].(float64); !_ok_ { err = errors.New("SubGroupId error"); return }; _v.SubGroupId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupType"].(float64); !_ok_ { err = errors.New("SubGroupType error"); return }; _v.SubGroupType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buffID"].(float64); !_ok_ { err = errors.New("buffID error"); return }; _v.BuffID = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupNum"].(float64); !_ok_ { err = errors.New("SubGroupNum error"); return }; _v.SubGroupNum = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BuffWt"].(float64); !_ok_ { err = errors.New("BuffWt error"); return }; _v.BuffWt = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TypeWt"].(float64); !_ok_ { err = errors.New("TypeWt error"); return }; _v.TypeWt = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameBufflotteryData(_buf map[string]interface{}) (*GameBufflotteryData, error) {
+    v := &GameBufflotteryData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.Eventlottery.go b/sys/configure/structs/Game.Eventlottery.go
new file mode 100644
index 000000000..46c8d97e4
--- /dev/null
+++ b/sys/configure/structs/Game.Eventlottery.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameEventlottery struct {
+    _dataMap map[int32]*GameEventlotteryData
+    _dataList []*GameEventlotteryData
+}
+
+func NewGameEventlottery(_buf []map[string]interface{}) (*GameEventlottery, error) {
+	_dataList := make([]*GameEventlotteryData, 0, len(_buf))
+	dataMap := make(map[int32]*GameEventlotteryData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameEventlotteryData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameEventlottery{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameEventlottery) GetDataMap() map[int32]*GameEventlotteryData {
+    return table._dataMap
+}
+
+func (table *GameEventlottery) GetDataList() []*GameEventlotteryData {
+    return table._dataList
+}
+
+func (table *GameEventlottery) Get(key int32) *GameEventlotteryData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.EventlotteryData.go b/sys/configure/structs/Game.EventlotteryData.go
new file mode 100644
index 000000000..0ef617dcd
--- /dev/null
+++ b/sys/configure/structs/Game.EventlotteryData.go
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameEventlotteryData struct {
+    Id int32
+    GroupId int32
+    GroupType int32
+    SubGroupWt int32
+    SubGroupId int32
+    SubGroupType int32
+    EventID int32
+    SubGroupNum int32
+    EventWt int32
+}
+
+const TypeId_GameEventlotteryData = -761035211
+
+func (*GameEventlotteryData) GetTypeId() int32 {
+    return -761035211
+}
+
+func (_v *GameEventlotteryData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupId"].(float64); !_ok_ { err = errors.New("GroupId error"); return }; _v.GroupId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupType"].(float64); !_ok_ { err = errors.New("GroupType error"); return }; _v.GroupType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupWt"].(float64); !_ok_ { err = errors.New("SubGroupWt error"); return }; _v.SubGroupWt = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupId"].(float64); !_ok_ { err = errors.New("SubGroupId error"); return }; _v.SubGroupId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupType"].(float64); !_ok_ { err = errors.New("SubGroupType error"); return }; _v.SubGroupType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventID"].(float64); !_ok_ { err = errors.New("EventID error"); return }; _v.EventID = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupNum"].(float64); !_ok_ { err = errors.New("SubGroupNum error"); return }; _v.SubGroupNum = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EventWt"].(float64); !_ok_ { err = errors.New("EventWt error"); return }; _v.EventWt = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameEventlotteryData(_buf map[string]interface{}) (*GameEventlotteryData, error) {
+    v := &GameEventlotteryData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Game.Roomlottery.go b/sys/configure/structs/Game.Roomlottery.go
new file mode 100644
index 000000000..5f11f3426
--- /dev/null
+++ b/sys/configure/structs/Game.Roomlottery.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameRoomlottery struct {
+    _dataMap map[int32]*GameRoomlotteryData
+    _dataList []*GameRoomlotteryData
+}
+
+func NewGameRoomlottery(_buf []map[string]interface{}) (*GameRoomlottery, error) {
+	_dataList := make([]*GameRoomlotteryData, 0, len(_buf))
+	dataMap := make(map[int32]*GameRoomlotteryData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameRoomlotteryData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameRoomlottery{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameRoomlottery) GetDataMap() map[int32]*GameRoomlotteryData {
+    return table._dataMap
+}
+
+func (table *GameRoomlottery) GetDataList() []*GameRoomlotteryData {
+    return table._dataList
+}
+
+func (table *GameRoomlottery) Get(key int32) *GameRoomlotteryData {
+    return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.RoomlotteryData.go b/sys/configure/structs/Game.RoomlotteryData.go
new file mode 100644
index 000000000..8bdd53316
--- /dev/null
+++ b/sys/configure/structs/Game.RoomlotteryData.go
@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameRoomlotteryData struct {
+    Id int32
+    GroupId int32
+    GroupType int32
+    SubGroupWt int32
+    SubGroupId int32
+    SubGroupType int32
+    RoomID int32
+    SubGroupNum int32
+    RoomWt int32
+}
+
+const TypeId_GameRoomlotteryData = 1194612956
+
+func (*GameRoomlotteryData) GetTypeId() int32 {
+    return 1194612956
+}
+
+func (_v *GameRoomlotteryData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupId"].(float64); !_ok_ { err = errors.New("GroupId error"); return }; _v.GroupId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupType"].(float64); !_ok_ { err = errors.New("GroupType error"); return }; _v.GroupType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupWt"].(float64); !_ok_ { err = errors.New("SubGroupWt error"); return }; _v.SubGroupWt = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupId"].(float64); !_ok_ { err = errors.New("SubGroupId error"); return }; _v.SubGroupId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupType"].(float64); !_ok_ { err = errors.New("SubGroupType error"); return }; _v.SubGroupType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomID"].(float64); !_ok_ { err = errors.New("RoomID error"); return }; _v.RoomID = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["SubGroupNum"].(float64); !_ok_ { err = errors.New("SubGroupNum error"); return }; _v.SubGroupNum = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RoomWt"].(float64); !_ok_ { err = errors.New("RoomWt error"); return }; _v.RoomWt = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameRoomlotteryData(_buf map[string]interface{}) (*GameRoomlotteryData, error) {
+    v := &GameRoomlotteryData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index efb67a3a0..b6959eead 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -200,6 +200,9 @@ type Tables struct {
     GuildBossRank *GameGuildBossRank
     GuildBossScore *GameGuildBossScore
     TrendChose *GameTrendChose
+    Roomlottery *GameRoomlottery
+    Bufflottery *GameBufflottery
+    Eventlottery *GameEventlottery
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1341,5 +1344,23 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.TrendChose, err = NewGameTrendChose(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_roomlottery") ; err != nil {
+        return nil, err
+    }
+    if tables.Roomlottery, err = NewGameRoomlottery(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_bufflottery") ; err != nil {
+        return nil, err
+    }
+    if tables.Bufflottery, err = NewGameBufflottery(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_eventlottery") ; err != nil {
+        return nil, err
+    }
+    if tables.Eventlottery, err = NewGameEventlottery(buf) ; err != nil {
+        return nil, err
+    }
     return tables, nil
 }