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

modules/stonehenge/api_event.go

@@ -29,7 +29,6 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 		err       error
 		newEvent  int32 // 是否有新的事件
 		eventConf *cfg.GameStoneEventData
-		newEventConf *cfg.GameStoneEventData //新的事件配置
 		reward    []*pb.UserAtno
 	)
 	update = make(map[string]interface{})
@@ -240,61 +239,38 @@ func (this *apiComp) Event(session comm.IUserSession, req *pb.StonehengeEventReq
 			}
 		}
 		update["hero"] = stone.Hero
-	case EventType11: // 剧情事件
+
-		var (
-			num1 int
-			num2 int
-			err  error
-			conf *cfg.GameStoneStoryData
-		)
-		num1, err = strconv.Atoi(req.Param1)
-		if err != nil {
-			return
-		}
-		num2, err = strconv.Atoi(req.Param1)
-		if err != nil {
-			return
-		}
-		if conf, err = this.module.configure.GetStoneStoryConf(int32(num1), int32(num2)); err != nil {
-			errdata = &pb.ErrorData{
-				Code:    pb.ErrorCode_ConfigNoFound,
-				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
-				Message: err.Error(),
-			}
-			return
-		}
-		this.module.Debugf("%v", conf)
 	}
 
 	stone.Rooms.Eventid[req.Eventid] = true //
 	// 校验事件有后续事件
 	if eventConf.Probability >= comm.GetRandNum(0, 1000) { // 命中
 		newEvent = eventConf.PostEvent
+		this.module.modelStonehenge.AddNewEvent([]int32{eventConf.PostEvent}, stone)
+		// stone.Rooms.Eventid[newEvent] = false //
+		// if newEventConf, err = this.module.configure.GetStoneEventDataById(newEvent); err != nil {
+		// 	errdata = &pb.ErrorData{
+		// 		Code:    pb.ErrorCode_ConfigNoFound,
+		// 		Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+		// 		Message: err.Error(),
+		// 	}
+		// 	return
+		// }
 
-		stone.Rooms.Eventid[newEvent] = false //
+		// switch newEventConf.EventType {
-		if newEventConf, err = this.module.configure.GetStoneEventDataById(newEvent); err != nil {
+		// case EventType25: // buff是3选1
-			errdata = &pb.ErrorData{
+		// 	for _, v := range stone.Addweight {
-				Code:    pb.ErrorCode_ConfigNoFound,
+		// 		ownerbuff := make(map[int32]struct{}, 0)
-				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+		// 		for k := range stone.Userbuff {
-				Message: err.Error(),
+		// 			ownerbuff[k] = struct{}{}
-			}
+		// 		}
-			return
+		// 		stone.Rooms.Selectbuff = this.module.configure.GetBuffGroupDataByLottery(newEventConf.Value1, v, ownerbuff)
-		}
+		// 	}
-
+		// case EventType10: // 宝箱事件
-		switch newEventConf.EventType {
+		// 	if _, ok := stone.Rooms.Box[newEventConf.EventId]; !ok {
-		case EventType25: // buff是3选1
+		// 		stone.Rooms.Box[newEventConf.EventId] = 0
-			for _, v := range stone.Addweight {
+		// 	}
-				ownerbuff := make(map[int32]struct{}, 0)
+		// }
-				for k := range stone.Userbuff {
-					ownerbuff[k] = struct{}{}
-				}
-				stone.Rooms.Selectbuff = this.module.configure.GetBuffGroupDataByLottery(newEventConf.Value1, v, ownerbuff)
-			}
-		case EventType10: // 宝箱事件
-			if _, ok := stone.Rooms.Box[newEventConf.EventId]; !ok {
-				stone.Rooms.Box[newEventConf.EventId] = 0
-			}
-		}
 
 	}
 	stone.Rooms.Complete = true

modules/stonehenge/api_gotoroom.go

@@ -25,7 +25,6 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
 		curRoomConf *cfg.GameStoneRoomData // 当前房间
 		confStage   *cfg.GameStoneStageData
 		szEvent     []int32
-		szBuff      []int32
 		err         error
 	)
 	update = make(map[string]interface{})
@@ -115,10 +114,11 @@ func (this *apiComp) GotoRoom(session comm.IUserSession, req *pb.StonehengeGotoR
 		stone.Rooms.Eventid[curRoomConf.BossEvent] = false
 	}
 	if len(szEvent) > 0 {
-		szBuff = this.module.configure.GetEventGroupDataByLottery(szEvent...)
+		szEvent = this.module.configure.GetEventGroupDataByLottery(szEvent...)
-		for _, v := range szBuff {
+		for _, v := range szEvent {
 			stone.Rooms.Eventid[v] = false
 		}
+		this.module.modelStonehenge.AddNewEvent(szEvent, stone)
 	}
 
 	stone.Rooms.Portal = this.module.configure.GetRoomGroupDataByLottery(req.Portal)

modules/stonehenge/api_story.go

@@ -0,0 +1,108 @@
+package stonehenge
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+	"strconv"
+	"strings"
+)
+
+//参数校验
+func (this *apiComp) StoryCheck(session comm.IUserSession, req *pb.StonehengeStoryReq) (errdata *pb.ErrorData) {
+	if req.Cid == 0 {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.String(),
+		}
+	}
+	return
+}
+
+func (this *apiComp) Story(session comm.IUserSession, req *pb.StonehengeStoryReq) (errdata *pb.ErrorData) {
+	var (
+		stone    *pb.DBStonehenge
+		err      error
+		update   map[string]interface{}
+		newEvent int32
+		conf     *cfg.GameStoneStoryData
+		event    []string
+	)
+	if errdata = this.StoryCheck(session, req); errdata != nil {
+		return
+	}
+	update = make(map[string]interface{})
+	if stone, err = this.module.modelStonehenge.GetStonehengeData(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.String(),
+			Message: err.Error(),
+		}
+		return
+	}
+	if req.Cid == -1 {
+		stone.Rooms.Story = 0
+
+	} else {
+		if conf, err = this.module.configure.GetStoneStoryConf(req.Cid); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		this.module.Debugf("%v", conf)
+		if req.Pos == 0 {
+			event = conf.OptionEventIdGroup1
+		} else if req.Pos == 1 {
+			event = conf.OptionEventIdGroup2
+		} else if req.Pos == 2 {
+			event = conf.OptionEventIdGroup3
+		} else {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		var szW []int32
+		if len(event) == 1 {
+			arr := strings.Split(event[0], ",")
+			if len(arr) != 3 {
+				return
+			}
+			if n, err := strconv.Atoi(arr[2]); err == nil {
+				stone.Rooms.Story = int32(n)
+			}
+		} else {
+			for _, s := range event {
+				arr := strings.Split(s, ",")
+				if len(arr) != 3 {
+					return
+				}
+				if n, err := strconv.Atoi(arr[1]); err == nil {
+					szW = append(szW, int32(n))
+				}
+			}
+
+			arr := strings.Split(event[comm.GetRandW(szW)], ",")
+			if n, err := strconv.Atoi(arr[2]); err == nil {
+				stone.Rooms.Story = int32(n)
+			}
+			if n, err := strconv.Atoi(arr[0]); err == nil {
+				newEvent = int32(n)
+				stone.Rooms.Eventid[newEvent] = false
+			}
+		}
+	}
+
+	update["rooms"] = stone.Rooms
+	this.module.modelStonehenge.ChangeStonehengeData(session.GetUserId(), update)
+	session.SendMsg(string(this.module.GetType()), "story", &pb.StonehengeStoryResp{
+		Story:    stone.Rooms.Story,
+		NewEvent: newEvent,
+	})
+	return
+}

modules/stonehenge/configure.go

@@ -1,7 +1,6 @@
 package stonehenge
 
 import (
-	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/log"
@@ -732,6 +731,7 @@ func (this *configureComp) getGameStoneIllustratedDatas() (confs []*cfg.GameSton
 
 	return
 }
+
 func (this *configureComp) LoadGameStoneStory() {
 
 	if v, err := this.GetConfigure(game_storyconf); err == nil {
@@ -740,8 +740,8 @@ func (this *configureComp) LoadGameStoneStory() {
 			defer this.hlock.Unlock()
 			this.story = make(map[int32]*cfg.GameStoneStoryData)
 			for _, v := range configure.GetDataList() {
-				key := v.StoryGroupId<<8 + v.StepId
+
-				this.story[key] = v
+				this.story[v.Id] = v
 			}
 		}
 	}
@@ -749,12 +749,12 @@ func (this *configureComp) LoadGameStoneStory() {
 	return
 }
 
-func (this *configureComp) GetStoneStoryConf(id, step int32) (data *cfg.GameStoneStoryData, err error) {
+func (this *configureComp) GetStoneStoryConf(id int32) (data *cfg.GameStoneStoryData, err error) {
 	var ok bool
-	if data, ok = this.story[id<<8+step]; ok {
+	if data, ok = this.story[id]; ok {
 		return
 	}
-	err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_stonetalent, fmt.Sprintf("StoryGroupId:%d,step:%d", id, step))
+	err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_stonetalent, id)
 	return
 }
 

modules/stonehenge/modelStonehenge.go

@@ -108,6 +108,29 @@ func (this *MStonehenge) GetAllStoneBoosData() (bossstage map[int32]*pb.StageDat
 	return this.bossStage
 }
 
-func (this *MStonehenge) EventTrigger(event []string, room *pb.RoomData) {
+// 获得新的事件
+func (this *MStonehenge) AddNewEvent(event []int32, stone *pb.DBStonehenge) {
+	for _, newEvent := range event {
+		stone.Rooms.Eventid[newEvent] = false //
+		newEventConf, err := this.module.configure.GetStoneEventDataById(newEvent)
+		if err != nil {
+			continue
+		}
+
+		switch newEventConf.EventType {
+		case EventType25: // buff是3选1
+			for _, v := range stone.Addweight {
+				ownerbuff := make(map[int32]struct{}, 0)
+				for k := range stone.Userbuff {
+					ownerbuff[k] = struct{}{}
+				}
+				stone.Rooms.Selectbuff = this.module.configure.GetBuffGroupDataByLottery(newEventConf.Value1, v, ownerbuff)
+			}
+		case EventType10: // 宝箱事件
+			if _, ok := stone.Rooms.Box[newEventConf.EventId]; !ok {
+				stone.Rooms.Box[newEventConf.EventId] = 0
+			}
+		}
+	}
 
 }

modules/uigame/api_latticegrid.go

@@ -106,7 +106,7 @@ func (this *apiComp) LatticeGrid(session comm.IUserSession, req *pb.UiGameLattic
 	}
 	if len(atno) == 0 { // 普通格子奖励
 		if len(conf.Costget) > 0 {
-			if errdata, atno = this.module.DispenseAtno(session, latticeConf.Chestsward, true); errdata != nil {
+			if errdata, atno = this.module.DispenseAtno(session, conf.Costget, true); errdata != nil {
 				return
 			}
 		}

modules/uigame/api_minergrid.go

@@ -38,8 +38,8 @@ func (this *apiComp) MinerKey(session comm.IUserSession, req *pb.UiGameMinerKeyR
 				return
 			}
 		}
-		if conf.Itemget.N > 0 {
+		if len(conf.Costget) > 0 {
-			if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{conf.Itemget}, true); errdata != nil {
+			if errdata, atno = this.module.DispenseAtno(session, conf.Costget, true); errdata != nil {
 				return
 			}
 		}

modules/uigame/api_puzzlegrid.go

@@ -38,8 +38,8 @@ func (this *apiComp) PuzzleGrid(session comm.IUserSession, req *pb.UiGamePuzzleG
 				return
 			}
 		}
-		if conf.Itemget.N > 0 {
+		if len(conf.Costget) > 0 {
-			if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{conf.Itemget}, true); errdata != nil {
+			if errdata, atno = this.module.DispenseAtno(session, conf.Costget, true); errdata != nil {
 				return
 			}
 		}

pb/stonehenge_msg.pb.go

@@ -1614,24 +1614,8 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
 	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x21,
 	0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
 	0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72,
-	0x64, 0x22, 0x28, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57,
+	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x65, 0x65, 0x6b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x33,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xdd, 0x01, 0x0a, 0x17,
-	0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x4e, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c,
-	0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e,
-	0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x57, 0x65, 0x65, 0x6b, 0x41, 0x77,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65,
-	0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x6c,
-	0x79, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
-	0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65,
-	0x65, 0x6b, 0x6c, 0x79, 0x72, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1646,7 +1630,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, 33)
+var file_stonehenge_stonehenge_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
 var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
 	(*StonehengeGetListReq)(nil),         // 0: StonehengeGetListReq
 	(*StonehengeGetListResp)(nil),        // 1: StonehengeGetListResp
@@ -1672,57 +1656,52 @@ var file_stonehenge_stonehenge_msg_proto_goTypes = []interface{}{
 	(*StonehengeBookInfoResp)(nil),       // 21: StonehengeBookInfoResp
 	(*StonehengeBookAwardReq)(nil),       // 22: StonehengeBookAwardReq
 	(*StonehengeBookAwardResp)(nil),      // 23: StonehengeBookAwardResp
-	(*StonehengeWeekAwardReq)(nil),       // 24: StonehengeWeekAwardReq
+	nil,                                  // 24: StonehengeEnterLevelResp.HeroEntry
-	(*StonehengeWeekAwardResp)(nil),      // 25: StonehengeWeekAwardResp
+	nil,                                  // 25: StonehengeEventResp.HeroEntry
-	nil,                                  // 26: StonehengeEnterLevelResp.HeroEntry
+	nil,                                  // 26: StonehengeEventResp.UserbuffEntry
-	nil,                                  // 27: StonehengeEventResp.HeroEntry
+	nil,                                  // 27: StonehengeStoreResp.ShopEntry
-	nil,                                  // 28: StonehengeEventResp.UserbuffEntry
+	nil,                                  // 28: StonehengeActivateTalentResp.TalentEntry
-	nil,                                  // 29: StonehengeStoreResp.ShopEntry
+	nil,                                  // 29: StonehengeActivateTalentResp.TalentpropertyEntry
-	nil,                                  // 30: StonehengeActivateTalentResp.TalentEntry
+	(*DBStonehenge)(nil),                 // 30: DBStonehenge
-	nil,                                  // 31: StonehengeActivateTalentResp.TalentpropertyEntry
+	(*DBStoneBoss)(nil),                  // 31: DBStoneBoss
-	nil,                                  // 32: StonehengeWeekAwardResp.WeeklyrewardEntry
+	(*RoomData)(nil),                     // 32: RoomData
-	(*DBStonehenge)(nil),                 // 33: DBStonehenge
+	(*BattleReport)(nil),                 // 33: BattleReport
-	(*DBStoneBoss)(nil),                  // 34: DBStoneBoss
+	(*UserAtno)(nil),                     // 34: UserAtno
-	(*RoomData)(nil),                     // 35: RoomData
+	(*BattleFormation)(nil),              // 35: BattleFormation
-	(*BattleReport)(nil),                 // 36: BattleReport
+	(*BattleInfo)(nil),                   // 36: BattleInfo
-	(*UserAtno)(nil),                     // 37: UserAtno
+	(StonehengePrivilege)(0),             // 37: StonehengePrivilege
-	(*BattleFormation)(nil),              // 38: BattleFormation
+	(*DBStonehengeBook)(nil),             // 38: DBStonehengeBook
-	(*BattleInfo)(nil),                   // 39: BattleInfo
+	(*UserAssets)(nil),                   // 39: UserAssets
-	(StonehengePrivilege)(0),             // 40: StonehengePrivilege
+	(*BattleRole)(nil),                   // 40: BattleRole
-	(*DBStonehengeBook)(nil),             // 41: DBStonehengeBook
-	(*UserAssets)(nil),                   // 42: UserAssets
-	(*BattleRole)(nil),                   // 43: BattleRole
 }
 var file_stonehenge_stonehenge_msg_proto_depIdxs = []int32{
-	33, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
+	30, // 0: StonehengeGetListResp.data:type_name -> DBStonehenge
-	34, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss
+	31, // 1: StonehengeGetListResp.boss:type_name -> DBStoneBoss
-	26, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry
+	24, // 2: StonehengeEnterLevelResp.hero:type_name -> StonehengeEnterLevelResp.HeroEntry
-	35, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData
+	32, // 3: StonehengeEnterLevelResp.room:type_name -> RoomData
-	35, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData
+	32, // 4: StonehengeGotoRoomResp.room:type_name -> RoomData
-	36, // 5: StonehengeEventReq.report:type_name -> BattleReport
+	33, // 5: StonehengeEventReq.report:type_name -> BattleReport
-	35, // 6: StonehengeEventResp.room:type_name -> RoomData
+	32, // 6: StonehengeEventResp.room:type_name -> RoomData
-	37, // 7: StonehengeEventResp.reward:type_name -> UserAtno
+	34, // 7: StonehengeEventResp.reward:type_name -> UserAtno
-	27, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry
+	25, // 8: StonehengeEventResp.hero:type_name -> StonehengeEventResp.HeroEntry
-	28, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry
+	26, // 9: StonehengeEventResp.userbuff:type_name -> StonehengeEventResp.UserbuffEntry
-	35, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData
+	32, // 10: StonehengeGetRoomInfoResp.room:type_name -> RoomData
-	33, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge
+	30, // 11: StonehengeFinishResp.data:type_name -> DBStonehenge
-	38, // 12: StonehengeBattleReq.battle:type_name -> BattleFormation
+	35, // 12: StonehengeBattleReq.battle:type_name -> BattleFormation
-	39, // 13: StonehengeBattleResp.info:type_name -> BattleInfo
+	36, // 13: StonehengeBattleResp.info:type_name -> BattleInfo
-	29, // 14: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry
+	27, // 14: StonehengeStoreResp.shop:type_name -> StonehengeStoreResp.ShopEntry
-	30, // 15: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry
+	28, // 15: StonehengeActivateTalentResp.talent:type_name -> StonehengeActivateTalentResp.TalentEntry
-	31, // 16: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry
+	29, // 16: StonehengeActivateTalentResp.talentproperty:type_name -> StonehengeActivateTalentResp.TalentpropertyEntry
-	40, // 17: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege
+	37, // 17: StonehengeActivateTalentResp.privilege:type_name -> StonehengePrivilege
-	41, // 18: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook
+	38, // 18: StonehengeBookInfoResp.info:type_name -> DBStonehengeBook
-	42, // 19: StonehengeBookAwardResp.award:type_name -> UserAssets
+	39, // 19: StonehengeBookAwardResp.award:type_name -> UserAssets
-	32, // 20: StonehengeWeekAwardResp.weeklyreward:type_name -> StonehengeWeekAwardResp.WeeklyrewardEntry
+	40, // 20: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
-	42, // 21: StonehengeWeekAwardResp.award:type_name -> UserAssets
+	40, // 21: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
-	43, // 22: StonehengeEnterLevelResp.HeroEntry.value:type_name -> BattleRole
+	22, // [22:22] is the sub-list for method output_type
-	43, // 23: StonehengeEventResp.HeroEntry.value:type_name -> BattleRole
+	22, // [22:22] is the sub-list for method input_type
-	24, // [24:24] is the sub-list for method output_type
+	22, // [22:22] is the sub-list for extension type_name
-	24, // [24:24] is the sub-list for method input_type
+	22, // [22:22] is the sub-list for extension extendee
-	24, // [24:24] is the sub-list for extension type_name
+	0,  // [0:22] is the sub-list for field type_name
-	24, // [24:24] is the sub-list for extension extendee
-	0,  // [0:24] is the sub-list for field type_name
 }
 
 func init() { file_stonehenge_stonehenge_msg_proto_init() }
@@ -2054,7 +2033,7 @@ func file_stonehenge_stonehenge_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_stonehenge_stonehenge_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   33,
+			NumMessages:   30,
 			NumExtensions: 0,
 			NumServices:   0,
 		},