liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

助战排行榜

Browse Source
This commit is contained in:
wh_zcy 2022-10-21 17:34:08 +08:00
parent 1c556e3e21
commit c9b1b99d64
12 changed files with 185 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/json/game_msgdistrib.json
View File

@ -13,32 +13,32 @@
},
{
"msgid": "chat",
"routrules": "~/worker",
"open": true,
"routrules": "~/worker",
"describe": "聊天系统"
},
{
"msgid": "chat.chanagechannel",
"routrules": "~/worker",
"open": true,
"routrules": "~/worker",
"describe": "聊天系统"
},
{
"msgid": "chat.crosschannel",
"routrules": "~/worker",
"open": true,
"routrules": "~/worker",
"describe": "聊天系统"
},
{
"msgid": "chat.getcrosslist",
"routrules": "~/worker",
"open": true,
"routrules": "~/worker",
"describe": "聊天系统"
},
{
"msgid": "chat.sendcross",
"routrules": "~/worker",
"open": true,
"routrules": "~/worker",
"describe": "聊天系统"
},
{
@ -154,5 +154,11 @@
"open": true,
"routrules": "~/worker",
"describe": "好友推荐"
},
{
"msgid": "friend.assistherolist",
"open": true,
"routrules": "~/worker",
"describe": "好友助战英雄列表"
}
]

4
cmd/v2/FyneApp.toml
View File

@ -4,5 +4,5 @@ Website = "http://legu.cc"
Icon = "app.png"
Name = "RobotGUI"
ID = "cc.legu.app"
Version = "1.0.17"
Build = 20
Version = "1.0.18"
Build = 21

6
cmd/v2/ui/views/hero_info.go
View File

@ -4,6 +4,7 @@ import (
"go_dreamfactory/cmd/v2/model"
"go_dreamfactory/cmd/v2/service"
"go_dreamfactory/pb"
"strings"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget"
@ -19,18 +20,19 @@ func (this *HeroInfoView) CreateView(t *model.TestCase) fyne.CanvasObject {
uidEntry.PlaceHolder = "玩家ID"
heroIdEntry := widget.NewEntry()
heroIdEntry.PlaceHolder = "英雄ObjID"
heroIdEntry.PlaceHolder = "英雄ObjID,多个用逗号分隔"
this.form.AppendItem(widget.NewFormItem("UID", uidEntry))
this.form.AppendItem(widget.NewFormItem("HeroObjID", heroIdEntry))
heroIds := strings.Split(heroIdEntry.Text, ",")
this.form.OnSubmit = func() {
if err := service.GetPttService().SendToClient(
t.MainType,
t.SubType,
&pb.HeroInfoReq{
Uid: uidEntry.Text,
HeroId: heroIdEntry.Text,
HeroId: heroIds,
},
); err != nil {
logrus.Error(err)

1
modules/friend/api.go
View File

@ -40,6 +40,7 @@ func (this *apiComp) Init(service core.IService, module core.IModule, comp core.
func (this *apiComp) setDefaultFriendUserBaseInfo(userId string) *pb.FriendBase {
if user, err := this.moduleFriend.ModuleUser.GetRmoteUser(userId); err != nil {
this.moduleFriend.Errorf("GetRmoteUser err:%v", err)
return nil
} else {
if user != nil {

5
modules/friend/api_cross_assisthero.go
View File

@ -68,13 +68,14 @@ func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssisth
// 有好友时再推送
if len(self.FriendIds) > 0 {
//把设置的助战英雄推送给好友
push := &pb.FriendAssistHeroListPush{
push := &pb.FriendAssistHeroUpdatePush{
Friend: &pb.FriendBase{
UserId: self.Uid,
HeroObjId: req.HeroObjId,
},
}
if err := this.moduleFriend.SendMsgToUsers(string(this.moduleFriend.GetType()), "assistherolist", push, self.FriendIds...); err != nil {
if err := this.moduleFriend.SendMsgToUsers(string(this.moduleFriend.GetType()), "assistheroupdate", push, self.FriendIds...); err != nil {
this.moduleFriend.Errorf("push AssistHeroList err:", err)
}
}

1
modules/friend/api_cross_assistherolist.go
View File

@ -27,6 +27,7 @@ func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAss
f := this.moduleFriend.modelFriend.GetFriend(v)
rsp.Friends = append(rsp.Friends, &pb.FriendBase{
UserId: v,
HeroObjId: f.AssistHeroId,
})
}

16
modules/friend/api_cross_assistlist.go
View File

@ -3,6 +3,7 @@ package friend
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
"go_dreamfactory/utils"
"sort"
"google.golang.org/protobuf/proto"
@ -29,14 +30,20 @@ func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistl
if target == nil {
continue
}
if target.AssistHeroId != "" {
base.HeroObjId = target.AssistHeroId
base.Score = target.ZhuzhanScore
base.Score = target.AssistScore
base.UpdateTime = target.UpdateTime
list = append(list, base)
}
}
}
//排序并取前三
sort.Slice(list, func(i, j int) bool {
if list[i].Score == list[j].Score {
return list[i].UpdateTime < list[j].UpdateTime
}
return list[i].Score < list[j].Score
})
@ -47,8 +54,13 @@ func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistl
}
}
//助战记录一周清空
if utils.IsAfterWeek(self.UpdateTime) {
self.Record = []*pb.AssistRecord{}
}
rsp := &pb.FriendAssistlistResp{
List: list,
List: firstThree,
HeroObjId: self.AssistHeroId,
Record: self.Record,
}

14
modules/friend/module.go
View File

@ -90,11 +90,12 @@ func (this *Friend) GetFriendList(uid string) (uids []string) {
}
func (this *Friend) RpcUseAssisHero(ctx context.Context, req *pb.RPCGeneralReqA2, reply *pb.DBHero) error {
this.Debug("Rpc_ModuleFriendUseAssitHero", log.Field{Key: "req", Value: req})
hero, err := this.UseAssistHero(req.Param1, req.Param2)
if err != nil {
return err
}
reply = hero
*reply = *hero
return nil
}
@ -113,23 +114,24 @@ func (this *Friend) UseAssistHero(uid, friendId string) (*pb.DBHero, error) {
//遍历助战记录
for _, r := range friend.Record {
if r.AssistHeroId == friend.AssistHeroId {
if utils.IsToday(r.Zhuzhantime) {
if utils.IsToday(r.AssistTime) {
log.Warnf("今日已助战 uid:%v friendId:%v heroId:%v", uid, friendId, r.AssistHeroId)
return nil, errors.New("今日已助战")
}
}
}
//更新助战记录和助战分数
friend.ZhuzhanScore++
friend.AssistScore++
// 设置助战记录
friend.Record = append(friend.Record, &pb.ZhuZhanRecord{
friend.Record = append(friend.Record, &pb.AssistRecord{
Uid: uid,
AssistHeroId: friend.AssistHeroId,
Zhuzhantime: time.Now().Unix(),
AssistTime: time.Now().Unix(),
})
update := map[string]interface{}{
"zhuzhanScore": friend.ZhuzhanScore,
"assistScore": friend.AssistScore,
"record": friend.Record,
"updateTime": time.Now().Unix(),
}
return friend.Hero, this.modelFriend.Change(friendId, update)
}

1
modules/timer/module.go
View File

@ -62,7 +62,6 @@ func (this *Timer) OnInstallComp() {
this.rank3 = this.RegisterComp(new(HuntingRank)).(*HuntingRank)
this.chat = this.RegisterComp(new(ChatComp)).(*ChatComp)
this.season = this.RegisterComp(new(SeasonPagoda)).(*SeasonPagoda)
}
//日志

1
modules/user/module.go
View File

@ -356,7 +356,6 @@ func (this *User) getUserFromRemoteDb(uid string, rsp *pb.DBUser) error {
}
conn, err := db.ServerDBConn(sid)
if err != nil {
log.Errorf("cross db err: %v", err)
return err
}
model := db.NewDBModel(comm.TableUser, 0, conn)

70
pb/friend_db.pb.go
View File

@ -35,8 +35,8 @@ type DBFriend struct {
Received int32 `protobuf:"varint,8,opt,name=received,proto3" json:"received" bson:"received"` //领取奖励状态0未领1可领2已领
UpdateTime int64 `protobuf:"varint,9,opt,name=updateTime,proto3" json:"updateTime" bson:"updateTime"` // 更新时间
Hero *DBHero `protobuf:"bytes,10,opt,name=hero,proto3" json:"hero" bson:"hero"` //助战英雄副本
ZhuzhanScore int32 `protobuf:"varint,11,opt,name=zhuzhanScore,proto3" json:"zhuzhanScore" bson:"zhuzhanScore"` //助战分数合计
Record []*ZhuZhanRecord `protobuf:"bytes,12,rep,name=record,proto3" json:"record" bson:"record"` // 助战记录
AssistScore int32 `protobuf:"varint,11,opt,name=assistScore,proto3" json:"assistScore" bson:"zhuzhanScore"` //助战分数合计
Record []*AssistRecord `protobuf:"bytes,12,rep,name=record,proto3" json:"record" bson:"record"` // 助战记录
}
func (x *DBFriend) Reset() {
@ -141,14 +141,14 @@ func (x *DBFriend) GetHero() *DBHero {
return nil
}
func (x *DBFriend) GetZhuzhanScore() int32 {
func (x *DBFriend) GetAssistScore() int32 {
if x != nil {
return x.ZhuzhanScore
return x.AssistScore
}
return 0
}
func (x *DBFriend) GetRecord() []*ZhuZhanRecord {
func (x *DBFriend) GetRecord() []*AssistRecord {
if x != nil {
return x.Record
}
@ -156,18 +156,18 @@ func (x *DBFriend) GetRecord() []*ZhuZhanRecord {
}
//助战记录
type ZhuZhanRecord struct {
type AssistRecord struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //好友Id
Zhuzhantime int64 `protobuf:"varint,2,opt,name=zhuzhantime,proto3" json:"zhuzhantime" bson:"zhuzhanTime"` //上次助战时间
AssistTime int64 `protobuf:"varint,2,opt,name=assistTime,proto3" json:"assistTime" bson:"zhuzhanTime"` //上次助战时间
AssistHeroId string `protobuf:"bytes,3,opt,name=assistHeroId,proto3" json:"assistHeroId" bson:"assistHeroId"` //助战英雄
}
func (x *ZhuZhanRecord) Reset() {
*x = ZhuZhanRecord{}
func (x *AssistRecord) Reset() {
*x = AssistRecord{}
if protoimpl.UnsafeEnabled {
mi := &file_friend_friend_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -175,13 +175,13 @@ func (x *ZhuZhanRecord) Reset() {
}
}
func (x *ZhuZhanRecord) String() string {
func (x *AssistRecord) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ZhuZhanRecord) ProtoMessage() {}
func (*AssistRecord) ProtoMessage() {}
func (x *ZhuZhanRecord) ProtoReflect() protoreflect.Message {
func (x *AssistRecord) ProtoReflect() protoreflect.Message {
mi := &file_friend_friend_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -193,26 +193,26 @@ func (x *ZhuZhanRecord) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use ZhuZhanRecord.ProtoReflect.Descriptor instead.
func (*ZhuZhanRecord) Descriptor() ([]byte, []int) {
// Deprecated: Use AssistRecord.ProtoReflect.Descriptor instead.
func (*AssistRecord) Descriptor() ([]byte, []int) {
return file_friend_friend_db_proto_rawDescGZIP(), []int{1}
}
func (x *ZhuZhanRecord) GetUid() string {
func (x *AssistRecord) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
func (x *ZhuZhanRecord) GetZhuzhantime() int64 {
func (x *AssistRecord) GetAssistTime() int64 {
if x != nil {
return x.Zhuzhantime
return x.AssistTime
}
return 0
}
func (x *ZhuZhanRecord) GetAssistHeroId() string {
func (x *AssistRecord) GetAssistHeroId() string {
if x != nil {
return x.AssistHeroId
}
@ -224,7 +224,7 @@ var File_friend_friend_db_proto protoreflect.FileDescriptor
var file_friend_friend_db_proto_rawDesc = []byte{
0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68,
0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf3, 0x02, 0x0a,
0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf0, 0x02, 0x0a,
0x08, 0x44, 0x42, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
@ -243,19 +243,19 @@ var file_friend_friend_db_proto_rawDesc = []byte{
0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75,
0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72,
0x6f, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x22, 0x0a, 0x0c, 0x7a, 0x68, 0x75, 0x7a, 0x68, 0x61,
0x6e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x7a, 0x68,
0x75, 0x7a, 0x68, 0x61, 0x6e, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65,
0x63, 0x6f, 0x72, 0x64, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x5a, 0x68, 0x75,
0x5a, 0x68, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x22, 0x67, 0x0a, 0x0d, 0x5a, 0x68, 0x75, 0x5a, 0x68, 0x61, 0x6e, 0x52, 0x65, 0x63,
0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x7a, 0x68, 0x75, 0x7a, 0x68, 0x61, 0x6e,
0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x7a, 0x68, 0x75, 0x7a,
0x68, 0x61, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73,
0x74, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61,
0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74,
0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x73, 0x73,
0x69, 0x73, 0x74, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x73,
0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22,
0x64, 0x0a, 0x0c, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12,
0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18,
0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x54, 0x69, 0x6d,
0x65, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x49,
0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -273,12 +273,12 @@ func file_friend_friend_db_proto_rawDescGZIP() []byte {
var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_friend_friend_db_proto_goTypes = []interface{}{
(*DBFriend)(nil), // 0: DBFriend
(*ZhuZhanRecord)(nil), // 1: ZhuZhanRecord
(*AssistRecord)(nil), // 1: AssistRecord
(*DBHero)(nil), // 2: DBHero
}
var file_friend_friend_db_proto_depIdxs = []int32{
2, // 0: DBFriend.hero:type_name -> DBHero
1, // 1: DBFriend.record:type_name -> ZhuZhanRecord
1, // 1: DBFriend.record:type_name -> AssistRecord
2, // [2:2] is the sub-list for method output_type
2, // [2:2] is the sub-list for method input_type
2, // [2:2] is the sub-list for extension type_name
@ -306,7 +306,7 @@ func file_friend_friend_db_proto_init() {
}
}
file_friend_friend_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ZhuZhanRecord); i {
switch v := v.(*AssistRecord); i {
case 0:
return &v.state
case 1:

86
pb/friend_msg.pb.go
View File

@ -37,6 +37,7 @@ type FriendBase struct {
IsGetZaned bool `protobuf:"varint,10,opt,name=isGetZaned,proto3" json:"isGetZaned"` //是否已获赞
HeroObjId string `protobuf:"bytes,11,opt,name=heroObjId,proto3" json:"heroObjId"` //助战英雄ID
Score int32 `protobuf:"varint,12,opt,name=score,proto3" json:"score"` //助战分数
UpdateTime int64 `protobuf:"varint,13,opt,name=updateTime,proto3" json:"updateTime"` //更新时间
}
func (x *FriendBase) Reset() {
@ -155,6 +156,13 @@ func (x *FriendBase) GetScore() int32 {
return 0
}
func (x *FriendBase) GetUpdateTime() int64 {
if x != nil {
return x.UpdateTime
}
return 0
}
//好友列表
type FriendListReq struct {
state protoimpl.MessageState
@ -1724,7 +1732,7 @@ type FriendAssistlistResp struct {
List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` //好友助战排行
HeroObjId string `protobuf:"bytes,2,opt,name=heroObjId,proto3" json:"heroObjId"` //助战英雄
Record []*ZhuZhanRecord `protobuf:"bytes,3,rep,name=record,proto3" json:"record"` //我的助战记录
Record []*AssistRecord `protobuf:"bytes,3,rep,name=record,proto3" json:"record"` //我的助战记录
}
func (x *FriendAssistlistResp) Reset() {
@ -1773,7 +1781,7 @@ func (x *FriendAssistlistResp) GetHeroObjId() string {
return ""
}
func (x *FriendAssistlistResp) GetRecord() []*ZhuZhanRecord {
func (x *FriendAssistlistResp) GetRecord() []*AssistRecord {
if x != nil {
return x.Record
}
@ -1867,7 +1875,7 @@ func (x *FriendGetrewardResp) GetReceived() int32 {
}
// 助战英雄更新推送
type FriendAssistHeroListPush struct {
type FriendAssistHeroUpdatePush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
@ -1875,8 +1883,8 @@ type FriendAssistHeroListPush struct {
Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"` //好友
}
func (x *FriendAssistHeroListPush) Reset() {
*x = FriendAssistHeroListPush{}
func (x *FriendAssistHeroUpdatePush) Reset() {
*x = FriendAssistHeroUpdatePush{}
if protoimpl.UnsafeEnabled {
mi := &file_friend_friend_msg_proto_msgTypes[37]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -1884,13 +1892,13 @@ func (x *FriendAssistHeroListPush) Reset() {
}
}
func (x *FriendAssistHeroListPush) String() string {
func (x *FriendAssistHeroUpdatePush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*FriendAssistHeroListPush) ProtoMessage() {}
func (*FriendAssistHeroUpdatePush) ProtoMessage() {}
func (x *FriendAssistHeroListPush) ProtoReflect() protoreflect.Message {
func (x *FriendAssistHeroUpdatePush) ProtoReflect() protoreflect.Message {
mi := &file_friend_friend_msg_proto_msgTypes[37]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@ -1902,12 +1910,12 @@ func (x *FriendAssistHeroListPush) ProtoReflect() protoreflect.Message {
return mi.MessageOf(x)
}
// Deprecated: Use FriendAssistHeroListPush.ProtoReflect.Descriptor instead.
func (*FriendAssistHeroListPush) Descriptor() ([]byte, []int) {
// Deprecated: Use FriendAssistHeroUpdatePush.ProtoReflect.Descriptor instead.
func (*FriendAssistHeroUpdatePush) Descriptor() ([]byte, []int) {
return file_friend_friend_msg_proto_rawDescGZIP(), []int{37}
}
func (x *FriendAssistHeroListPush) GetFriend() *FriendBase {
func (x *FriendAssistHeroUpdatePush) GetFriend() *FriendBase {
if x != nil {
return x.Friend
}
@ -2006,7 +2014,7 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
0x0a, 0x17, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e,
0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x22, 0xd4, 0x02, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
0x6f, 0x22, 0xf4, 0x02, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b,
0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b,
@ -2027,7 +2035,9 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
0x61, 0x6e, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61,
0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70,
0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c,
0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65,
@ -2126,31 +2136,31 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65,
0x69, 0x76, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65,
0x69, 0x76, 0x65, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73,
0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x7d, 0x0a, 0x14, 0x46,
0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x7c, 0x0a, 0x14, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52,
0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04,
0x6c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
0x49, 0x64, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x5a, 0x68, 0x75, 0x5a, 0x68, 0x61, 0x6e, 0x52, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72,
0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71,
0x22, 0x31, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77,
0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69,
0x76, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69,
0x76, 0x65, 0x64, 0x22, 0x3f, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73,
0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12,
0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, 0x72,
0x69, 0x65, 0x6e, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73,
0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22,
0x41, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e,
0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72,
0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22,
0x31, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61,
0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76,
0x65, 0x64, 0x22, 0x41, 0x0a, 0x1a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69,
0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68,
0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
0x22, 0x41, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74,
0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07,
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (
@ -2204,10 +2214,10 @@ var file_friend_friend_msg_proto_goTypes = []interface{}{
(*FriendAssistlistResp)(nil), // 34: FriendAssistlistResp
(*FriendGetrewardReq)(nil), // 35: FriendGetrewardReq
(*FriendGetrewardResp)(nil), // 36: FriendGetrewardResp
(*FriendAssistHeroListPush)(nil), // 37: FriendAssistHeroListPush
(*FriendAssistHeroUpdatePush)(nil), // 37: FriendAssistHeroUpdatePush
(*FriendAssistHeroListReq)(nil), // 38: FriendAssistHeroListReq
(*FriendAssistHeroListResp)(nil), // 39: FriendAssistHeroListResp
(*ZhuZhanRecord)(nil), // 40: ZhuZhanRecord
(*AssistRecord)(nil), // 40: AssistRecord
}
var file_friend_friend_msg_proto_depIdxs = []int32{
0, // 0: FriendListResp.list:type_name -> FriendBase
@ -2217,8 +2227,8 @@ var file_friend_friend_msg_proto_depIdxs = []int32{
0, // 4: FriendBlackListResp.friends:type_name -> FriendBase
0, // 5: FriendZanlistResp.list:type_name -> FriendBase
0, // 6: FriendAssistlistResp.list:type_name -> FriendBase
40, // 7: FriendAssistlistResp.record:type_name -> ZhuZhanRecord
0, // 8: FriendAssistHeroListPush.friend:type_name -> FriendBase
40, // 7: FriendAssistlistResp.record:type_name -> AssistRecord
0, // 8: FriendAssistHeroUpdatePush.friend:type_name -> FriendBase
0, // 9: FriendAssistHeroListResp.friends:type_name -> FriendBase
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
@ -2679,7 +2689,7 @@ func file_friend_friend_msg_proto_init() {
}
}
file_friend_friend_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*FriendAssistHeroListPush); i {
switch v := v.(*FriendAssistHeroUpdatePush); i {
case 0:
return &v.state
case 1: