公会boss挑战

cmd/v2/lib/common/utils.go

@@ -234,3 +234,10 @@ func FormatFloatCeil(num float64, decimal int) (float64, error) {
 	res := strconv.FormatFloat(math.Ceil(num*d)/d, 'f', -1, 64)
 	return strconv.ParseFloat(res, 64)
 }
+
+func LastChars(str string, count int) string {
+	if len(str) <= count {
+        return str
+    }
+    return str[len(str)-count:]
+}

cmd/v2/lib/common/utils_test.go

@@ -59,3 +59,7 @@ func TestDiv(t *testing.T) {
 	num, _ = FormatFloatFloor(0.2295, 2)
 	fmt.Println(reflect.TypeOf(num), num)
 }
+
+func TestSub(t *testing.T){
+	fmt.Println(LastChars("23af2", 6))
+}

cmd/v2/ui/views/hero_list.go

@@ -45,11 +45,11 @@ func (this *HeroListView) CreateView(t *model.TestCase) fyne.CanvasObject {
 	buttonBar := container.NewHBox(refreshBtn)
 	c := container.NewBorder(buttonBar, nil, nil, nil, this.itemList.ItemList)
 
-	this.dataListener()
+	this.DataListener()
 	return c
 }
 
-func (this *HeroListView) dataListener() {
+func (this *HeroListView) DataListener() {
 	if this.flag {
 		return
 	}

cmd/v2/ui/views/sociaty_boss.go

@@ -1,25 +1,244 @@
 package formview
 
 import (
+	"fmt"
+	"go_dreamfactory/cmd/v2/lib/common"
 	"go_dreamfactory/cmd/v2/model"
+	"go_dreamfactory/cmd/v2/service"
+	"go_dreamfactory/cmd/v2/service/observer"
+	"go_dreamfactory/comm"
+	"go_dreamfactory/modules/hero"
+	"go_dreamfactory/modules/sociaty"
+	"go_dreamfactory/pb"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/dialog"
 	"fyne.io/fyne/v2/widget"
+	"github.com/sirupsen/logrus"
 )
 
 type SociatyBossView struct {
 	BaseformView
+
+	itemList     common.ItemList
+	heroListFlag bool
+	teamFlag     bool
+	heroList     func()
+	sociatyId    string
+	teams        map[int32]*pb.ChallengeTeams
 }
 
 func (s *SociatyBossView) CreateView(t *model.TestCase) fyne.CanvasObject {
+	s.teams = make(map[int32]*pb.ChallengeTeams)
+
+	loadSociaty := func() {
+		if err := service.GetPttService().SendToClient(
+			t.MainType,
+			sociaty.SociatySubTypeMine,
+			&pb.SociatyMineReq{},
+		); err != nil {
+			logrus.Error(err)
+			return
+		}
+	}
+	defer loadSociaty()
+
 	buzhenBtn := widget.NewButton("布阵", s.buzhen)
-	btns := container.NewHBox(buzhenBtn)
+	challengeBtn := widget.NewButton("挑战", s.challenge)
+	btns := container.NewHBox(buzhenBtn, challengeBtn)
 	c := container.NewBorder(btns, nil, nil, nil)
+
+	s.listenTeams()
 	return c
 }
 
+//加载team数据
+func (s *SociatyBossView) listenTeams() {
+	if s.teamFlag {
+		return
+	}
+	s.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{
+		OnNotify: func(d interface{}, args ...interface{}) {
+			data := d.(*pb.UserMessage)
+			if !(data.MainType == string(comm.ModuleSociaty) &&
+				data.SubType == sociaty.SociatySubTypeMine) {
+				return
+			}
+			rsp := &pb.SociatyMineResp{}
+
+			if !comm.ProtoUnmarshal(data, rsp) {
+				logrus.Error("unmarshal err")
+				return
+			}
+
+			if rsp.Sociaty != nil {
+				s.sociatyId = rsp.Sociaty.Id
+				s.teams = rsp.Teams
+			}
+
+		},
+	})
+	s.teamFlag = true
+}
+
+// 挑战
+func (s *SociatyBossView) challenge() {
+
+}
+
 //布阵
 func (s *SociatyBossView) buzhen() {
+	//英雄列表
+	s.itemList = *common.NewItemList()
+	s.itemList.ItemList = s.itemList.CreateDefaultCheckList()
 
+	s.heroList = func() {
+		if err := service.GetPttService().SendToClient(string(comm.ModuleHero), "list", &pb.HeroListReq{}); err != nil {
+			logrus.Error(err)
+			return
+		}
+	}
+	defer s.heroList()
+	s.HeroDataListener()
+
+	//队伍数据
+
+	addHero1 := widget.NewButton("添加至一队", nil)
+	addHero2 := widget.NewButton("添加至二队", nil)
+	addHero3 := widget.NewButton("添加至三队", nil)
+	saveBuzhen := widget.NewButton("保存布阵", nil)
+
+	btns := container.NewHBox(addHero1, addHero2, addHero3, saveBuzhen)
+	content := container.NewGridWithRows(3)
+	team1 := container.NewGridWithColumns(5)
+	//refresh team1
+	team1Box := container.NewHBox(widget.NewLabel("一队:"), team1)
+	if t, ok := s.teams[1]; ok {
+		for _, i := range t.Infos {
+			team1.AddObject(widget.NewLabel(common.LastChars(i.HeroId, 4)))
+		}
+	}
+
+	team2 := container.NewGridWithColumns(5)
+	team2Box := container.NewHBox(widget.NewLabel("二队:"), team2)
+	team3 := container.NewGridWithColumns(5)
+	team3Box := container.NewHBox(widget.NewLabel("三队:"), team3)
+
+	content.AddObject(team1Box)
+	content.AddObject(team2Box)
+	content.AddObject(team3Box)
+
+	// 添加一队英雄
+	addHero1.OnTapped = func() {
+		team1 = container.NewGridWithColumns(5)
+		if t, ok := s.teams[1]; ok {
+			for _, i := range t.Infos {
+				team1.AddObject(widget.NewLabel(common.LastChars(i.HeroId, 4)))
+			}
+		}
+		teams := []*pb.ChallengeTeamInfo{}
+		for _, id := range s.itemList.SelItemIds {
+			team1.AddObject(widget.NewLabel(common.LastChars(id, 4)))
+			teams = append(teams, &pb.ChallengeTeamInfo{
+				HeroId: id,
+			})
+		}
+		if s.teams == nil {
+			s.teams = make(map[int32]*pb.ChallengeTeams)
+		}
+		s.teams[1] = &pb.ChallengeTeams{Infos: teams}
+	}
+
+	// 添加二队英雄
+	addHero2.OnTapped = func() {
+		team2 = container.NewGridWithColumns(5)
+		if t, ok := s.teams[2]; ok {
+			for _, i := range t.Infos {
+				team2.AddObject(widget.NewLabel(common.LastChars(i.HeroId, 4)))
+			}
+		}
+		teams := []*pb.ChallengeTeamInfo{}
+		for _, id := range s.itemList.SelItemIds {
+			team2.AddObject(widget.NewLabel(common.LastChars(id, 4)))
+			teams = append(teams, &pb.ChallengeTeamInfo{
+				HeroId: id,
+			})
+		}
+		if s.teams == nil {
+			s.teams = make(map[int32]*pb.ChallengeTeams)
+		}
+		s.teams[2] = &pb.ChallengeTeams{Infos: teams}
+	}
+
+	// 添加三队英雄
+	addHero3.OnTapped = func() {
+		team3 = container.NewGridWithColumns(5)
+		if t, ok := s.teams[3]; ok {
+			for _, i := range t.Infos {
+				team3.AddObject(widget.NewLabel(common.LastChars(i.HeroId, 4)))
+			}
+		}
+		teams := []*pb.ChallengeTeamInfo{}
+		for _, id := range s.itemList.SelItemIds {
+			team3.AddObject(widget.NewLabel(common.LastChars(id, 4)))
+			teams = append(teams, &pb.ChallengeTeamInfo{
+				HeroId: id,
+			})
+		}
+		if s.teams == nil {
+			s.teams = make(map[int32]*pb.ChallengeTeams)
+		}
+		s.teams[3] = &pb.ChallengeTeams{Infos: teams}
+	}
+
+	// 保存阵容
+	saveBuzhen.OnTapped = func() {
+		if err := service.GetPttService().SendToClient(string(comm.ModuleSociaty),
+			sociaty.SociatySubTypeFormation, &pb.SociatyBFormationReq{
+				SociatyId: s.sociatyId,
+				Teams:     s.teams,
+			}); err != nil {
+			logrus.Error(err)
+			return
+		}
+	}
+
+	split := container.NewHSplit(s.itemList.ItemList, content)
+	split.Offset = 0.55
+	layout := container.NewBorder(btns, nil, nil, nil, split)
+	dconf := dialog.NewCustom("布阵", "关闭", layout, s.w)
+	dconf.Resize(fyne.NewSize(800, 500))
+	dconf.Show()
+}
+
+func (this *SociatyBossView) HeroDataListener() {
+	if this.heroListFlag {
+		return
+	}
+	this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{
+		OnNotify: func(d interface{}, args ...interface{}) {
+			data := d.(*pb.UserMessage)
+			if !(data.MainType == string(comm.ModuleHero) &&
+				data.SubType == hero.HeroSubTypeList) {
+				return
+			}
+			rsp := &pb.HeroListResp{}
+
+			if !comm.ProtoUnmarshal(data, rsp) {
+				logrus.Error("unmarshal err")
+				return
+			}
+
+			for i, v := range rsp.List {
+				item := common.Item{
+					Id: v.Id,
+					Text: fmt.Sprintf("%d ID:%v Star:%d Lv:%d Type:%d Count:%d",
+						i+1, v.HeroID, v.Star, v.Lv, v.CardType, v.SameCount),
+				}
+				this.itemList.AddItem(item)
+			}
+		},
+	})
+	this.heroListFlag = true
 }

modules/sociaty/api.go

@@ -34,6 +34,7 @@ const (
 	SociatySubTypeLog             = "log"
 	SociatySubTypeAgreePush       = "agree"
 	SociatySubTypeRecord          = "record"
+	SociatySubTypeFormation       = "formation"
 )
 
 type apiComp struct {

modules/sociaty/api_cross_Formation.go

@@ -0,0 +1,43 @@
+package sociaty
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+// 设置阵容
+func (this *apiComp) FormationCheck(session comm.IUserSession, req *pb.SociatyBFormationReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) Formation(session comm.IUserSession, req *pb.SociatyBFormationReq) (code pb.ErrorCode, data proto.Message) {
+	if code = this.FormationCheck(session, req); code != pb.ErrorCode_Success {
+		return
+	}
+
+	uid := session.GetUserId()
+	sociaty := this.module.modelSociaty.getUserSociaty(uid)
+	if sociaty != nil && sociaty.Id == "" {
+		code = pb.ErrorCode_SociatyNoFound
+		this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid})
+		return
+	}
+
+	if err := this.module.modelSociatyBoss.setFormation(sociaty, uid, req.Teams); err != nil {
+		this.module.Error("设置阵容", log.Field{Key: "uid", Value: uid})
+		code = pb.ErrorCode_DBError
+		return
+	}
+
+	rsp := &pb.SociatyBFormationResp{
+		SociatyId: sociaty.Id,
+	}
+
+	if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeFormation, rsp); err != nil {
+		code = pb.ErrorCode_SystemError
+	}
+	return
+}

modules/sociaty/api_cross_challenge.go

@@ -0,0 +1,16 @@
+package sociaty
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.SociatyBChallengeReq) (code pb.ErrorCode) {
+	return
+}
+
+func (this *apiComp) Challenge(session comm.IUserSession, req *pb.SociatyBChallengeReq) (code pb.ErrorCode, data proto.Message) {
+	return
+}

modules/sociaty/api_cross_mine.go

@@ -90,6 +90,11 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.SociatyMineReq) (co
 			)
 		}
 	}
+
+	if sm := this.module.modelSociaty.getMemberInfo(sociaty, uid); sm != nil {
+		rsp.Teams = sm.Teams
+	}
+
 	rsp.Sociaty = sociaty
 	rsp.Master = master
 

modules/sociaty/api_cross_setFormation.go

@@ -1,16 +0,0 @@
-package sociaty
-
-import (
-	"go_dreamfactory/comm"
-	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
-)
-// 设置阵容
-func (this *apiComp) SetFormationCheck(session comm.IUserSession, req *pb.SociatyBSetFormationReq) (code pb.ErrorCode) {
-	return
-}
-
-func (this *apiComp) SetFormation(session comm.IUserSession, req *pb.SociatyBSetFormationReq) (code pb.ErrorCode, data proto.Message) {
-	return
-}

modules/sociaty/model_sociaty.go

@@ -468,6 +468,16 @@ func (this *ModelSociaty) getMemberIds(sociaty *pb.DBSociaty) (ids []string) {
 	return
 }
 
+// 获取成员信息
+func (this *ModelSociaty) getMemberInfo(sociaty *pb.DBSociaty, uid string) *pb.SociatyMember {
+	for _, s := range sociaty.Members {
+		if s.Uid == uid {
+			return s
+		}
+	}
+	return nil
+}
+
 // 同意
 func (this *ModelSociaty) agree(uid string, sociaty *pb.DBSociaty) error {
 	if this.isMember(uid, sociaty) {

modules/sociaty/model_sociatyboss.go

@@ -4,6 +4,7 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
 )
 
 type ModelSociatyBoss struct {
@@ -20,6 +21,37 @@ func (this *ModelSociatyBoss) Init(service core.IService, module core.IModule, c
 	return
 }
 
-func(s *ModelSociatyBoss) setFormation(){
+// 设置阵容
+func (s *ModelSociatyBoss) setFormation(sociaty *pb.DBSociaty, uid string, teams map[int32]*pb.ChallengeTeams) error {
+	if !s.moduleSociaty.modelSociaty.isMember(uid, sociaty) {
+		return comm.NewCustomError(pb.ErrorCode_SociatyBelongTo)
+	}
+	for _, m := range sociaty.Members {
+		if m.Uid == uid {
+			m.Teams = teams
+		}
+	}
 
+	update := map[string]interface{}{
+		"members": sociaty.Members,
+	}
+	return s.moduleSociaty.modelSociaty.updateSociaty(sociaty.Id, update)
+}
+
+//挑战
+func (s *ModelSociatyBoss) challenge(session comm.IUserSession) error {
+
+	iBattle, err := s.moduleSociaty.service.GetModule(comm.ModuleBattle)
+	if err != nil {
+		return err
+	}
+
+	if b, y := iBattle.(comm.IBattle); y {
+		b.CreatePveBattle(session, &pb.BattlePVEReq{
+			Ptype:  pb.PlayType_sociaty,
+			Title:  "公会BOSS",
+			Format: &pb.BattleFormation{},
+		})
+	}
+	return nil
 }

modules/sociaty/module.go

@@ -29,6 +29,7 @@ type Sociaty struct {
 	modelSociaty        *ModelSociaty
 	modelSociatyTask    *ModelSociatyTask
 	modelSociatyLog     *ModelSociatyLog
+	modelSociatyBoss    *ModelSociatyBoss
 	configure           *configureComp
 	globalConf          *cfg.GameGlobalData
 	sociatyActivityConf *cfg.GameGuildActivity
@@ -57,6 +58,7 @@ func (this *Sociaty) OnInstallComp() {
 	this.modelSociaty = this.RegisterComp(new(ModelSociaty)).(*ModelSociaty)
 	this.modelSociatyTask = this.RegisterComp(new(ModelSociatyTask)).(*ModelSociatyTask)
 	this.modelSociatyLog = this.RegisterComp(new(ModelSociatyLog)).(*ModelSociatyLog)
+	this.modelSociatyBoss = this.RegisterComp(new(ModelSociatyBoss)).(*ModelSociatyBoss)
 	this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
 }
 

pb/sociaty_db.pb.go

@@ -800,8 +800,7 @@ type ChallengeTeamInfo struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	HeroId    string `protobuf:"bytes,1,opt,name=heroId,proto3" json:"heroId" bson:"heroId"`           //英雄ID
+	HeroId string `protobuf:"bytes,1,opt,name=heroId,proto3" json:"heroId" bson:"heroId"` //英雄ID
-	IsChapter bool   `protobuf:"varint,2,opt,name=isChapter,proto3" json:"isChapter" bson:"isChapter"` //是否队长
 }
 
 func (x *ChallengeTeamInfo) Reset() {
@@ -843,19 +842,12 @@ func (x *ChallengeTeamInfo) GetHeroId() string {
 	return ""
 }
 
-func (x *ChallengeTeamInfo) GetIsChapter() bool {
-	if x != nil {
-		return x.IsChapter
-	}
-	return false
-}
-
 type ChallengeTeams struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Info []*ChallengeTeamInfo `protobuf:"bytes,1,rep,name=info,proto3" json:"info" bson:"teamInfo"` //队伍
+	Infos []*ChallengeTeamInfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos" bson:"teamInfo"` //队伍
 }
 
 func (x *ChallengeTeams) Reset() {
@@ -890,9 +882,9 @@ func (*ChallengeTeams) Descriptor() ([]byte, []int) {
 	return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *ChallengeTeams) GetInfo() []*ChallengeTeamInfo {
+func (x *ChallengeTeams) GetInfos() []*ChallengeTeamInfo {
 	if x != nil {
-		return x.Info
+		return x.Infos
 	}
 	return nil
 }
@@ -1090,41 +1082,39 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{
 	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74,
 	0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74,
 	0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x49, 0x0a, 0x11, 0x43,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x43,
 	0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x66, 0x6f,
 	0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x43, 0x68,
+	0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x22, 0x3a, 0x0a, 0x0e, 0x43, 0x68, 0x61, 0x6c,
-	0x61, 0x70, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x43,
+	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x28, 0x0a, 0x05, 0x69, 0x6e,
-	0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x22, 0x38, 0x0a, 0x0e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65,
+	0x66, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x43, 0x68, 0x61, 0x6c,
-	0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x26, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x69,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+	0x6e, 0x66, 0x6f, 0x73, 0x22, 0xb1, 0x02, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09,
-	0x22, 0xb1, 0x02, 0x0a, 0x13, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f,
+	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
+	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
-	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x76, 0x61, 0x6c,
-	0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65,
+	0x75, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x76, 0x61, 0x6c,
-	0x67, 0x72, 0x61, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65,
+	0x75, 0x61, 0x74, 0x65, 0x12, 0x35, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65,
+	0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
-	0x12, 0x35, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x6f, 0x73, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45,
-	0x1f, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x6f, 0x73, 0x73, 0x52,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64,
-	0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64,
-	0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65,
-	0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x49, 0x0a,
-	0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
-	0x28, 0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x49, 0x0a, 0x0a, 0x54, 0x65, 0x61,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a,
-	0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x76,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69,
-	0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10,
-	0x3a, 0x02, 0x38, 0x01, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a,
+	0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a,
-	0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00, 0x12, 0x0a, 0x0a,
+	0x05, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45,
-	0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x44, 0x4d,
+	0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50,
-	0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50, 0x52, 0x45, 0x53,
+	0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x45, 0x53, 0x49,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1166,7 +1156,7 @@ var file_sociaty_sociaty_db_proto_depIdxs = []int32{
 	4,  // 4: DBSociatyLog.list:type_name -> SociatyLog
 	7,  // 5: DBSociatyTask.taskList:type_name -> SociatyTask
 	8,  // 6: DBSociatyTask.activityList:type_name -> SociatyActivity
-	10, // 7: ChallengeTeams.info:type_name -> ChallengeTeamInfo
+	10, // 7: ChallengeTeams.infos:type_name -> ChallengeTeamInfo
 	14, // 8: DBSociatyBossRecord.teams:type_name -> DBSociatyBossRecord.TeamsEntry
 	11, // 9: SociatyMember.TeamsEntry.value:type_name -> ChallengeTeams
 	11, // 10: DBSociatyBossRecord.TeamsEntry.value:type_name -> ChallengeTeams

pb/sociaty_msg.pb.go

@@ -2743,17 +2743,17 @@ func (x *SociatyPAgreePush) GetSociatyId() string {
 }
 
 // 公会BOSS 布阵
-type SociatyBSetFormationReq struct {
+type SociatyBFormationReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
 	SociatyId string                    `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"`
-	Teams     map[int32]*ChallengeTeams `protobuf:"bytes,2,rep,name=teams,proto3" json:"teams" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //队伍信息 队伍编号1 2 3
+	Teams     map[int32]*ChallengeTeams `protobuf:"bytes,2,rep,name=teams,proto3" json:"teams" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //队伍信息，队伍编号1 2 3，从1开始
 }
 
-func (x *SociatyBSetFormationReq) Reset() {
+func (x *SociatyBFormationReq) Reset() {
-	*x = SociatyBSetFormationReq{}
+	*x = SociatyBFormationReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_sociaty_sociaty_msg_proto_msgTypes[53]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2761,13 +2761,13 @@ func (x *SociatyBSetFormationReq) Reset() {
 	}
 }
 
-func (x *SociatyBSetFormationReq) String() string {
+func (x *SociatyBFormationReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SociatyBSetFormationReq) ProtoMessage() {}
+func (*SociatyBFormationReq) ProtoMessage() {}
 
-func (x *SociatyBSetFormationReq) ProtoReflect() protoreflect.Message {
+func (x *SociatyBFormationReq) ProtoReflect() protoreflect.Message {
 	mi := &file_sociaty_sociaty_msg_proto_msgTypes[53]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2779,26 +2779,26 @@ func (x *SociatyBSetFormationReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SociatyBSetFormationReq.ProtoReflect.Descriptor instead.
+// Deprecated: Use SociatyBFormationReq.ProtoReflect.Descriptor instead.
-func (*SociatyBSetFormationReq) Descriptor() ([]byte, []int) {
+func (*SociatyBFormationReq) Descriptor() ([]byte, []int) {
 	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{53}
 }
 
-func (x *SociatyBSetFormationReq) GetSociatyId() string {
+func (x *SociatyBFormationReq) GetSociatyId() string {
 	if x != nil {
 		return x.SociatyId
 	}
 	return ""
 }
 
-func (x *SociatyBSetFormationReq) GetTeams() map[int32]*ChallengeTeams {
+func (x *SociatyBFormationReq) GetTeams() map[int32]*ChallengeTeams {
 	if x != nil {
 		return x.Teams
 	}
 	return nil
 }
 
-type SociatyBSetFormationResp struct {
+type SociatyBFormationResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -2807,8 +2807,8 @@ type SociatyBSetFormationResp struct {
 	Uid       string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
 }
 
-func (x *SociatyBSetFormationResp) Reset() {
+func (x *SociatyBFormationResp) Reset() {
-	*x = SociatyBSetFormationResp{}
+	*x = SociatyBFormationResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_sociaty_sociaty_msg_proto_msgTypes[54]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2816,13 +2816,13 @@ func (x *SociatyBSetFormationResp) Reset() {
 	}
 }
 
-func (x *SociatyBSetFormationResp) String() string {
+func (x *SociatyBFormationResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*SociatyBSetFormationResp) ProtoMessage() {}
+func (*SociatyBFormationResp) ProtoMessage() {}
 
-func (x *SociatyBSetFormationResp) ProtoReflect() protoreflect.Message {
+func (x *SociatyBFormationResp) ProtoReflect() protoreflect.Message {
 	mi := &file_sociaty_sociaty_msg_proto_msgTypes[54]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -2834,19 +2834,113 @@ func (x *SociatyBSetFormationResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use SociatyBSetFormationResp.ProtoReflect.Descriptor instead.
+// Deprecated: Use SociatyBFormationResp.ProtoReflect.Descriptor instead.
-func (*SociatyBSetFormationResp) Descriptor() ([]byte, []int) {
+func (*SociatyBFormationResp) Descriptor() ([]byte, []int) {
 	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{54}
 }
 
-func (x *SociatyBSetFormationResp) GetSociatyId() string {
+func (x *SociatyBFormationResp) GetSociatyId() string {
 	if x != nil {
 		return x.SociatyId
 	}
 	return ""
 }
 
-func (x *SociatyBSetFormationResp) GetUid() string {
+func (x *SociatyBFormationResp) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+// 公会BOSS挑战
+type SociatyBChallengeReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *SociatyBChallengeReq) Reset() {
+	*x = SociatyBChallengeReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[55]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SociatyBChallengeReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SociatyBChallengeReq) ProtoMessage() {}
+
+func (x *SociatyBChallengeReq) ProtoReflect() protoreflect.Message {
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[55]
+	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 SociatyBChallengeReq.ProtoReflect.Descriptor instead.
+func (*SociatyBChallengeReq) Descriptor() ([]byte, []int) {
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{55}
+}
+
+type SociatyBChallengeResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SociatyId string `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"`
+	Uid       string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
+}
+
+func (x *SociatyBChallengeResp) Reset() {
+	*x = SociatyBChallengeResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[56]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SociatyBChallengeResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SociatyBChallengeResp) ProtoMessage() {}
+
+func (x *SociatyBChallengeResp) ProtoReflect() protoreflect.Message {
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[56]
+	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 SociatyBChallengeResp.ProtoReflect.Descriptor instead.
+func (*SociatyBChallengeResp) Descriptor() ([]byte, []int) {
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{56}
+}
+
+func (x *SociatyBChallengeResp) GetSociatyId() string {
+	if x != nil {
+		return x.SociatyId
+	}
+	return ""
+}
+
+func (x *SociatyBChallengeResp) GetUid() string {
 	if x != nil {
 		return x.Uid
 	}
@@ -2865,7 +2959,7 @@ type SociatyBFormationRecoReq struct {
 func (x *SociatyBFormationRecoReq) Reset() {
 	*x = SociatyBFormationRecoReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[55]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[57]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2878,7 +2972,7 @@ func (x *SociatyBFormationRecoReq) String() string {
 func (*SociatyBFormationRecoReq) ProtoMessage() {}
 
 func (x *SociatyBFormationRecoReq) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[55]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[57]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2891,7 +2985,7 @@ func (x *SociatyBFormationRecoReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyBFormationRecoReq.ProtoReflect.Descriptor instead.
 func (*SociatyBFormationRecoReq) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{55}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{57}
 }
 
 func (x *SociatyBFormationRecoReq) GetCate() int32 {
@@ -2912,7 +3006,7 @@ type SociatyBFormationRecoResp struct {
 func (x *SociatyBFormationRecoResp) Reset() {
 	*x = SociatyBFormationRecoResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[56]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[58]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2925,7 +3019,7 @@ func (x *SociatyBFormationRecoResp) String() string {
 func (*SociatyBFormationRecoResp) ProtoMessage() {}
 
 func (x *SociatyBFormationRecoResp) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[56]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[58]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2938,7 +3032,7 @@ func (x *SociatyBFormationRecoResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyBFormationRecoResp.ProtoReflect.Descriptor instead.
 func (*SociatyBFormationRecoResp) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{56}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{58}
 }
 
 func (x *SociatyBFormationRecoResp) GetTeams() map[int32]*ChallengeTeams {
@@ -2961,7 +3055,7 @@ type SociatyBReceiveReq struct {
 func (x *SociatyBReceiveReq) Reset() {
 	*x = SociatyBReceiveReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[57]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[59]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2974,7 +3068,7 @@ func (x *SociatyBReceiveReq) String() string {
 func (*SociatyBReceiveReq) ProtoMessage() {}
 
 func (x *SociatyBReceiveReq) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[57]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[59]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2987,7 +3081,7 @@ func (x *SociatyBReceiveReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyBReceiveReq.ProtoReflect.Descriptor instead.
 func (*SociatyBReceiveReq) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{57}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{59}
 }
 
 func (x *SociatyBReceiveReq) GetSociatyId() string {
@@ -3008,12 +3102,15 @@ type SociatyBReceiveResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	SociatyId string `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"`
+	TaskId    int32  `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
 }
 
 func (x *SociatyBReceiveResp) Reset() {
 	*x = SociatyBReceiveResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[58]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[60]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3026,7 +3123,7 @@ func (x *SociatyBReceiveResp) String() string {
 func (*SociatyBReceiveResp) ProtoMessage() {}
 
 func (x *SociatyBReceiveResp) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[58]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[60]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3039,7 +3136,21 @@ func (x *SociatyBReceiveResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyBReceiveResp.ProtoReflect.Descriptor instead.
 func (*SociatyBReceiveResp) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{58}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{60}
+}
+
+func (x *SociatyBReceiveResp) GetSociatyId() string {
+	if x != nil {
+		return x.SociatyId
+	}
+	return ""
+}
+
+func (x *SociatyBReceiveResp) GetTaskId() int32 {
+	if x != nil {
+		return x.TaskId
+	}
+	return 0
 }
 
 //公会BOSS 排名
@@ -3054,7 +3165,7 @@ type SociatyBRankReq struct {
 func (x *SociatyBRankReq) Reset() {
 	*x = SociatyBRankReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[59]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[61]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3067,7 +3178,7 @@ func (x *SociatyBRankReq) String() string {
 func (*SociatyBRankReq) ProtoMessage() {}
 
 func (x *SociatyBRankReq) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[59]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[61]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3080,7 +3191,7 @@ func (x *SociatyBRankReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyBRankReq.ProtoReflect.Descriptor instead.
 func (*SociatyBRankReq) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{59}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{61}
 }
 
 func (x *SociatyBRankReq) GetRankType() int32 {
@@ -3106,7 +3217,7 @@ type SociatyRankInfo struct {
 func (x *SociatyRankInfo) Reset() {
 	*x = SociatyRankInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[60]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[62]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3119,7 +3230,7 @@ func (x *SociatyRankInfo) String() string {
 func (*SociatyRankInfo) ProtoMessage() {}
 
 func (x *SociatyRankInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[60]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[62]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3132,7 +3243,7 @@ func (x *SociatyRankInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyRankInfo.ProtoReflect.Descriptor instead.
 func (*SociatyRankInfo) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{60}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{62}
 }
 
 func (x *SociatyRankInfo) GetName() string {
@@ -3188,7 +3299,7 @@ type SociatyBRankResp struct {
 func (x *SociatyBRankResp) Reset() {
 	*x = SociatyBRankResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_sociaty_sociaty_msg_proto_msgTypes[61]
+		mi := &file_sociaty_sociaty_msg_proto_msgTypes[63]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3201,7 +3312,7 @@ func (x *SociatyBRankResp) String() string {
 func (*SociatyBRankResp) ProtoMessage() {}
 
 func (x *SociatyBRankResp) ProtoReflect() protoreflect.Message {
-	mi := &file_sociaty_sociaty_msg_proto_msgTypes[61]
+	mi := &file_sociaty_sociaty_msg_proto_msgTypes[63]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3214,7 +3325,7 @@ func (x *SociatyBRankResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SociatyBRankResp.ProtoReflect.Descriptor instead.
 func (*SociatyBRankResp) Descriptor() ([]byte, []int) {
-	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{61}
+	return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{63}
 }
 
 func (x *SociatyBRankResp) GetRank() []*SociatyRankInfo {
@@ -3431,65 +3542,74 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
 	0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
 	0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x79, 0x49, 0x64, 0x22, 0xbd, 0x01, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
+	0x74, 0x79, 0x49, 0x64, 0x22, 0xb7, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x42, 0x53, 0x65, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+	0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
-	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x39,
+	0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x36, 0x0a, 0x05, 0x74,
-	0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e,
+	0x65, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x53, 0x6f, 0x63,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x53, 0x65, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61,
+	0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74,
+	0x71, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65,
-	0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x49, 0x0a, 0x0a, 0x54, 0x65, 0x61,
+	0x61, 0x6d, 0x73, 0x1a, 0x49, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c,
+	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65,
-	0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x61, 0x6d, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x18, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
+	0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x53, 0x65, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
-	0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20,
+	0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x22, 0x2e, 0x0a, 0x18, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d,
+	0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x22,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
+	0x47, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c,
-	0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65,
+	0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69,
-	0x22, 0xa3, 0x01, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72,
+	0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63,
-	0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3b,
+	0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20,
-	0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x2e, 0x0a, 0x18, 0x53, 0x6f, 0x63, 0x69,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
+	0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x63,
-	0x6e, 0x52, 0x65, 0x63, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45,
+	0x6f, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x49, 0x0a, 0x0a, 0x54,
+	0x28, 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65, 0x22, 0xa3, 0x01, 0x0a, 0x19, 0x53, 0x6f, 0x63,
-	0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76,
+	0x63, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3b, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x68, 0x61,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42,
-	0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x52, 0x65, 0x73,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x74, 0x65,
-	0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09,
+	0x61, 0x6d, 0x73, 0x1a, 0x49, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
+	0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
+	0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x54, 0x65,
-	0x49, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65,
+	0x61, 0x6d, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a,
-	0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2d, 0x0a, 0x0f, 0x53, 0x6f, 0x63,
+	0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
-	0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
+	0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49,
-	0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0f, 0x53, 0x6f, 0x63,
+	0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04,
+	0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4b, 0x0a, 0x13, 0x53, 0x6f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73,
-	0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01,
-	0x68, 0x65, 0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12,
-	0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e,
+	0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61,
+	0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e,
+	0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61,
-	0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67,
+	0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x61,
-	0x12, 0x1a, 0x0a, 0x08, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01,
+	0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61,
-	0x28, 0x03, 0x52, 0x08, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x22, 0x38, 0x0a, 0x10,
+	0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70,
+	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12,
-	0x12, 0x24, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10,
+	0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x65,
-	0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f,
+	0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74,
+	0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d,
-	0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79,
-	0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18,
-	0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08,
+	0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1a,
-	0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x0a, 0x08, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x08, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x22, 0x38, 0x0a, 0x10, 0x53, 0x6f,
+	0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x24,
+	0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x53,
+	0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
+	0x72, 0x61, 0x6e, 0x6b, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c,
+	0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c,
+	0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12, 0x0b, 0x0a,
+	0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x50,
+	0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -3505,7 +3625,7 @@ func file_sociaty_sociaty_msg_proto_rawDescGZIP() []byte {
 }
 
 var file_sociaty_sociaty_msg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 65)
+var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 67)
 var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
 	(SociatyListFilter)(0),             // 0: SociatyListFilter
 	(*SociatyCreateReq)(nil),           // 1: SociatyCreateReq
@@ -3561,48 +3681,50 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
 	(*SociatyRankResp)(nil),            // 51: SociatyRankResp
 	(*SociatyPDismissPush)(nil),        // 52: SociatyPDismissPush
 	(*SociatyPAgreePush)(nil),          // 53: SociatyPAgreePush
-	(*SociatyBSetFormationReq)(nil),    // 54: SociatyBSetFormationReq
+	(*SociatyBFormationReq)(nil),       // 54: SociatyBFormationReq
-	(*SociatyBSetFormationResp)(nil),   // 55: SociatyBSetFormationResp
+	(*SociatyBFormationResp)(nil),      // 55: SociatyBFormationResp
-	(*SociatyBFormationRecoReq)(nil),   // 56: SociatyBFormationRecoReq
+	(*SociatyBChallengeReq)(nil),       // 56: SociatyBChallengeReq
-	(*SociatyBFormationRecoResp)(nil),  // 57: SociatyBFormationRecoResp
+	(*SociatyBChallengeResp)(nil),      // 57: SociatyBChallengeResp
-	(*SociatyBReceiveReq)(nil),         // 58: SociatyBReceiveReq
+	(*SociatyBFormationRecoReq)(nil),   // 58: SociatyBFormationRecoReq
-	(*SociatyBReceiveResp)(nil),        // 59: SociatyBReceiveResp
+	(*SociatyBFormationRecoResp)(nil),  // 59: SociatyBFormationRecoResp
-	(*SociatyBRankReq)(nil),            // 60: SociatyBRankReq
+	(*SociatyBReceiveReq)(nil),         // 60: SociatyBReceiveReq
-	(*SociatyRankInfo)(nil),            // 61: SociatyRankInfo
+	(*SociatyBReceiveResp)(nil),        // 61: SociatyBReceiveResp
-	(*SociatyBRankResp)(nil),           // 62: SociatyBRankResp
+	(*SociatyBRankReq)(nil),            // 62: SociatyBRankReq
-	nil,                                // 63: SociatyMineResp.TeamsEntry
+	(*SociatyRankInfo)(nil),            // 63: SociatyRankInfo
-	nil,                                // 64: SociatyBSetFormationReq.TeamsEntry
+	(*SociatyBRankResp)(nil),           // 64: SociatyBRankResp
-	nil,                                // 65: SociatyBFormationRecoResp.TeamsEntry
+	nil,                                // 65: SociatyMineResp.TeamsEntry
-	(*DBSociaty)(nil),                  // 66: DBSociaty
+	nil,                                // 66: SociatyBFormationReq.TeamsEntry
-	(SociatyJob)(0),                    // 67: SociatyJob
+	nil,                                // 67: SociatyBFormationRecoResp.TeamsEntry
-	(*DBSociatyLog)(nil),               // 68: DBSociatyLog
+	(*DBSociaty)(nil),                  // 68: DBSociaty
-	(*SociatyTask)(nil),                // 69: SociatyTask
+	(SociatyJob)(0),                    // 69: SociatyJob
-	(*SociatyActivity)(nil),            // 70: SociatyActivity
+	(*DBSociatyLog)(nil),               // 70: DBSociatyLog
-	(*DBSociatyRank)(nil),              // 71: DBSociatyRank
+	(*SociatyTask)(nil),                // 71: SociatyTask
-	(*ChallengeTeams)(nil),             // 72: ChallengeTeams
+	(*SociatyActivity)(nil),            // 72: SociatyActivity
+	(*DBSociatyRank)(nil),              // 73: DBSociatyRank
+	(*ChallengeTeams)(nil),             // 74: ChallengeTeams
 }
 var file_sociaty_sociaty_msg_proto_depIdxs = []int32{
 	0,  // 0: SociatyListReq.filter:type_name -> SociatyListFilter
-	66, // 1: SociatyListResp.list:type_name -> DBSociaty
+	68, // 1: SociatyListResp.list:type_name -> DBSociaty
-	66, // 2: SociatySearchResp.list:type_name -> DBSociaty
+	68, // 2: SociatySearchResp.list:type_name -> DBSociaty
-	66, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty
+	68, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty
 	11, // 4: SociatyMineResp.master:type_name -> SociatyMemberInfo
-	63, // 5: SociatyMineResp.teams:type_name -> SociatyMineResp.TeamsEntry
+	65, // 5: SociatyMineResp.teams:type_name -> SociatyMineResp.TeamsEntry
-	67, // 6: SociatyMemberInfo.job:type_name -> SociatyJob
+	69, // 6: SociatyMemberInfo.job:type_name -> SociatyJob
 	11, // 7: SociatyApplyListResp.list:type_name -> SociatyMemberInfo
 	11, // 8: SociatyMembersResp.list:type_name -> SociatyMemberInfo
-	67, // 9: SociatySettingJobReq.job:type_name -> SociatyJob
+	69, // 9: SociatySettingJobReq.job:type_name -> SociatyJob
-	67, // 10: SociatySettingJobResp.job:type_name -> SociatyJob
+	69, // 10: SociatySettingJobResp.job:type_name -> SociatyJob
-	68, // 11: SociatyLogResp.log:type_name -> DBSociatyLog
+	70, // 11: SociatyLogResp.log:type_name -> DBSociatyLog
-	69, // 12: SociatyTaskListResp.list:type_name -> SociatyTask
+	71, // 12: SociatyTaskListResp.list:type_name -> SociatyTask
-	70, // 13: SociatyActivityListResp.list:type_name -> SociatyActivity
+	72, // 13: SociatyActivityListResp.list:type_name -> SociatyActivity
-	71, // 14: SociatyRankResp.rank:type_name -> DBSociatyRank
+	73, // 14: SociatyRankResp.rank:type_name -> DBSociatyRank
-	64, // 15: SociatyBSetFormationReq.teams:type_name -> SociatyBSetFormationReq.TeamsEntry
+	66, // 15: SociatyBFormationReq.teams:type_name -> SociatyBFormationReq.TeamsEntry
-	65, // 16: SociatyBFormationRecoResp.teams:type_name -> SociatyBFormationRecoResp.TeamsEntry
+	67, // 16: SociatyBFormationRecoResp.teams:type_name -> SociatyBFormationRecoResp.TeamsEntry
-	61, // 17: SociatyBRankResp.rank:type_name -> SociatyRankInfo
+	63, // 17: SociatyBRankResp.rank:type_name -> SociatyRankInfo
-	72, // 18: SociatyMineResp.TeamsEntry.value:type_name -> ChallengeTeams
+	74, // 18: SociatyMineResp.TeamsEntry.value:type_name -> ChallengeTeams
-	72, // 19: SociatyBSetFormationReq.TeamsEntry.value:type_name -> ChallengeTeams
+	74, // 19: SociatyBFormationReq.TeamsEntry.value:type_name -> ChallengeTeams
-	72, // 20: SociatyBFormationRecoResp.TeamsEntry.value:type_name -> ChallengeTeams
+	74, // 20: SociatyBFormationRecoResp.TeamsEntry.value:type_name -> ChallengeTeams
 	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
@@ -4254,7 +4376,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBSetFormationReq); i {
+			switch v := v.(*SociatyBFormationReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4266,7 +4388,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBSetFormationResp); i {
+			switch v := v.(*SociatyBFormationResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4278,7 +4400,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBFormationRecoReq); i {
+			switch v := v.(*SociatyBChallengeReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4290,7 +4412,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBFormationRecoResp); i {
+			switch v := v.(*SociatyBChallengeResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4302,7 +4424,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBReceiveReq); i {
+			switch v := v.(*SociatyBFormationRecoReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4314,7 +4436,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBReceiveResp); i {
+			switch v := v.(*SociatyBFormationRecoResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4326,7 +4448,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyBRankReq); i {
+			switch v := v.(*SociatyBReceiveReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4338,7 +4460,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SociatyRankInfo); i {
+			switch v := v.(*SociatyBReceiveResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4350,6 +4472,30 @@ func file_sociaty_sociaty_msg_proto_init() {
 			}
 		}
 		file_sociaty_sociaty_msg_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SociatyBRankReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_sociaty_sociaty_msg_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SociatyRankInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_sociaty_sociaty_msg_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SociatyBRankResp); i {
 			case 0:
 				return &v.state
@@ -4368,7 +4514,7 @@ func file_sociaty_sociaty_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_sociaty_sociaty_msg_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   65,
+			NumMessages:   67,
 			NumExtensions: 0,
 			NumServices:   0,
 		},