Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/battle/modelBattle.go

@@ -934,3 +934,117 @@ func (this *modelBattleComp) getGlobalBuff(uid string) (buff *cfg.GamePandamasBu
 	}
 	return
 }
+
+// 创建石阵秘境战斗
+func (this *modelBattleComp) creatStoneBattle(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEReq, role []*pb.BattleRole) (record *pb.DBBattleRecord, errdata *pb.ErrorData) {
+	var (
+		heros []*pb.DBHero = make([]*pb.DBHero, 5)
+		// buff  *cfg.GamePandamasBuffData
+	)
+	record = &pb.DBBattleRecord{
+		Id:         primitive.NewObjectID().Hex(),
+		Title:      req.Title,
+		Btype:      btype,
+		Ptype:      req.Ptype,
+		State:      pb.BBattleState_in,
+		RedCompId:  session.GetUserId(),
+		Redflist:   make([]*pb.DBBattleFormt, 1),
+		BlueCompId: "",
+		Buleflist:  make([]*pb.DBBattleFormt, len(req.Mformat)),
+	}
+	record.Redflist[0] = &pb.DBBattleFormt{
+		Leadpos: req.Format.Leadpos,
+		Team:    make([]*pb.BattleRole, len(req.Format.Format)),
+	}
+	model := db.NewDBModel(comm.TableHero, time.Hour, conn)
+	// buff, _ = this.getGlobalBuff(session.GetUserId())
+	//自己的英雄阵营
+	for i, v := range req.Format.Format {
+		if v != "" {
+			heros[i] = &pb.DBHero{}
+			if err := model.GetListObj(session.GetUserId(), v, heros[i]); err != nil {
+				errdata = &pb.ErrorData{
+					Code:  pb.ErrorCode_HeroNoExist,
+					Title: pb.ErrorCode_HeroNoExist.ToString(),
+				}
+				return
+			}
+			tid := 100 + i
+			if record.Redflist[0].Team[i], errdata = this.createBattleRole(heros[i], tid, i); errdata != nil {
+				return
+			}
+			// if buff != nil {
+			// 	if conf, err := this.module.configure.GetHeroConfig(heros[i].HeroID); err == nil {
+			// 		if buff.CampRestriction == conf.Race && buff.OccupationalRestrictions == conf.Job && conf.Star >= buff.StarLimit {
+			// 			record.Redflist[0].Team[i].PandaBuff = buff.Buffid
+			// 		}
+			// 	}
+			// }
+		} else {
+			record.Redflist[0].Team[i] = nil
+		}
+	}
+	//好友的英雄阵营
+	for i, v := range req.Format.Friendformat {
+		if v != "" {
+			var (
+				err error
+			)
+			// 获取好友英雄信息
+			if this.module.IsCross() {
+				if heros[i], err = this.module.friend.UseAssistHero(session.GetUserId(), v); err != nil {
+					this.module.Errorln(err)
+					errdata = &pb.ErrorData{
+						Code:  pb.ErrorCode_HeroNoExist,
+						Title: pb.ErrorCode_HeroNoExist.ToString(),
+					}
+					return
+				}
+			} else { //获取跨服数据
+				heros[i] = &pb.DBHero{}
+				if err = this.module.service.AcrossClusterRpcCall(
+					context.Background(),
+					this.module.GetCrossTag(),
+					comm.Service_Worker,
+					string(comm.Rpc_ModuleFriendUseAssitHero),
+					pb.RPCGeneralReqA2{Param1: session.GetUserId(), Param2: v},
+					heros[i]); err != nil {
+					this.module.Errorln(err)
+				}
+			}
+			tid := 100 + i
+			if record.Redflist[0].Team[i], errdata = this.createBattleRole(heros[i], tid, i); errdata != nil {
+				return
+			}
+			record.Redflist[0].Team[i].Ishelp = true
+			// if buff != nil {
+			// 	if conf, err := this.module.configure.GetHeroConfig(heros[i].HeroID); err == nil {
+			// 		if buff.CampRestriction == conf.Race && buff.OccupationalRestrictions == conf.Job && conf.Star >= buff.StarLimit {
+			// 			record.Redflist[0].Team[i].PandaBuff = buff.Buffid
+			// 		}
+			// 	}
+			// }
+		}
+	}
+	if ok := this.checkBattlereadyCapskill(req.Format.Leadpos, heros); !ok {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_BattleCapskillCheckFailed,
+			Title: pb.ErrorCode_BattleCapskillCheckFailed.ToString(),
+		}
+		return
+	}
+	var (
+		captain int32
+		masters []*pb.BattleRole
+	)
+	for i, v := range req.Mformat {
+		if captain, masters, errdata = this.createMasterRoles(200, i, v); errdata != nil {
+			return
+		}
+		record.Buleflist[i] = &pb.DBBattleFormt{
+			Leadpos: captain,
+			Team:    masters,
+		}
+	}
+	return
+}

modules/battle/module.go

@@ -553,35 +553,10 @@ func (this *Battle) CreateStoneBattle(session comm.IUserSession, req *pb.BattleP
 		}
 		return
 	}
-	if req.Format.Friendformat != nil && len(req.Format.Friendformat) != 5 {
-		errdata = &pb.ErrorData{
-			Code:  pb.ErrorCode_ReqParameterError,
-			Title: pb.ErrorCode_ReqParameterError.ToString(),
-		}
-	}
-	if conf, err = this.configure.GetBattleReady(req.Rulesid); err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_ConfigNoFound,
-			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-			Message: err.Error(),
-		}
-		return
-	}
-	var flag bool
-	for _, v := range req.Format.Friendformat {
-		if v != "" {
-			flag = true
-			// this.ModuleBuried.SendToRtask(session, comm.Rtype108, 1)
-			go this.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype108, 1))
-			break
-		}
-	}
 
 	if record, errdata = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req, conf); errdata != nil {
 		return
 	}
-	if flag {
-		go this.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype12, 1))
-	}
+
 	return
 }

modules/library/api_usegift.go

@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
+	"math"
 )
 
 // 参数校验
@@ -97,7 +98,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 	for _, v := range _c.LikesFood { // 喜欢的食物
 		if v == req.Items {
 			likeStates = 1
-			addExp *= this.module.ModuleTools.GetGlobalConf().FavorabilityLikes * req.Counts / 1000
+			addExp = int32(math.Floor(float64(addExp*this.module.ModuleTools.GetGlobalConf().FavorabilityLikes*req.Counts) / 1000))
 			break
 		}
 	}
@@ -105,7 +106,7 @@ func (this *apiComp) UseGift(session comm.IUserSession, req *pb.LibraryUseGiftRe
 		for _, v := range _c.DislikingFood { //不喜欢
 			if v == req.Items {
 				likeStates = 2
-				addExp *= this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes * req.Counts / 1000
+				addExp = int32(math.Floor(float64(addExp*this.module.ModuleTools.GetGlobalConf().FavorabilityDislikes*req.Counts) / 1000))
 				break
 			}
 		}

modules/stonehenge/api_event.go

@@ -83,8 +83,8 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		if lenSelect == 0 || lenSelect <= int(req.Param1) {
 			return
 		}
-		stone.Rooms.Selectbuff = []int32{}
 		stone.Userbuff[stone.Rooms.Selectbuff[req.Param1]] = 1
+		stone.Rooms.Selectbuff = []int32{}
 		update["userbuff"] = stone.Userbuff
 	} else if eventConf.EventType == EventType14 { // 战斗事件合并
 		if req.Report == nil {
@@ -169,6 +169,7 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		Room:     stone.Rooms,
 		Reward:   reward,
 		Hero:     stone.Hero,
+		Userbuff: stone.Userbuff,
 	})
 	return
 }

modules/stonehenge/core.go

@@ -1,5 +1,6 @@
 package stonehenge
 
+// 事件类型
 const (
 	EventType14 = 14 // 战斗事件
 	EventType16 = 16 // 捡垃圾事件

pb/stonehenge_msg.pb.go

@@ -426,6 +426,7 @@ type StonehengeEventResp struct {
 	Room     *RoomData              `protobuf:"bytes,3,opt,name=room,proto3" json:"room"`
 	Reward   []*UserAtno            `protobuf:"bytes,4,rep,name=reward,proto3" json:"reward"`                                                                                     // 完成事件获得的奖励
 	Hero     map[string]*BattleRole `protobuf:"bytes,5,rep,name=hero,proto3" json:"hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 英雄信息
+	Userbuff map[int32]int32        `protobuf:"bytes,6,rep,name=userbuff,proto3" json:"userbuff" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
 func (x *StonehengeEventResp) Reset() {
@@ -495,6 +496,13 @@ func (x *StonehengeEventResp) GetHero() map[string]*BattleRole {
 	return nil
 }
 
+func (x *StonehengeEventResp) GetUserbuff() map[int32]int32 {
+	if x != nil {
+		return x.Userbuff
+	}
+	return nil
+}
+
 //获取房间信息
 type StonehengeGetRoomInfoReq struct {
 	state         protoimpl.MessageState
@@ -967,7 +975,7 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
 	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x25, 0x0a,
 	0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
 	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x22, 0x87, 0x02, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+	0x70, 0x6f, 0x72, 0x74, 0x22, 0x84, 0x03, 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,
@@ -979,57 +987,65 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
 	0x77, 0x61, 0x72, 0x64, 0x12, 0x32, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x05, 0x20, 0x03,
 	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45,
 	0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x1a, 0x44, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f,
+	0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x3e, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72,
+	0x62, 0x75, 0x66, 0x66, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x53, 0x74, 0x6f,
+	0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x2e, 0x55, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08,
+	0x75, 0x73, 0x65, 0x72, 0x62, 0x75, 0x66, 0x66, 0x1a, 0x44, 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, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
-	0x6f, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e,
-	0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 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, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74,
-	0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x22, 0x51, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
-	0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 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, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
-	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x5a, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
-	0x65, 0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x25, 0x0a, 0x06, 0x72,
-	0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61,
-	0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f,
-	0x72, 0x74, 0x22, 0x91, 0x02, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
-	0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04,
-	0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
-	0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x37, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18,
-	0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
-	0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
-	0x2e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f,
-	0x1a, 0x44, 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,
-	0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
-	0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 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, 0x6c, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, 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, 0x22, 0x59, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65,
+	0x6e, 0x67, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 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, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
+	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
+	0x22, 0x51, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 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, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69,
+	0x6e, 0x66, 0x6f, 0x22, 0x5a, 0x0a, 0x17, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
+	0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
+	0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
+	0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
+	0x91, 0x02, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 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, 0x12, 0x1d, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x09, 0x2e, 0x52, 0x6f, 0x6f, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x72, 0x6f, 0x6f,
+	0x6d, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
+	0x77, 0x61, 0x72, 0x64, 0x12, 0x37, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x23, 0x2e, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42,
+	0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65,
+	0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x1a, 0x44, 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, 0x21, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61,
+	0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 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 (
@@ -1044,7 +1060,7 @@ 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, 19)
+var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
 var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
 	(*StonehengeGetListReq)(nil),      // 0: StonehengeGetListReq
 	(*StonehengeGetListResp)(nil),     // 1: StonehengeGetListResp
@@ -1064,42 +1080,44 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
 	(*StonehengeBattleOverResp)(nil),  // 15: StonehengeBattleOverResp
 	nil,                               // 16: StonehengeEnterLevelResp.HeroEntry
 	nil,                               // 17: StonehengeEventResp.HeroEntry
-	nil,                               // 18: StonehengeBattleOverResp.HeroEntry
-	(*DBStonehenge)(nil),              // 19: DBStonehenge
-	(*DBStoneBoss)(nil),               // 20: DBStoneBoss
-	(*RoomData)(nil),                  // 21: RoomData
-	(*BattleReport)(nil),              // 22: BattleReport
-	(*UserAtno)(nil),                  // 23: UserAtno
-	(*BattleFormation)(nil),           // 24: BattleFormation
-	(*BattleInfo)(nil),                // 25: BattleInfo
-	(*BattleRole)(nil),                // 26: BattleRole
+	nil,                               // 18: StonehengeEventResp.UserbuffEntry
+	nil,                               // 19: StonehengeBattleOverResp.HeroEntry
+	(*DBStonehenge)(nil),              // 20: DBStonehenge
+	(*DBStoneBoss)(nil),               // 21: DBStoneBoss
+	(*RoomData)(nil),                  // 22: RoomData
+	(*BattleReport)(nil),              // 23: BattleReport
+	(*UserAtno)(nil),                  // 24: UserAtno
+	(*BattleFormation)(nil),           // 25: BattleFormation
+	(*BattleInfo)(nil),                // 26: BattleInfo
+	(*BattleRole)(nil),                // 27: BattleRole
 }
 var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{
-	19, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
-	20, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss
+	20, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
+	21, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss
 	16, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry
-	21, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData
-	21, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData
-	22, // 5: StonehengeEventReq.report:type_name -> BattleReport
-	21, // 6: StonehengeEventResp.room:type_name -> RoomData
-	23, // 7: StonehengeEventResp.reward:type_name -> UserAtno
+	22, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData
+	22, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData
+	23, // 5: StonehengeEventReq.report:type_name -> BattleReport
+	22, // 6: StonehengeEventResp.room:type_name -> RoomData
+	24, // 7: StonehengeEventResp.reward:type_name -> UserAtno
 	17, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry
-	21, // 9: StonehengeGetRoomInfoResp.room:type_name -> RoomData
-	19, // 10: StonehengeFinishResp.data:type_name -> DBStonehenge
-	24, // 11: StonehengeBattleReq.battle:type_name -> BattleFormation
-	25, // 12: StonehengeBattleResp.info:type_name -> BattleInfo
-	22, // 13: StonehengeBattleOverReq.report:type_name -> BattleReport
-	21, // 14: StonehengeBattleOverResp.room:type_name -> RoomData
-	23, // 15: StonehengeBattleOverResp.reward:type_name -> UserAtno
-	18, // 16: StonehengeBattleOverResp.hero:type_name -> StonehengeBattleOverResp.HeroEntry
-	26, // 17: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
-	26, // 18: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
-	26, // 19: StonehengeBattleOverResp.HeroEntry.value:type_name -> BattleRole
-	20, // [20:20] is the sub-list for method output_type
-	20, // [20:20] is the sub-list for method input_type
-	20, // [20:20] is the sub-list for extension type_name
-	20, // [20:20] is the sub-list for extension extendee
-	0,  // [0:20] is the sub-list for field type_name
+	18, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry
+	22, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData
+	20, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge
+	25, // 12: StonehengeBattleReq.battle:type_name -> BattleFormation
+	26, // 13: StonehengeBattleResp.info:type_name -> BattleInfo
+	23, // 14: StonehengeBattleOverReq.report:type_name -> BattleReport
+	22, // 15: StonehengeBattleOverResp.room:type_name -> RoomData
+	24, // 16: StonehengeBattleOverResp.reward:type_name -> UserAtno
+	19, // 17: StonehengeBattleOverResp.hero:type_name -> StonehengeBattleOverResp.HeroEntry
+	27, // 18: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
+	27, // 19: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
+	27, // 20: StonehengeBattleOverResp.HeroEntry.value:type_name -> BattleRole
+	21, // [21:21] is the sub-list for method output_type
+	21, // [21:21] is the sub-list for method input_type
+	21, // [21:21] is the sub-list for extension type_name
+	21, // [21:21] is the sub-list for extension extendee
+	0,  // [0:21] is the sub-list for field type_name
 }
 
 func init() { file_stonehenge_stonehenge_msg_proto_init() }
@@ -1311,7 +1329,7 @@ func file_stonehenge_stonehenge_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   20,
 			NumExtensions: 0,
 			NumServices:   0,
 		},