diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go index 3e13c142..5a35db3a 100644 --- a/src/server/game/GameLogic.go +++ b/src/server/game/GameLogic.go @@ -525,6 +525,7 @@ func (ad *GameLogic) GetResFriendPlayerByUid(Id int) *msg.ResFriendPlayerSimple DressSet: GoUtil.MapIntToInt32(player.DressSet), Friend: GoUtil.IntToInt32(player.Friend), Physiology: GoUtil.MapIntToInt32(player.Physiology), + PetName: player.PetName, } } diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index c6e46e92..1b0ec484 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -13262,6 +13262,7 @@ type ResFriendPlayerSimple struct { Friend []int32 `protobuf:"varint,15,rep,packed,name=Friend,proto3" json:"Friend,omitempty"` // 好友列表 Last *ActLog `protobuf:"bytes,16,opt,name=Last,proto3" json:"Last,omitempty"` // 最后一次动态 Physiology map[int32]int32 `protobuf:"bytes,17,rep,name=Physiology,proto3" json:"Physiology,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // 生理状态 位置 =》 状态 + PetName string `protobuf:"bytes,18,opt,name=PetName,proto3" json:"PetName,omitempty"` //宠物名字 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -13415,6 +13416,13 @@ func (x *ResFriendPlayerSimple) GetPhysiology() map[int32]int32 { return nil } +func (x *ResFriendPlayerSimple) GetPetName() string { + if x != nil { + return x.PetName + } + return "" +} + type ResPlayerSimple struct { state protoimpl.MessageState `protogen:"open.v1"` Uid int64 `protobuf:"varint,1,opt,name=Uid,proto3" json:"Uid,omitempty"` @@ -26026,7 +26034,7 @@ type CatnipGame struct { Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` // 猫草id Status int32 `protobuf:"varint,2,opt,name=Status,proto3" json:"Status,omitempty"` // 0 未开始 1 进行中 2 已结束 Progress int32 `protobuf:"varint,3,opt,name=Progress,proto3" json:"Progress,omitempty"` // 进度 - Reward []int32 `protobuf:"varint,4,rep,packed,name=Reward,proto3" json:"Reward,omitempty"` // 已领取进度奖励列表 [100,150,200] + Reward []int32 `protobuf:"varint,4,rep,packed,name=Reward,proto3" json:"Reward,omitempty"` // 已领取进度奖励列表 [1,2,3] Partner *ResPlayerSimple `protobuf:"bytes,5,opt,name=Partner,proto3" json:"Partner,omitempty"` // 伙伴 Emoji int32 `protobuf:"varint,6,opt,name=Emoji,proto3" json:"Emoji,omitempty"` // 表情id FriendProgress int32 `protobuf:"varint,7,opt,name=FriendProgress,proto3" json:"FriendProgress,omitempty"` // 好友进度 @@ -26117,7 +26125,7 @@ type CatnipInvite struct { state protoimpl.MessageState `protogen:"open.v1"` Uid int64 `protobuf:"varint,1,opt,name=Uid,proto3" json:"Uid,omitempty"` // 好友id Time int64 `protobuf:"varint,2,opt,name=Time,proto3" json:"Time,omitempty"` // 邀请时间 - Type int32 `protobuf:"varint,3,opt,name=Type,proto3" json:"Type,omitempty"` // 状态 0 可以邀请,1 已邀请 2 被邀请 3 已满员 + Type int32 `protobuf:"varint,3,opt,name=Type,proto3" json:"Type,omitempty"` // 状态 0 可以邀请,1 已邀请 2 被邀请 3 已满员 4 已合作 Player *ResPlayerSimple `protobuf:"bytes,4,opt,name=Player,proto3" json:"Player,omitempty"` // 好友信息 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache @@ -28408,7 +28416,7 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x04Code\x18\x01 \x01(\x05R\x04Code\x12-\n" + "\x04List\x18\x02 \x03(\v2\x19.tutorial.ResPlayerSimpleR\x04List\")\n" + "\x15ReqFriendPlayerSimple\x12\x10\n" + - "\x03Uid\x18\x01 \x01(\x03R\x03Uid\"\xf9\x06\n" + + "\x03Uid\x18\x01 \x01(\x03R\x03Uid\"\x93\a\n" + "\x15ResFriendPlayerSimple\x12\x10\n" + "\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x12\n" + "\x04Name\x18\x02 \x01(\tR\x04Name\x12\x12\n" + @@ -28429,7 +28437,8 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x04Last\x18\x10 \x01(\v2\x10.tutorial.ActLogR\x04Last\x12O\n" + "\n" + "Physiology\x18\x11 \x03(\v2/.tutorial.ResFriendPlayerSimple.PhysiologyEntryR\n" + - "Physiology\x1a8\n" + + "Physiology\x12\x18\n" + + "\aPetName\x18\x12 \x01(\tR\aPetName\x1a8\n" + "\n" + "EmojiEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n" +