diff --git a/modules/sociaty/api.go b/modules/sociaty/api.go index 63ec80db0..e32713789 100644 --- a/modules/sociaty/api.go +++ b/modules/sociaty/api.go @@ -42,6 +42,7 @@ const ( SociatySubTypeBuy = "buy" SociatySubTypeBuynum = "buynum" SociatySubTypeBreceive = "breceive" + SociatySubTypeRecommend = "recommend" ) type apiComp struct { diff --git a/modules/sociaty/api_cross_breceive.go b/modules/sociaty/api_cross_breceive.go index c1986a064..4a59f3d43 100644 --- a/modules/sociaty/api_cross_breceive.go +++ b/modules/sociaty/api_cross_breceive.go @@ -46,13 +46,29 @@ func (this *apiComp) Breceive(session comm.IUserSession, req *pb.SociatyBReceive } else if taskId == 0 { //未完成 code = pb.ErrorCode_SociatyTaskNoFinished return + } else if taskId == 1 { //可领取 + task.Status = 2 } break } } - //更新任务状态 - + //更新任务状态 + update := map[string]interface{}{ + "tasks": dbr.Tasks, + } + if err := this.module.modelSociatyBoss.Change(uid, update); err != nil { + code = pb.ErrorCode_DBError + return + } + + // 奖励 + if code := this.module.DispenseRes(session, taskConf.Reward, true); code != pb.ErrorCode_Success { + this.module.Error("积分任务奖励领取", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "taskId", Value: taskId}, + log.Field{Key: "reward", Value: taskConf.Reward}) + } rsp := &pb.SociatyBReceiveResp{ SociatyId: sociaty.Id, diff --git a/modules/sociaty/api_cross_recommend.go b/modules/sociaty/api_cross_recommend.go new file mode 100644 index 000000000..2dc382594 --- /dev/null +++ b/modules/sociaty/api_cross_recommend.go @@ -0,0 +1,29 @@ +package sociaty + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +// 公会BOSS 推荐 +func (this *apiComp) RecommendCheck(session comm.IUserSession, req *pb.SociatyRecommendReq) (code pb.ErrorCode) { + if req.Cate != 1 || req.Cate != 2 { + code = pb.ErrorCode_ReqParameterError + } + return +} + +func (this *apiComp) Recommend(session comm.IUserSession, req *pb.SociatyRecommendReq) (code pb.ErrorCode, data proto.Message) { + if code = this.RecommendCheck(session, req); code != pb.ErrorCode_Success { + return + } + + rsp := &pb.SociatyRecommendResp{} + + if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeRecommend, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/modules/sociaty/config.go b/modules/sociaty/config.go index f8556e665..85add7e4f 100644 --- a/modules/sociaty/config.go +++ b/modules/sociaty/config.go @@ -134,3 +134,17 @@ func (this *configureComp) getBossTask(taskId int32) *cfg.GameGuildBossTaskData } return nil } + +// 积分任务列表 +func (this *configureComp) getBossTaskList() []*cfg.GameGuildBossTaskData { + if v, err := this.GetConfigure(gameSociatyBossTask); err != nil { + return nil + } else { + data, ok := v.(*cfg.GameGuildBossTask) + if !ok { + err = fmt.Errorf("%T no is *cfg.GameGuildActivity", v) + return nil + } + return data.GetDataList() + } +} diff --git a/modules/sociaty/model_sociatyboss.go b/modules/sociaty/model_sociatyboss.go index 953d92de1..473863c47 100644 --- a/modules/sociaty/model_sociatyboss.go +++ b/modules/sociaty/model_sociatyboss.go @@ -457,6 +457,7 @@ func (s *ModelSociatyBoss) reset() error { for _, v := range record { update := map[string]interface{}{ "status": 1, //归档 + "tasks": []*pb.ChallengeTask{}, } if err := s.Change(BOSS_SPORTS, update); err != nil { s.moduleSociaty.Error("归档玩家赛事记录", log.Field{Key: "uid", Value: v.Uid}, log.Field{Key: "err", Value: err.Error()}) @@ -508,13 +509,40 @@ func (s *ModelSociatyBoss) settlement() error { } } - // 更新玩家赛季信息 + // 更新玩家赛季历史记录 + isExist := func(tasks []*pb.ChallengeTask, taskId int32) bool { + for _, task := range tasks { + if task.TaskId == taskId { + return true + } + } + return false + } + // 判断积分任务是否达标 + var tasks []*pb.ChallengeTask + var taskFlag bool //任务更新状态 + taskList := s.moduleSociaty.configure.getBossTaskList() + for _, task := range taskList { + if total >= int64(task.Score) && !isExist(cr.Tasks, task.Id) { + tasks = append(tasks, &pb.ChallengeTask{ + TaskId: task.Id, + Status: 1, //可领取 + }) + taskFlag = true + } + } + cr.Total = total cr.Integrals = highScore update := map[string]interface{}{ "total": total, "integrals": highScore, } + + // 任务状态有变化时更新 + if taskFlag { + update["tasks"] = tasks + } if err := s.Change(uid, update); err != nil { s.moduleSociaty.Error("更新玩家赛事信息", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) continue diff --git a/pb/sociaty_msg.pb.go b/pb/sociaty_msg.pb.go index 418c8804e..9b9627083 100644 --- a/pb/sociaty_msg.pb.go +++ b/pb/sociaty_msg.pb.go @@ -3193,7 +3193,7 @@ func (x *SociatyBChallengeFinishResp) GetIntegral() int64 { } // 公会BOSS 阵容推荐 -type SociatyBFormationRecoReq struct { +type SociatyRecommendReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -3201,8 +3201,8 @@ type SociatyBFormationRecoReq struct { Cate int32 `protobuf:"varint,1,opt,name=cate,proto3" json:"cate"` // 1全服排行 2好友排行 } -func (x *SociatyBFormationRecoReq) Reset() { - *x = SociatyBFormationRecoReq{} +func (x *SociatyRecommendReq) Reset() { + *x = SociatyRecommendReq{} if protoimpl.UnsafeEnabled { mi := &file_sociaty_sociaty_msg_proto_msgTypes[61] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -3210,13 +3210,13 @@ func (x *SociatyBFormationRecoReq) Reset() { } } -func (x *SociatyBFormationRecoReq) String() string { +func (x *SociatyRecommendReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*SociatyBFormationRecoReq) ProtoMessage() {} +func (*SociatyRecommendReq) ProtoMessage() {} -func (x *SociatyBFormationRecoReq) ProtoReflect() protoreflect.Message { +func (x *SociatyRecommendReq) ProtoReflect() protoreflect.Message { mi := &file_sociaty_sociaty_msg_proto_msgTypes[61] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -3228,19 +3228,19 @@ func (x *SociatyBFormationRecoReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use SociatyBFormationRecoReq.ProtoReflect.Descriptor instead. -func (*SociatyBFormationRecoReq) Descriptor() ([]byte, []int) { +// Deprecated: Use SociatyRecommendReq.ProtoReflect.Descriptor instead. +func (*SociatyRecommendReq) Descriptor() ([]byte, []int) { return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{61} } -func (x *SociatyBFormationRecoReq) GetCate() int32 { +func (x *SociatyRecommendReq) GetCate() int32 { if x != nil { return x.Cate } return 0 } -type SociatyBFormationRecoResp struct { +type SociatyRecommendResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -3248,8 +3248,8 @@ type SociatyBFormationRecoResp struct { Teams map[int32]*ChallengeTeam `protobuf:"bytes,1,rep,name=teams,proto3" json:"teams" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } -func (x *SociatyBFormationRecoResp) Reset() { - *x = SociatyBFormationRecoResp{} +func (x *SociatyRecommendResp) Reset() { + *x = SociatyRecommendResp{} if protoimpl.UnsafeEnabled { mi := &file_sociaty_sociaty_msg_proto_msgTypes[62] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -3257,13 +3257,13 @@ func (x *SociatyBFormationRecoResp) Reset() { } } -func (x *SociatyBFormationRecoResp) String() string { +func (x *SociatyRecommendResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*SociatyBFormationRecoResp) ProtoMessage() {} +func (*SociatyRecommendResp) ProtoMessage() {} -func (x *SociatyBFormationRecoResp) ProtoReflect() protoreflect.Message { +func (x *SociatyRecommendResp) ProtoReflect() protoreflect.Message { mi := &file_sociaty_sociaty_msg_proto_msgTypes[62] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -3275,12 +3275,12 @@ func (x *SociatyBFormationRecoResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use SociatyBFormationRecoResp.ProtoReflect.Descriptor instead. -func (*SociatyBFormationRecoResp) Descriptor() ([]byte, []int) { +// Deprecated: Use SociatyRecommendResp.ProtoReflect.Descriptor instead. +func (*SociatyRecommendResp) Descriptor() ([]byte, []int) { return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{62} } -func (x *SociatyBFormationRecoResp) GetTeams() map[int32]*ChallengeTeam { +func (x *SociatyRecommendResp) GetTeams() map[int32]*ChallengeTeam { if x != nil { return x.Teams } @@ -3937,57 +3937,56 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{ 0x74, 0x22, 0x39, 0x0a, 0x1b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x2e, 0x0a, 0x18, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x74, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65, 0x22, 0xa2, 0x01, 0x0a, - 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3b, 0x0a, 0x05, 0x74, 0x65, - 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x42, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x63, - 0x6f, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, - 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, - 0x4b, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, - 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12, - 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, 0x6e, - 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x61, 0x6e, 0x6b, - 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 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, 0x22, 0x46, 0x0a, 0x0d, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, - 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, - 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, - 0x6d, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 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, + 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x29, 0x0a, 0x13, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, + 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x63, 0x61, 0x74, 0x65, 0x22, 0x98, 0x01, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x36, 0x0a, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x20, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x54, 0x65, 0x61, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x05, 0x74, 0x65, 0x61, 0x6d, 0x73, 0x1a, 0x48, 0x0a, 0x0a, 0x54, 0x65, 0x61, 0x6d, + 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, + 0x6e, 0x67, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x22, 0x4b, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, + 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, + 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x72, 0x61, 0x6e, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, + 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x61, + 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x72, 0x61, 0x6e, + 0x6b, 0x69, 0x6e, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 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, 0x22, 0x46, 0x0a, 0x0d, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1d, 0x0a, 0x03, 0x61, + 0x74, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, + 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, + 0x75, 0x6d, 0x22, 0x22, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x75, 0x79, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 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 ( @@ -4067,8 +4066,8 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{ (*SociatyBChallengeStartResp)(nil), // 59: SociatyBChallengeStartResp (*SociatyBChallengeFinishReq)(nil), // 60: SociatyBChallengeFinishReq (*SociatyBChallengeFinishResp)(nil), // 61: SociatyBChallengeFinishResp - (*SociatyBFormationRecoReq)(nil), // 62: SociatyBFormationRecoReq - (*SociatyBFormationRecoResp)(nil), // 63: SociatyBFormationRecoResp + (*SociatyRecommendReq)(nil), // 62: SociatyRecommendReq + (*SociatyRecommendResp)(nil), // 63: SociatyRecommendResp (*SociatyBReceiveReq)(nil), // 64: SociatyBReceiveReq (*SociatyBReceiveResp)(nil), // 65: SociatyBReceiveResp (*SociatyBRankReq)(nil), // 66: SociatyBRankReq @@ -4078,7 +4077,7 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{ (*SociatyBuyResp)(nil), // 70: SociatyBuyResp nil, // 71: SociatyBMainResp.TeamsEntry nil, // 72: SociatyBFormationReq.TeamsEntry - nil, // 73: SociatyBFormationRecoResp.TeamsEntry + nil, // 73: SociatyRecommendResp.TeamsEntry (*DBSociaty)(nil), // 74: DBSociaty (SociatyJob)(0), // 75: SociatyJob (*DBSociatyLog)(nil), // 76: DBSociatyLog @@ -4109,12 +4108,12 @@ var file_sociaty_sociaty_msg_proto_depIdxs = []int32{ 72, // 15: SociatyBFormationReq.teams:type_name -> SociatyBFormationReq.TeamsEntry 80, // 16: SociatyBChallengeFinishReq.ptype:type_name -> PlayType 81, // 17: SociatyBChallengeFinishReq.report:type_name -> BattleReport - 73, // 18: SociatyBFormationRecoResp.teams:type_name -> SociatyBFormationRecoResp.TeamsEntry + 73, // 18: SociatyRecommendResp.teams:type_name -> SociatyRecommendResp.TeamsEntry 67, // 19: SociatyBRankResp.rank:type_name -> SociatyRankInfo 82, // 20: SociatyBuyReq.atn:type_name -> UserAssets 83, // 21: SociatyBMainResp.TeamsEntry.value:type_name -> ChallengeTeam 83, // 22: SociatyBFormationReq.TeamsEntry.value:type_name -> ChallengeTeam - 83, // 23: SociatyBFormationRecoResp.TeamsEntry.value:type_name -> ChallengeTeam + 83, // 23: SociatyRecommendResp.TeamsEntry.value:type_name -> ChallengeTeam 24, // [24:24] is the sub-list for method output_type 24, // [24:24] is the sub-list for method input_type 24, // [24:24] is the sub-list for extension type_name @@ -4865,7 +4864,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyBFormationRecoReq); i { + switch v := v.(*SociatyRecommendReq); i { case 0: return &v.state case 1: @@ -4877,7 +4876,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyBFormationRecoResp); i { + switch v := v.(*SociatyRecommendResp); i { case 0: return &v.state case 1: