石阵秘境

modules/stonehenge/api_enterlevel.go

@@ -7,7 +7,12 @@ import (
 
 //参数校验
 func (this *apiComp) EnterLevelCheck(session comm.IUserSession, req *pb.StonehengeEnterLevelReq) (errdata *pb.ErrorData) {
-
+	if req.Stageid == 0 || len(req.Hid) == 0 || req.BuffType == 0 {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+	}
 	return
 }
 
@@ -24,31 +29,33 @@ func (this *apiComp) EnterLevel(session comm.IUserSession, req *pb.StonehengeEnt
 	}
 
 	stone = this.module.modelStonehenge.GetStonehengeData(session.GetUserId())
-	if len(stone.Hero) == 0 {
+
-		// 查库
+	if len(stone.Hero) != 0 || len(stone.Addweight) != 0 {
-		for _, hid := range req.Hid {
-			if hero, err := this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), hid); err != nil {
-				errdata = &pb.ErrorData{
-					Code:    pb.ErrorCode_HeroNoExist,
-					Message: pb.ErrorCode_HeroNoExist.ToString(),
-				}
-				return
-			} else {
-				heros = append(heros, hero)
-			}
-		}
-		if stone.Hero, errdata = this.module.battle.CreateRolesByHeros(heros); errdata != nil {
-			return
-		}
-		update["hero"] = stone.Hero
-		this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
-	} else {
 		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_StonehengeRepeatedSelectHero,
+			Code:  pb.ErrorCode_StonehengeEnterRoomFailed,
-			Message: pb.ErrorCode_StonehengeRepeatedSelectHero.ToString(),
+			Title: pb.ErrorCode_StonehengeEnterRoomFailed.ToString(),
 		}
 		return
 	}
+	// 查库
+	for _, hid := range req.Hid {
+		if hero, err := this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), hid); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_HeroNoExist,
+				Message: pb.ErrorCode_HeroNoExist.ToString(),
+			}
+			return
+		} else {
+			heros = append(heros, hero)
+		}
+	}
+	if stone.Hero, errdata = this.module.battle.CreateRolesByHeros(heros); errdata != nil {
+		return
+	}
+	update["hero"] = stone.Hero
+	stone.Addweight[req.BuffType] = 1
+	update["addweight"] = stone.Addweight
+	this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
 	session.SendMsg(string(this.module.GetType()), "info", &pb.StonehengeGetListResp{Data: stone})
 	return
 }

modules/stonehenge/api_finish.go

@@ -0,0 +1,37 @@
+package stonehenge
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+//参数校验
+func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.StonehengeFinishReq) (errdata *pb.ErrorData) {
+
+	return
+}
+
+// 结算房间
+func (this *apiComp) Finish(session comm.IUserSession, req *pb.StonehengeFinishReq) (errdata *pb.ErrorData) {
+	var (
+		stone  *pb.DBStonehenge
+		update map[string]interface{}
+	)
+	update = make(map[string]interface{})
+	if errdata = this.FinishCheck(session, req); errdata != nil {
+		return
+	}
+
+	stone = this.module.modelStonehenge.GetStonehengeData(session.GetUserId())
+
+	stone.Hero = make([]*pb.BattleRole, 0)
+
+	update["hero"] = stone.Hero
+	stone.Addweight = make(map[int32]int32, 0)
+	update["addweight"] = stone.Addweight
+	stone.Rooms = &pb.RoomData{}
+	update["rooms"] = stone.Rooms
+	this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
+	session.SendMsg(string(this.module.GetType()), "info", &pb.StonehengeGetListResp{Data: stone})
+	return
+}

modules/stonehenge/api_gotoroom.go

@@ -0,0 +1,59 @@
+package stonehenge
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+)
+
+//参数校验
+func (this *apiComp) GotoRoomCheck(session comm.IUserSession, req *pb.StonehengeGotoRoomReq) (errdata *pb.ErrorData) {
+	if req.Portal == 0 {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+	}
+	return
+}
+
+func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoRoomReq) (errdata *pb.ErrorData) {
+	var (
+		stone  *pb.DBStonehenge
+		update map[string]interface{}
+		bCheck bool
+	)
+	update = make(map[string]interface{})
+	if errdata = this.GotoRoomCheck(session, req); errdata != nil {
+		return
+	}
+	stone = this.module.modelStonehenge.GetStonehengeData(session.GetUserId())
+
+	// 校验传送门
+	if stone.Rooms != nil {
+		for _, v := range stone.Rooms.Portal {
+			if v == req.Portal {
+				bCheck = true
+				break
+			}
+		}
+
+	}
+	if !bCheck {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_StonehengePortalErr,
+			Message: pb.ErrorCode_StonehengePortalErr.ToString(),
+		}
+		return
+	}
+	stone.CurRoomIndes += 1
+	update["curRoomIndes"] = stone.CurRoomIndes
+	stone.Rooms = &pb.RoomData{
+		Eventid: map[int32]bool{},
+	}
+	stone.Rooms.Portal = this.module.configure.GetRoomGroupDataByLottery(req.Portal)
+
+	update["rooms"] = stone.Rooms
+	this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
+	session.SendMsg(string(this.module.GetType()), "gotoroom", &pb.StonehengeGotoRoomResp{})
+	return
+}

modules/stonehenge/configure.go

@@ -15,7 +15,7 @@ const (
 	game_bufflottery  = "game_bufflottery.json"
 	game_eventlottery = "game_eventlottery.json"
 	game_roomlottery  = "game_roomlottery.json"
-	game_roomconf     = "game_roomconfig.json"
+	game_roomconf     = "game_stroneroom.json"
 	game_stageconf    = "game_stronestage.json"
 	game_buffconf     = "game_stronebuff.json"
 	game_eventconf    = "game_stroneevent.json"
@@ -26,6 +26,9 @@ type configureComp struct {
 	modules.MCompConfigure
 	module *Stonehenge
 	hlock  sync.RWMutex
+	// stronestage
+	stage map[int32][]*cfg.GameStroneStageData
+
 	// 房间随机
 	_groupR map[int64][]int32 // key 小组ID value cid
 	// 类型为1 的数据 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组
@@ -86,15 +89,16 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	err = this.LoadConfigure(game_buffconf, cfg.NewGameStroneBuff)
 	err = this.LoadConfigure(game_eventconf, cfg.NewGameStroneEvent)
 	err = this.LoadConfigure(game_roomconf, cfg.NewGameStroneRoom)
+
+	configure.RegisterConfigure(game_stageconf, cfg.NewGameStroneStage, this.LoadGameStroneStage)
 	//测试 接口
-	_d := this.GetBuffGroupDataByLottery(100001)
+	_d := this.GetStageConfByStageid(1001)
-	_d = this.GetEventGroupDataByLottery(1001001)
-	_d = this.GetRoomGroupDataByLottery(100001)
-
-	_d = this.GetBuffGroupDataByLottery(100002)
-	_d = this.GetRoomGroupDataByLottery(100002)
-
 	fmt.Printf("%v", _d)
+
+	_d1, _ := this.GetStoneEventDataById(10000001)
+	_d2, _ := this.GetStoneBuffDataById(251023111)
+	_d3, _ := this.GetStoneRoomDataById(100001)
+	fmt.Printf("%v,%v,%v", _d1, _d2, _d3)
 	return
 }
 
@@ -639,7 +643,7 @@ func (this *configureComp) GetBuffGroupDataByLottery(lotteryId int32) (buff []in
 	game_eventconf    = "game_stroneevent.json"
 */
 
-func (this *configureComp) GetStoneRoomIdBy(roomid int32) (conf *cfg.GameStroneRoomData, err error) {
+func (this *configureComp) GetStoneRoomDataById(roomid int32) (conf *cfg.GameStroneRoomData, err error) {
 	var (
 		v interface{}
 	)
@@ -653,3 +657,54 @@ func (this *configureComp) GetStoneRoomIdBy(roomid int32) (conf *cfg.GameStroneR
 	err = comm.NewNotFoundConfErr(moduleName, game_roomconf, roomid)
 	return
 }
+
+func (this *configureComp) GetStoneBuffDataById(buffid int32) (conf *cfg.GameStroneBuffData, err error) {
+	var (
+		v interface{}
+	)
+	if v, err = this.GetConfigure(game_buffconf); err == nil {
+		if configure, ok := v.(*cfg.GameStroneBuff); ok {
+			if conf = configure.Get(buffid); conf != nil {
+				return
+			}
+		}
+	}
+	err = comm.NewNotFoundConfErr(moduleName, game_buffconf, buffid)
+	return
+}
+
+func (this *configureComp) GetStoneEventDataById(eventid int32) (conf *cfg.GameStroneEventData, err error) {
+	var (
+		v interface{}
+	)
+	if v, err = this.GetConfigure(game_eventconf); err == nil {
+		if configure, ok := v.(*cfg.GameStroneEvent); ok {
+			if conf = configure.Get(eventid); conf != nil {
+				return
+			}
+		}
+	}
+	err = comm.NewNotFoundConfErr(moduleName, game_eventconf, eventid)
+	return
+}
+
+//
+func (this *configureComp) LoadGameStroneStage() {
+
+	if v, err := this.GetConfigure(game_stageconf); err == nil {
+		if configure, ok := v.(*cfg.GameStroneStage); ok {
+			this.hlock.Lock()
+			defer this.hlock.Unlock()
+			this.stage = make(map[int32][]*cfg.GameStroneStageData)
+			for _, v := range configure.GetDataList() {
+				this.stage[v.StageId] = append(this.stage[v.StageId], v)
+			}
+		}
+	}
+
+	return
+}
+
+func (this *configureComp) GetStageConfByStageid(stgeid int32) (conf []*cfg.GameStroneStageData) {
+	return this.stage[stgeid]
+}

pb/errorcode.pb.go

@@ -419,6 +419,9 @@ const (
 	ErrorCode_WarorderNoOpen ErrorCode = 4801 //活动未开启
 	// stonehenge
 	ErrorCode_StonehengeRepeatedSelectHero ErrorCode = 4901 // 重复选择英雄
+	ErrorCode_StonehengeRepeatedSelectBUff ErrorCode = 4902 // 重复选择buff
+	ErrorCode_StonehengePortalErr          ErrorCode = 4903 // 传送门校验不对
+	ErrorCode_StonehengeEnterRoomFailed    ErrorCode = 4904 // 进入房间失败
 )
 
 // Enum value maps for ErrorCode.
@@ -778,6 +781,9 @@ var (
 		4703: "PassonSeatStateErr",
 		4801: "WarorderNoOpen",
 		4901: "StonehengeRepeatedSelectHero",
+		4902: "StonehengeRepeatedSelectBUff",
+		4903: "StonehengePortalErr",
+		4904: "StonehengeEnterRoomFailed",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1134,6 +1140,9 @@ var (
 		"PassonSeatStateErr":            4703,
 		"WarorderNoOpen":                4801,
 		"StonehengeRepeatedSelectHero":  4901,
+		"StonehengeRepeatedSelectBUff":  4902,
+		"StonehengePortalErr":           4903,
+		"StonehengeEnterRoomFailed":     4904,
 	}
 )
 
@@ -1168,7 +1177,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0x99, 0x41, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xf6, 0x41, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1689,8 +1698,14 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x72, 0x72, 0x10, 0xdf, 0x24, 0x12, 0x13, 0x0a, 0x0e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65,
 	0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xc1, 0x25, 0x12, 0x21, 0x0a, 0x1c, 0x53, 0x74,
 	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x10, 0xa5, 0x26, 0x42, 0x06, 0x5a,
+	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x10, 0xa5, 0x26, 0x12, 0x21, 0x0a,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61,
+	0x74, 0x65, 0x64, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x42, 0x55, 0x66, 0x66, 0x10, 0xa6, 0x26,
+	0x12, 0x18, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x6f,
+	0x72, 0x74, 0x61, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xa7, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74,
+	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f,
+	0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xa8, 0x26, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/stonehenge_db.pb.go

@@ -26,9 +26,9 @@ 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 表示已完成
+	Eventid    map[int32]bool `protobuf:"bytes,1,rep,name=eventid,proto3" json:"eventid" 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
+	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 组
+	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"` // 房间是否通关
 }
@@ -65,9 +65,9 @@ func (*RoomData) Descriptor() ([]byte, []int) {
 	return file_stonehenge_stonehenge_db_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *RoomData) GetEvent() map[int32]bool {
+func (x *RoomData) GetEventid() map[int32]bool {
 	if x != nil {
-		return x.Event
+		return x.Eventid
 	}
 	return nil
 }
@@ -234,58 +234,58 @@ 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, 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,
+	0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcc, 0x01, 0x0a, 0x08, 0x52, 0x6f, 0x6f,
-	0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01,
+	0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x30, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x2e,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74,
-	0x45, 0x76, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e,
+	0x61, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
-	0x74, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61,
-	0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c,
+	0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x12,
-	0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73,
+	0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x18, 0x03, 0x20,
-	0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d,
+	0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x62, 0x75, 0x66, 0x66, 0x12,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d,
+	0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x45, 0x6e,
+	0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x45,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61,
-	0xd4, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd4, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x74,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
+	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
-	0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18,
-	0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c,
+	0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x61,
-	0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x67, 0x65, 0x49, 0x44, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
-	0x28, 0x05, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73,
+	0x6e, 0x64, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x52,
-	0x12, 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x64, 0x65, 0x73, 0x12, 0x1f, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x6d,
-	0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d,
+	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61,
-	0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03,
+	0x74, 0x61, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x76,
-	0x28, 0x05, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x62, 0x75, 0x66, 0x66, 0x12, 0x37, 0x0a, 0x08, 0x75,
+	0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x65, 0x6e, 0x76, 0x62,
-	0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
+	0x75, 0x66, 0x66, 0x12, 0x37, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x18,
-	0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x55, 0x73, 0x65,
+	0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
-	0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x65, 0x6e, 0x67, 0x65, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74,
-	0x62, 0x75, 0x66, 0x66, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03,
+	0x72, 0x79, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x12, 0x1f, 0x0a, 0x04,
-	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
+	0x68, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
-	0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
+	0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x31, 0x0a,
-	0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
+	0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
-	0x65, 0x6e, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x52, 0x65, 0x77,
-	0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77,
+	0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42,
+	0x12, 0x3a, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x0a, 0x20,
-	0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65,
+	0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
-	0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65,
+	0x67, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72,
-	0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20,
+	0x79, 0x52, 0x09, 0x61, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05,
-	0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74,
+	0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69,
-	0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65,
+	0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
-	0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72,
+	0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76,
+	0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77,
+	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x1a, 0x3c, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x45, 0x6e, 0x74,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -304,14 +304,14 @@ var file_stonehenge_stonehenge_db_proto_msgTypes = make([]protoimpl.MessageInfo,
 var file_stonehenge_stonehenge_db_proto_goTypes = []interface{}{
 	(*RoomData)(nil),     // 0: RoomData
 	(*DBStonehenge)(nil), // 1: DBStonehenge
-	nil,                  // 2: RoomData.EventEntry
+	nil,                  // 2: RoomData.EventidEntry
 	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
+	2, // 0: RoomData.eventid:type_name -> RoomData.EventidEntry
 	0, // 1: DBStonehenge.rooms:type_name -> RoomData
 	3, // 2: DBStonehenge.userbuff:type_name -> DBStonehenge.UserbuffEntry
 	6, // 3: DBStonehenge.hero:type_name -> BattleRole

pb/stonehenge_msg.pb.go

@@ -122,6 +122,7 @@ type StonehengeEnterLevelReq struct {
 
 	Hid      []string `protobuf:"bytes,1,rep,name=hid,proto3" json:"hid"` // 英雄唯一id
 	BuffType int32    `protobuf:"varint,2,opt,name=buffType,proto3" json:"buffType"`
+	Stageid  int32    `protobuf:"varint,3,opt,name=stageid,proto3" json:"stageid"`
 }
 
 func (x *StonehengeEnterLevelReq) Reset() {
@@ -170,6 +171,13 @@ func (x *StonehengeEnterLevelReq) GetBuffType() int32 {
 	return 0
 }
 
+func (x *StonehengeEnterLevelReq) GetStageid() int32 {
+	if x != nil {
+		return x.Stageid
+	}
+	return 0
+}
+
 type StonehengeEnterLevelResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -278,7 +286,8 @@ type StonehengeGotoRoomResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Room *RoomData `protobuf:"bytes,1,opt,name=room,proto3" json:"room"`
+	Room   *RoomData `protobuf:"bytes,1,opt,name=room,proto3" json:"room"`
+	Portal int32     `protobuf:"varint,2,opt,name=portal,proto3" json:"portal"` //传送门id
 }
 
 func (x *StonehengeGotoRoomResp) Reset() {
@@ -320,6 +329,13 @@ func (x *StonehengeGotoRoomResp) GetRoom() *RoomData {
 	return nil
 }
 
+func (x *StonehengeGotoRoomResp) GetPortal() int32 {
+	if x != nil {
+		return x.Portal
+	}
+	return 0
+}
+
 // 完成事件
 type StonehengeEventReq struct {
 	state         protoimpl.MessageState
@@ -397,8 +413,9 @@ type StonehengeEventResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Eventid  int32 `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"`   //事件id
+	Eventid  int32     `protobuf:"varint,1,opt,name=eventid,proto3" json:"eventid"`   //事件id
-	NewEvent int32 `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id
+	NewEvent int32     `protobuf:"varint,2,opt,name=newEvent,proto3" json:"newEvent"` // 新的事件id
+	Room     *RoomData `protobuf:"bytes,3,opt,name=room,proto3" json:"room"`
 }
 
 func (x *StonehengeEventResp) Reset() {
@@ -447,6 +464,13 @@ func (x *StonehengeEventResp) GetNewEvent() int32 {
 	return 0
 }
 
+func (x *StonehengeEventResp) GetRoom() *RoomData {
+	if x != nil {
+		return x.Room
+	}
+	return nil
+}
+
 //获取房间信息
 type StonehengeGetRoomInfoReq struct {
 	state         protoimpl.MessageState
@@ -634,48 +658,53 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
 	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, 0x47, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+	0x6f, 0x6f, 0x73, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
 	0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71,
 	0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x68,
 	0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x22, 0x5a,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x66, 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18,
-	0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65,
+	0x0a, 0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65,
+	0x07, 0x73, 0x74, 0x61, 0x67, 0x65, 0x69, 0x64, 0x22, 0x5a, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e,
-	0x72, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c,
-	0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x72,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x03,
-	0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d,
+	0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
-	0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2f, 0x0a, 0x15, 0x53, 0x74,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20,
-	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,
+	0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2f, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
-	0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76,
+	0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
-	0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65,
+	0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70,
-	0x6e, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x02,
+	0x6f, 0x72, 0x74, 0x61, 0x6c, 0x22, 0x4f, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06,
+	0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
+	0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
-	0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x04,
+	0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x16,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x4b, 0x0a, 0x13,
+	0x0a, 0x06, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52,
+	0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x22, 0x76, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
-	0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01,
+	0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x1a, 0x0a,
+	0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65,
-	0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31,
-	0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x1a, 0x0a, 0x18, 0x53, 0x74, 0x6f,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16,
-	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e,
+	0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+	0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33,
-	0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x6a,
-	0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e,
-	0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64,
-	0x6d, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x64, 0x12,
-	0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e,
+	0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70,
+	0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x04, 0x72,
-	0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
+	0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d,
-	0x2e, 0x44, 0x42, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x04, 0x64,
+	0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x1a, 0x0a, 0x18, 0x53, 0x74,
-	0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x6f, 0x6d, 0x49,
-	0x74, 0x6f, 0x33,
+	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 (
@@ -713,13 +742,14 @@ var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{
 	13, // 1: StonehengeEnterLevelResp.hero:type_name -> BattleRole
 	14, // 2: StonehengeEnterLevelResp.room:type_name -> RoomData
 	14, // 3: StonehengeGotoRoomResp.room:type_name -> RoomData
-	14, // 4: StonehengeGetRoomInfoResp.room:type_name -> RoomData
+	14, // 4: StonehengeEventResp.room:type_name -> RoomData
-	12, // 5: StonehengeFinishResp.data:type_name -> DBStonehenge
+	14, // 5: StonehengeGetRoomInfoResp.room:type_name -> RoomData
-	6,  // [6:6] is the sub-list for method output_type
+	12, // 6: StonehengeFinishResp.data:type_name -> DBStonehenge
-	6,  // [6:6] is the sub-list for method input_type
+	7,  // [7:7] is the sub-list for method output_type
-	6,  // [6:6] is the sub-list for extension type_name
+	7,  // [7:7] is the sub-list for method input_type
-	6,  // [6:6] is the sub-list for extension extendee
+	7,  // [7:7] is the sub-list for extension type_name
-	0,  // [0:6] is the sub-list for field type_name
+	7,  // [7:7] is the sub-list for extension extendee
+	0,  // [0:7] is the sub-list for field type_name
 }
 
 func init() { file_stonehenge_stonehenge_msg_proto_init() }