diff --git a/protocol/userProxy.proto b/protocol/userProxy.proto index 8ebe490958d38e339f742989a18dfe2c6aee9eeb..906b1d6d7006f76584df467f9e8e162481cc893d 100644 --- a/protocol/userProxy.proto +++ b/protocol/userProxy.proto @@ -462,16 +462,5 @@ message MicUserData { uint32 svipLevel = 12; string micEffect = 14; string headwearIcon = 15; -} - -message CvSvip { - int32 svipLevel = 1; - repeated CVSvipPrivilege privileges = 2; -} - -message CVSvipPrivilege { - int32 type = 1; - bool canSwitch = 2; - bool userSwitch = 3; - string mysteryCode = 4; + Svip svip = 16; } \ No newline at end of file diff --git a/rpc/user_center_func.go b/rpc/user_center_func.go index a82efea6525bb2423f1ed06af8a8caffe29e3a60..3b0af2bb3de1faa8f8c5dfaeeaff8c722f7e275b 100644 --- a/rpc/user_center_func.go +++ b/rpc/user_center_func.go @@ -402,7 +402,7 @@ func SendSvipUpgrade(nick, avatar string, svipLevel uint32, txGroupId string) er // 发送socket的麦位变化 func SendSocketMicChange(seqId string, userId uint64, externalId, txGroupId string, i uint32, lock, forbid, micForbid bool, agoraId uint32, micUserId uint64, micUserExternalId string, avatar, nick string, sex uint32, code string, isVip bool, noble uint32, headwearPicUrl, headwearEffectUrl, headwearReverseEffectUrl string, - svipLevel uint32, micEffect, headwearIcon string) error { + svipLevel uint32, micEffect, headwearIcon string, svip *userProxy.Svip) error { var msg = &userProxy.GroupMicChange{ SeqId: seqId, GroupId: txGroupId, @@ -428,6 +428,7 @@ func SendSocketMicChange(seqId string, userId uint64, externalId, txGroupId stri SvipLevel: svipLevel, MicEffect: micEffect, HeadwearIcon: headwearIcon, + Svip: svip, }, } if buffer, err := proto.Marshal(msg); err == nil {