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:55:03 +08:00
parent fcca991555
commit fd246374da
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2028,8 +2028,9 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error {
player.PlayMod.save()
player.PushClientRes(CardMod.NotifyCard())
player.PushClientRes(&msg.ResAgreeCardExchange{
Code: msg.RES_CODE_SUCCESS,
Id: req.Id,
Code: msg.RES_CODE_SUCCESS,
Id: req.Id,
Emoji: int32(CardInfo.Emoji),
})
m := &MsqMod.Msg{
Type: MsqMod.HANDLE_TYPE_ARGREE_EX_CARD,
@ -2152,6 +2153,7 @@ func ReqGetFriendCard(player *Player, buf []byte) error {
Code: msg.RES_CODE_SUCCESS,
Id: req.Id,
CardId: int32(CardInfo.CardId),
Emoji: int32(CardInfo.Emoji),
})
player.PushClientRes(CardMod.NotifyCard())
return nil

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

@ -8410,6 +8410,7 @@ type ResAgreeCardExchange struct {
Code RES_CODE `protobuf:"varint,1,opt,name=Code,proto3,enum=tutorial.RES_CODE" json:"Code,omitempty"`
Msg string `protobuf:"bytes,2,opt,name=Msg,proto3" json:"Msg,omitempty"`
Id string `protobuf:"bytes,3,opt,name=Id,proto3" json:"Id,omitempty"`
Emoji int32 `protobuf:"varint,4,opt,name=Emoji,proto3" json:"Emoji,omitempty"` // 表情Id
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -8465,6 +8466,13 @@ func (x *ResAgreeCardExchange) GetId() string {
return ""
}
func (x *ResAgreeCardExchange) GetEmoji() int32 {
if x != nil {
return x.Emoji
}
return 0
}
// 拒绝选择卡牌进行交换
type ReqRefuseCardSelect struct {
state protoimpl.MessageState `protogen:"open.v1"`
@ -8726,6 +8734,7 @@ type ResGetFriendCard struct {
Msg string `protobuf:"bytes,2,opt,name=Msg,proto3" json:"Msg,omitempty"`
Id string `protobuf:"bytes,3,opt,name=Id,proto3" json:"Id,omitempty"`
CardId int32 `protobuf:"varint,4,opt,name=CardId,proto3" json:"CardId,omitempty"`
Emoji int32 `protobuf:"varint,5,opt,name=Emoji,proto3" json:"Emoji,omitempty"` // 表情Id
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -8788,6 +8797,13 @@ func (x *ResGetFriendCard) GetCardId() int32 {
return 0
}
func (x *ResGetFriendCard) GetEmoji() int32 {
if x != nil {
return x.Emoji
}
return 0
}
// 获取可以交换的金卡
type ReqGetGoldCard struct {
state protoimpl.MessageState `protogen:"open.v1"`
@ -25355,11 +25371,12 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\x12\x0e\n" +
"\x02Id\x18\x03 \x01(\tR\x02Id\"&\n" +
"\x14ReqAgreeCardExchange\x12\x0e\n" +
"\x02Id\x18\x01 \x01(\tR\x02Id\"`\n" +
"\x02Id\x18\x01 \x01(\tR\x02Id\"v\n" +
"\x14ResAgreeCardExchange\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\"%\n" +
"\x02Id\x18\x03 \x01(\tR\x02Id\x12\x14\n" +
"\x05Emoji\x18\x04 \x01(\x05R\x05Emoji\"%\n" +
"\x13ReqRefuseCardSelect\x12\x0e\n" +
"\x02Id\x18\x01 \x01(\tR\x02Id\"_\n" +
"\x13ResRefuseCardSelect\x12&\n" +
@ -25373,12 +25390,13 @@ const file_proto_Gameapi_proto_rawDesc = "" +
"\x03Msg\x18\x02 \x01(\tR\x03Msg\x12\x0e\n" +
"\x02Id\x18\x03 \x01(\tR\x02Id\"\"\n" +
"\x10ReqGetFriendCard\x12\x0e\n" +
"\x02Id\x18\x01 \x01(\tR\x02Id\"t\n" +
"\x02Id\x18\x01 \x01(\tR\x02Id\"\x8a\x01\n" +
"\x10ResGetFriendCard\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\x12\x16\n" +
"\x06CardId\x18\x04 \x01(\x05R\x06CardId\"\x10\n" +
"\x06CardId\x18\x04 \x01(\x05R\x06CardId\x12\x14\n" +
"\x05Emoji\x18\x05 \x01(\x05R\x05Emoji\"\x10\n" +
"\x0eReqGetGoldCard\"8\n" +
"\x0eResGetGoldCard\x12\x12\n" +
"\x04Four\x18\x01 \x01(\x05R\x04Four\x12\x12\n" +