tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:9474b0dc300e927c1e09eef1bdda6e41486b04ab
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
...
compare: tl_server_2:455355814436688795a52480f555e7f88197633e
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

2 Commits
9474b0dc30 ... 4553558144

Author SHA1 Message Date
by 4553558144 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-10 15:13:31 +08:00
by 8c432f6f4e 好友申请记录 2024-05-10 15:13:25 +08:00
7 changed files with 1356 additions and 1214 deletions
Show Stats Expand all files Collapse all files

12
model/player.go
View File

@ -456,6 +456,7 @@ type PlayerData struct {
WeekCardTime map[int32]int64 // 周卡结束时间 key:类型 value：结束时间
WeekCardAward map[int32]bool //周卡奖励领取状态false-未领取，true已领取
ItemRecExpireTime int64 // 记牌器到期时间
RequestAddFriend map[int32]int64 //玩家申请好友记录
}
// 七日签到数据
@ -774,11 +775,12 @@ func NewPlayerData(acc string, name string, id int32, channel, platform string,
ShopLastLookTime: make(map[int32]int64),
IsFoolPlayer: make(map[string]bool),
//测试数据
PowerList: []int32{1}, //默认炮台
UnMaxPower: 10, //初始化炮倍最小倍数
WeekCardTime: make(map[int32]int64),
WeekCardAward: make(map[int32]bool),
WelfData: NewWelfareData(),
PowerList: []int32{1}, //默认炮台
UnMaxPower: 10, //初始化炮倍最小倍数
WeekCardTime: make(map[int32]int64),
WeekCardAward: make(map[int32]bool),
WelfData: NewWelfareData(),
RequestAddFriend: make(map[int32]int64),
}
if tel != "" {

234
protocol/friend/friend.pb.go
View File

@ -149,6 +149,7 @@ const (
FriendPacketID_PACKET_SCFriendUnreadData FriendPacketID = 2711 // 未读消息数据
FriendPacketID_PACKET_CSFuzzyQueryPlayer FriendPacketID = 2712 //根据id或者昵称查询玩家
FriendPacketID_PACKET_SCFuzzyQueryPlayer FriendPacketID = 2713
FriendPacketID_PACKET_SCRequestAddFriend FriendPacketID = 2714 //申请记录
)
// Enum value maps for FriendPacketID.
@ -169,6 +170,7 @@ var (
2711: "PACKET_SCFriendUnreadData",
2712: "PACKET_CSFuzzyQueryPlayer",
2713: "PACKET_SCFuzzyQueryPlayer",
2714: "PACKET_SCRequestAddFriend",
}
FriendPacketID_value = map[string]int32{
"PACKET_FriendPACKET_ZERO": 0,
@ -186,6 +188,7 @@ var (
"PACKET_SCFriendUnreadData": 2711,
"PACKET_CSFuzzyQueryPlayer": 2712,
"PACKET_SCFuzzyQueryPlayer": 2713,
"PACKET_SCRequestAddFriend": 2714,
}
)
@ -1525,6 +1528,54 @@ func (x *SCFuzzyQueryPlayer) GetPlayers() []*PlayerInfo {
return nil
}
//PACKET_SCRequestAddFriend
type SCRequestAddFriend struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
RequestAddFriend []int32 `protobuf:"varint,1,rep,packed,name=RequestAddFriend,proto3" json:"RequestAddFriend,omitempty"`
}
func (x *SCRequestAddFriend) Reset() {
*x = SCRequestAddFriend{}
if protoimpl.UnsafeEnabled {
mi := &file_friend_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *SCRequestAddFriend) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*SCRequestAddFriend) ProtoMessage() {}
func (x *SCRequestAddFriend) ProtoReflect() protoreflect.Message {
mi := &file_friend_proto_msgTypes[19]
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 SCRequestAddFriend.ProtoReflect.Descriptor instead.
func (*SCRequestAddFriend) Descriptor() ([]byte, []int) {
return file_friend_proto_rawDescGZIP(), []int{19}
}
func (x *SCRequestAddFriend) GetRequestAddFriend() []int32 {
if x != nil {
return x.RequestAddFriend
}
return nil
}
var File_friend_proto protoreflect.FileDescriptor
var file_friend_proto_rawDesc = []byte{
@ -1670,87 +1721,93 @@ var file_friend_proto_rawDesc = []byte{
0x01, 0x28, 0x09, 0x52, 0x0c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
0x74, 0x12, 0x2c, 0x0a, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x12, 0x2e, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2e, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x2a,
0xf3, 0x05, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f, 0x64, 0x65,
0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73, 0x73, 0x10,
0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10,
0x01, 0x12, 0x19, 0x0a, 0x14, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x5f, 0x4e, 0x6f, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x10, 0xe9, 0x07, 0x12, 0x1b, 0x0a, 0x16,
0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x6c, 0x72, 0x65,
0x61, 0x64, 0x79, 0x41, 0x64, 0x64, 0x10, 0xea, 0x07, 0x12, 0x1d, 0x0a, 0x18, 0x4f, 0x50, 0x52,
0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79,
0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xeb, 0x07, 0x12, 0x1a, 0x0a, 0x15, 0x4f, 0x50, 0x52, 0x43,
0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4d, 0x61,
0x78, 0x10, 0xec, 0x07, 0x12, 0x1e, 0x0a, 0x19, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4d, 0x61,
0x78, 0x10, 0xed, 0x07, 0x12, 0x23, 0x0a, 0x1e, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x07, 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x50, 0x52,
0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x4e,
0x6f, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0xef, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50,
0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
0x4e, 0x6f, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0xf0, 0x07, 0x12, 0x24, 0x0a, 0x1f,
0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x22,
0x40, 0x0a, 0x12, 0x53, 0x43, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x64, 0x64, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52,
0x10, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e,
0x64, 0x2a, 0xf3, 0x05, 0x0a, 0x0c, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x43, 0x6f,
0x64, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x53, 0x75, 0x63, 0x65, 0x73,
0x73, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x45, 0x72, 0x72, 0x6f,
0x72, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x14, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x5f, 0x4e, 0x6f, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x10, 0xe9, 0x07, 0x12, 0x1b,
0x0a, 0x16, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x6c,
0x72, 0x65, 0x61, 0x64, 0x79, 0x41, 0x64, 0x64, 0x10, 0xea, 0x07, 0x12, 0x1d, 0x0a, 0x18, 0x4f,
0x50, 0x52, 0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x41, 0x6c, 0x72, 0x65, 0x61,
0x64, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xeb, 0x07, 0x12, 0x1a, 0x0a, 0x15, 0x4f, 0x50,
0x52, 0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x4d, 0x61, 0x78, 0x10, 0xec, 0x07, 0x12, 0x1e, 0x0a, 0x19, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x73, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x4d, 0x61, 0x78, 0x10, 0xed, 0x07, 0x12, 0x23, 0x0a, 0x1e, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x44, 0x65, 0x73, 0x74, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x4d, 0x61, 0x78, 0x10, 0xee, 0x07, 0x12, 0x1f, 0x0a, 0x1a, 0x4f,
0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x5f, 0x4e, 0x6f, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0xef, 0x07, 0x12, 0x20, 0x0a, 0x1b,
0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e,
0x64, 0x5f, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10,
0xf1, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74,
0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69, 0x6d, 0x69,
0x74, 0x10, 0xf2, 0x07, 0x12, 0x23, 0x0a, 0x1e, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76,
0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x6f, 0x6f, 0x6d, 0x4e, 0x6f,
0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xf3, 0x07, 0x12, 0x24, 0x0a, 0x1f, 0x4f, 0x50, 0x52,
0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53,
0x63, 0x65, 0x6e, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xf4, 0x07, 0x12,
0x22, 0x0a, 0x1d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72,
0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x64,
0x10, 0xf5, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69,
0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x43, 0x6f, 0x69, 0x6e, 0x4c, 0x69, 0x6d,
0x69, 0x74, 0x10, 0xf6, 0x07, 0x12, 0x23, 0x0a, 0x1e, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e,
0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4e,
0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xf7, 0x07, 0x12, 0x26, 0x0a, 0x21, 0x4f, 0x50,
0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f,
0x47, 0x61, 0x6d, 0x65, 0x4e, 0x6f, 0x74, 0x43, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10,
0xf8, 0x07, 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74,
0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x6f, 0x6f, 0x6d, 0x46, 0x75, 0x6c, 0x6c,
0x10, 0xf9, 0x07, 0x12, 0x1d, 0x0a, 0x18, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69,
0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x10,
0xfa, 0x07, 0x12, 0x21, 0x0a, 0x1c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74,
0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x50, 0x6f, 0x73, 0x49, 0x73, 0x45, 0x72, 0x72,
0x6f, 0x72, 0x10, 0xfb, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e,
0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x48, 0x61, 0x64, 0x49, 0x6e,
0x52, 0x6f, 0x6f, 0x6d, 0x10, 0xfc, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x4f, 0x50, 0x52, 0x43, 0x5f,
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x4e, 0x6f, 0x74, 0x4f, 0x70, 0x4d, 0x79, 0x73, 0x65,
0x6c, 0x66, 0x10, 0xfd, 0x07, 0x2a, 0xc9, 0x03, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b,
0x45, 0x54, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
0x5f, 0x43, 0x53, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8c, 0x15,
0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8d, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41,
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x70, 0x10,
0x8e, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x70, 0x10, 0x8f, 0x15, 0x12, 0x20, 0x0a, 0x1b, 0x50, 0x41,
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79,
0x65, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x10, 0x90, 0x15, 0x12, 0x20, 0x0a, 0x1b,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c,
0x61, 0x79, 0x65, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x10, 0x91, 0x15, 0x12, 0x1a,
0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74,
0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x92, 0x15, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41,
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x10, 0x93, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f,
0x70, 0x10, 0x94, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x70, 0x10,
0x95, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x44, 0x61, 0x74, 0x61, 0x10, 0x96,
0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x46, 0x72,
0x69, 0x65, 0x6e, 0x64, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x10, 0x97,
0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x46, 0x75,
0x7a, 0x7a, 0x79, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x10, 0x98,
0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x46, 0x75,
0x7a, 0x7a, 0x79, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x10, 0x99,
0x15, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73,
0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
0x6f, 0x6c, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
0x64, 0x5f, 0x4e, 0x6f, 0x74, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0xf0, 0x07, 0x12, 0x24,
0x0a, 0x1f, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69,
0x65, 0x6e, 0x64, 0x5f, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73,
0x74, 0x10, 0xf1, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76,
0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x6f, 0x6f, 0x6d, 0x4c, 0x69,
0x6d, 0x69, 0x74, 0x10, 0xf2, 0x07, 0x12, 0x23, 0x0a, 0x1e, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49,
0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x6f, 0x6f, 0x6d,
0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xf3, 0x07, 0x12, 0x24, 0x0a, 0x1f, 0x4f,
0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x5f, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xf4,
0x07, 0x12, 0x22, 0x0a, 0x1d, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65,
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x43, 0x6c, 0x6f, 0x73,
0x65, 0x64, 0x10, 0xf5, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e,
0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x43, 0x6f, 0x69, 0x6e, 0x4c,
0x69, 0x6d, 0x69, 0x74, 0x10, 0xf6, 0x07, 0x12, 0x23, 0x0a, 0x1e, 0x4f, 0x50, 0x52, 0x43, 0x5f,
0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, 0x61, 0x6d,
0x65, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xf7, 0x07, 0x12, 0x26, 0x0a, 0x21,
0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e,
0x64, 0x5f, 0x47, 0x61, 0x6d, 0x65, 0x4e, 0x6f, 0x74, 0x43, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x65,
0x72, 0x10, 0xf8, 0x07, 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76,
0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x52, 0x6f, 0x6f, 0x6d, 0x46, 0x75,
0x6c, 0x6c, 0x10, 0xf9, 0x07, 0x12, 0x1d, 0x0a, 0x18, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e,
0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x47, 0x61, 0x6d, 0x69, 0x6e,
0x67, 0x10, 0xfa, 0x07, 0x12, 0x21, 0x0a, 0x1c, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x49, 0x6e, 0x76,
0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x50, 0x6f, 0x73, 0x49, 0x73, 0x45,
0x72, 0x72, 0x6f, 0x72, 0x10, 0xfb, 0x07, 0x12, 0x20, 0x0a, 0x1b, 0x4f, 0x50, 0x52, 0x43, 0x5f,
0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x48, 0x61, 0x64,
0x49, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x10, 0xfc, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x4f, 0x50, 0x52,
0x43, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x4e, 0x6f, 0x74, 0x4f, 0x70, 0x4d, 0x79,
0x73, 0x65, 0x6c, 0x66, 0x10, 0xfd, 0x07, 0x2a, 0xe9, 0x03, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65,
0x6e, 0x64, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x41,
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x41, 0x43, 0x4b, 0x45,
0x54, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b,
0x45, 0x54, 0x5f, 0x43, 0x53, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10,
0x8c, 0x15, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x10, 0x8d, 0x15, 0x12, 0x16, 0x0a, 0x11,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f,
0x70, 0x10, 0x8e, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
0x43, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x70, 0x10, 0x8f, 0x15, 0x12, 0x20, 0x0a, 0x1b,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c,
0x61, 0x79, 0x65, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x10, 0x90, 0x15, 0x12, 0x20,
0x0a, 0x1b, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x51, 0x75, 0x65, 0x72, 0x79,
0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x10, 0x91, 0x15,
0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76,
0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x92, 0x15, 0x12, 0x1a, 0x0a, 0x15,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46,
0x72, 0x69, 0x65, 0x6e, 0x64, 0x10, 0x93, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b,
0x45, 0x54, 0x5f, 0x43, 0x53, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e,
0x64, 0x4f, 0x70, 0x10, 0x94, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
0x5f, 0x53, 0x43, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f,
0x70, 0x10, 0x95, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53,
0x43, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x44, 0x61, 0x74, 0x61,
0x10, 0x96, 0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61,
0x10, 0x97, 0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53,
0x46, 0x75, 0x7a, 0x7a, 0x79, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
0x10, 0x98, 0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
0x46, 0x75, 0x7a, 0x7a, 0x79, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
0x10, 0x99, 0x15, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43,
0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x64, 0x64, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
0x10, 0x9a, 0x15, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d,
0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (
@ -1766,7 +1823,7 @@ func file_friend_proto_rawDescGZIP() []byte {
}
var file_friend_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
var file_friend_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_friend_proto_msgTypes = make([]protoimpl.MessageInfo, 20)
var file_friend_proto_goTypes = []interface{}{
(OpResultCode)(0), // 0: friend.OpResultCode
(FriendPacketID)(0), // 1: friend.FriendPacketID
@ -1789,6 +1846,7 @@ var file_friend_proto_goTypes = []interface{}{
(*CSFuzzyQueryPlayer)(nil), // 18: friend.CSFuzzyQueryPlayer
(*PlayerInfo)(nil), // 19: friend.PlayerInfo
(*SCFuzzyQueryPlayer)(nil), // 20: friend.SCFuzzyQueryPlayer
(*SCRequestAddFriend)(nil), // 21: friend.SCRequestAddFriend
}
var file_friend_proto_depIdxs = []int32{
3, // 0: friend.SCFriendList.FriendArr:type_name -> friend.FriendInfo
@ -2042,6 +2100,18 @@ func file_friend_proto_init() {
return nil
}
}
file_friend_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*SCRequestAddFriend); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -2049,7 +2119,7 @@ func file_friend_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_friend_proto_rawDesc,
NumEnums: 2,
NumMessages: 19,
NumMessages: 20,
NumExtensions: 0,
NumServices: 0,
},

5
protocol/friend/friend.proto
View File

@ -46,6 +46,7 @@ enum FriendPacketID {
PACKET_SCFriendUnreadData = 2711; // 未读消息数据
PACKET_CSFuzzyQueryPlayer = 2712; //根据id或者昵称查询玩家
PACKET_SCFuzzyQueryPlayer = 2713;
PACKET_SCRequestAddFriend = 2714; //申请记录
}
//获取好友列表
@ -183,6 +184,10 @@ message SCFuzzyQueryPlayer {
string QueryContent = 1;
repeated PlayerInfo Players = 2;
}
//PACKET_SCRequestAddFriend
message SCRequestAddFriend{
repeated int32 RequestAddFriend = 1;
}

2265
protocol/player/player.pb.go
View File

File diff suppressed because it is too large Load Diff

1
protocol/player/player.proto
View File

@ -313,6 +313,7 @@ message PlayerData {
string Signature = 46; //签名
int32 Age = 47; // 年龄
repeated WeekInfo WeekCard = 48;//周卡
repeated int32 RequestAddFriend = 49;//请求添加好友信息
}
//周卡数据

46
worldsrv/friendmgr.go
View File

@ -3,6 +3,7 @@ package main
import (
"errors"
"fmt"
"mongo.games.com/goserver/core"
"strconv"
"time"
@ -373,17 +374,62 @@ func (this *FriendMgr) FriendOp(opcode int32, p *Player, destP *model.BindFriend
case OpType_Apply:
logger.Logger.Trace("@Apply friend", p.SnId, " -> ", destP.SnId)
this.FriendApply(p, destP)
p.RequestAddFriend[destP.SnId] = time.Now().Unix()
this.SendRequestAddFriend(p)
case OpType_Agree:
logger.Logger.Trace("@AgreeApply friend", p.SnId, " -> ", destP.SnId)
this.FriendAgree(p, destP)
destPs := PlayerMgrSington.GetPlayerBySnId(destP.SnId)
if destPs != nil {
delete(destPs.RequestAddFriend, p.SnId)
this.SendRequestAddFriend(destPs)
} else {
//从DB获取玩家信息
task.New(core.CoreObject(), task.CallableWrapper(func(o *basic.Object) interface{} {
pd, _ := model.GetPlayerDataBySnId(destP.Platform, destP.SnId, false, false)
return pd
}), task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) {
pd, ok := data.(*model.PlayerData)
if !ok || pd == nil {
return
}
delete(pd.RequestAddFriend, p.SnId)
model.SavePlayerData(pd)
}), "FriendMgr.FriendOp").StartByExecutor(strconv.Itoa(int(p.SnId)))
}
case OpType_Refuse:
logger.Logger.Trace("@Refuse friend", p.SnId, " -> ", destP.SnId)
this.FriendRefuse(p, destP)
destPs := PlayerMgrSington.GetPlayerBySnId(destP.SnId)
if destPs != nil {
delete(destPs.RequestAddFriend, p.SnId)
this.SendRequestAddFriend(destPs)
} else {
//从DB获取玩家信息
task.New(core.CoreObject(), task.CallableWrapper(func(o *basic.Object) interface{} {
pd, _ := model.GetPlayerDataBySnId(destP.Platform, destP.SnId, false, false)
return pd
}), task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) {
pd, ok := data.(*model.PlayerData)
if !ok || pd == nil {
return
}
delete(pd.RequestAddFriend, p.SnId)
model.SavePlayerData(pd)
}), "FriendMgr.FriendOp").StartByExecutor(strconv.Itoa(int(p.SnId)))
}
case OpType_Delete:
logger.Logger.Trace("@Delete friend", p.SnId, " -> ", destP.SnId)
this.FriendDelete(p, destP)
}
}
func (this *FriendMgr) SendRequestAddFriend(p *Player) {
pack := &friend.SCRequestAddFriend{}
for snid, _ := range p.RequestAddFriend {
pack.RequestAddFriend = append(pack.RequestAddFriend, snid)
}
p.SendToClient(int(friend.FriendPacketID_PACKET_SCRequestAddFriend), pack)
}
// FriendApply 好友申请
// 记录在数据库

7
worldsrv/player.go
View File

@ -313,6 +313,9 @@ func (this *Player) OnLogined() {
this.VipExtra = VipMgrSington.GetVipPointsExtra(this.Platform, this.VIP)
if this.RequestAddFriend == nil {
this.RequestAddFriend = make(map[int32]int64)
}
// 头像决定性别
this.Sex = (this.Head%2 + 1) % 2
@ -3022,6 +3025,10 @@ func (this *Player) SendPlayerInfo() {
}
scPlayerData.Data.WeekCard = append(scPlayerData.Data.WeekCard, &weekInfo)
}
//玩家申请好友记录
for snid, _ := range this.RequestAddFriend {
scPlayerData.Data.RequestAddFriend = append(scPlayerData.Data.RequestAddFriend, snid)
}
proto.SetDefaults(scPlayerData)
logger.Logger.Tracef("Send SCPlayerData %v", scPlayerData)
this.SendToClient(int(player_proto.PlayerPacketID_PACKET_SC_PLAYERDATA), scPlayerData)