pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

卡牌优化

Browse Source
This commit is contained in:
hahwu 2025-07-29 15:30:12 +08:00
parent dce5b214ba
commit fcca991555
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/PlayerFunc.go
View File

@ -682,6 +682,7 @@ func GetCardInfoMsg(CardInfo *card.CardInfo) *proto.ResFriendCard {
Type: int32(CardInfo.Type),
Status: int32(CardInfo.Status),
Id: CardInfo.Id,
Emoji: int32(CardInfo.Emoji),
}
}

2
src/server/game/RegisterNetworkFunc.go
View File

@ -1863,6 +1863,7 @@ func ReqCardSend(player *Player, buf []byte) error {
})
return err
}
CardInfo.Emoji = int(req.Emoji)
m := &MsqMod.Msg{
Type: MsqMod.HANDLE_TYPE_SEND_CARD,
From: int(player.M_DwUin),
@ -1900,6 +1901,7 @@ func ReqCardExchange(player *Player, buf []byte) error {
})
return err
}
CardInfo.Emoji = int(req.Emoji)
m := &MsqMod.Msg{
Type: MsqMod.HANDLE_TYPE_EX_CARD,
From: int(player.M_DwUin),

1
src/server/game/mod/card/Card.go
View File

@ -73,6 +73,7 @@ type CardInfo struct {
EndTime int64
StartTime int64
Status int
Emoji int
}
func (c *CardMod) InitData() {

39
src/server/msg/Gameapi.pb.go
View File

@ -8026,6 +8026,7 @@ type ReqCardSend struct {
state protoimpl.MessageState `protogen:"open.v1"`
Uid int64 `protobuf:"varint,1,opt,name=Uid,proto3" json:"Uid,omitempty"`
CardId int32 `protobuf:"varint,2,opt,name=CardId,proto3" json:"CardId,omitempty"`
Emoji int32 `protobuf:"varint,3,opt,name=Emoji,proto3" json:"Emoji,omitempty"` // 表情Id
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -8074,6 +8075,13 @@ func (x *ReqCardSend) GetCardId() int32 {
return 0
}
func (x *ReqCardSend) GetEmoji() int32 {
if x != nil {
return x.Emoji
}
return 0
}
type ResCardSend struct {
state protoimpl.MessageState `protogen:"open.v1"`
Code RES_CODE `protobuf:"varint,1,opt,name=Code,proto3,enum=tutorial.RES_CODE" json:"Code,omitempty"`
@ -8131,6 +8139,7 @@ type ReqCardExchange struct {
state protoimpl.MessageState `protogen:"open.v1"`
Uid int64 `protobuf:"varint,1,opt,name=Uid,proto3" json:"Uid,omitempty"`
CardId int32 `protobuf:"varint,2,opt,name=CardId,proto3" json:"CardId,omitempty"`
Emoji int32 `protobuf:"varint,3,opt,name=Emoji,proto3" json:"Emoji,omitempty"` // 表情Id
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -8179,6 +8188,13 @@ func (x *ReqCardExchange) GetCardId() int32 {
return 0
}
func (x *ReqCardExchange) GetEmoji() int32 {
if x != nil {
return x.Emoji
}
return 0
}
type ResCardExchange struct {
state protoimpl.MessageState `protogen:"open.v1"`
Code RES_CODE `protobuf:"varint,1,opt,name=Code,proto3,enum=tutorial.RES_CODE" json:"Code,omitempty"`
@ -12580,6 +12596,7 @@ type ResFriendCard struct {
ExCardId int32 `protobuf:"varint,9,opt,name=ExCardId,proto3" json:"ExCardId,omitempty"`
Status int32 `protobuf:"varint,10,opt,name=Status,proto3" json:"Status,omitempty"`
Id string `protobuf:"bytes,11,opt,name=Id,proto3" json:"Id,omitempty"`
Emoji int32 `protobuf:"varint,12,opt,name=Emoji,proto3" json:"Emoji,omitempty"` // 表情Id
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -12691,6 +12708,13 @@ func (x *ResFriendCard) GetId() string {
return ""
}
func (x *ResFriendCard) GetEmoji() int32 {
if x != nil {
return x.Emoji
}
return 0
}
type ReqKv struct {
state protoimpl.MessageState `protogen:"open.v1"`
Key int32 `protobuf:"varint,1,opt,name=key,proto3" json:"key,omitempty"`
@ -25308,16 +25332,18 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\x11ResRefuseCardGive\x12&\n" +
"\x04Code\x18\x01 \x01(\x0e2\x12.tutorial.RES_CODER\x04Code\x12\x10\n" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\x12\x0e\n" +
"\x02Id\x18\x03 \x01(\tR\x02Id\"7\n" +
"\x02Id\x18\x03 \x01(\tR\x02Id\"M\n" +
"\vReqCardSend\x12\x10\n" +
"\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x16\n" +
"\x06CardId\x18\x02 \x01(\x05R\x06CardId\"G\n" +
"\x06CardId\x18\x02 \x01(\x05R\x06CardId\x12\x14\n" +
"\x05Emoji\x18\x03 \x01(\x05R\x05Emoji\"G\n" +
"\vResCardSend\x12&\n" +
"\x04Code\x18\x01 \x01(\x0e2\x12.tutorial.RES_CODER\x04Code\x12\x10\n" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\";\n" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\"Q\n" +
"\x0fReqCardExchange\x12\x10\n" +
"\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x16\n" +
"\x06CardId\x18\x02 \x01(\x05R\x06CardId\"K\n" +
"\x06CardId\x18\x02 \x01(\x05R\x06CardId\x12\x14\n" +
"\x05Emoji\x18\x03 \x01(\x05R\x05Emoji\"K\n" +
"\x0fResCardExchange\x12&\n" +
"\x04Code\x18\x01 \x01(\x0e2\x12.tutorial.RES_CODER\x04Code\x12\x10\n" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\"?\n" +
@ -25630,7 +25656,7 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\x0fNotifyFriendLog\x12*\n" +
"\x04info\x18\x01 \x01(\v2\x16.tutorial.ResFriendLogR\x04info\"?\n" +
"\x10NotifyFriendCard\x12+\n" +
"\x04Info\x18\x01 \x01(\v2\x17.tutorial.ResFriendCardR\x04Info\"\xfb\x01\n" +
"\x04Info\x18\x01 \x01(\v2\x17.tutorial.ResFriendCardR\x04Info\"\x91\x02\n" +
"\rResFriendCard\x12\x10\n" +
"\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x12\n" +
"\x04Name\x18\x02 \x01(\tR\x04Name\x12\x12\n" +
@ -25643,7 +25669,8 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\bExCardId\x18\t \x01(\x05R\bExCardId\x12\x16\n" +
"\x06Status\x18\n" +
" \x01(\x05R\x06Status\x12\x0e\n" +
"\x02Id\x18\v \x01(\tR\x02Id\"/\n" +
"\x02Id\x18\v \x01(\tR\x02Id\x12\x14\n" +
"\x05Emoji\x18\f \x01(\x05R\x05Emoji\"/\n" +
"\x05ReqKv\x12\x10\n" +
"\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n" +
"\x05value\x18\x02 \x01(\tR\x05value\"g\n" +