From 6b9e9fe041cbfaa913af482ad4d3b4dd2f23578c Mon Sep 17 00:00:00 2001
From: hujiebin <iamhujiebin@users.noreply.github.com>
Date: Mon, 25 Sep 2023 15:56:09 +0800
Subject: [PATCH] Update userProxy.proto

---
 protocol/userProxy.proto | 103 ++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 61 deletions(-)

diff --git a/protocol/userProxy.proto b/protocol/userProxy.proto
index 906b1d6..ba94893 100644
--- a/protocol/userProxy.proto
+++ b/protocol/userProxy.proto
@@ -86,7 +86,6 @@ message MatchConfirm {
     uint32 remoteAgoraId = 6;
     uint32 callDuration = 7;
     uint32 localAgoraId = 8;
-    uint32 diamondBalance = 9;
     string matchUniqueId = 10;
     uint32 failType = 11;
 }
@@ -97,62 +96,6 @@ message CallReady {
     uint64 endTimestamp = 2;
     uint64 callDuration = 3;
     string channelId = 4;
-    uint64 remainDiamond = 5;
-}
-
-/* id == 103 礼物加时 */
-message AddTimeGift {
-    uint32 giftId = 1;
-    string token = 2;
-    uint32 duration = 3;
-    uint64 endTimestamp = 4;
-    string channelId = 5;
-    bool isSender = 6;
-    uint32 giftNum = 7;
-    string iconUrl = 8;
-    string svgaUrl = 9;
-    string senderAvatar = 10;
-    string receiverAvatar = 11;
-}
-
-/* id == 104 免费加时 */
-message AddTimeFree {
-    string token = 1;
-    uint32 duration = 2;
-    uint64 endTimestamp = 3;
-    string channelId = 4;
-    uint32 senderAgoraId = 5;
-}
-
-/* id == 105 退出 */
-message ConnectsQuit {
-    uint64 from_user_id = 1;
-}
-
-/* id == 106 连接状态 */
-message ConnectStatus {
-    uint64 from_user_id = 1;
-    float user_diamonds = 2;
-    bool diamonds_enough = 3;
-}
-
-/* id == 107 ??? */
-message ConnectsCall {
-    uint64 from_user_id = 1;
-    string rong_room_name = 2;
-    bool is_join = 3;
-}
-
-/* id == 108 */
-message ConnectCommon {
-    string rong_room_name = 1;
-    uint64 from_user_id = 2;
-    string extra = 3;
-    string message = 4;
-}
-
-/* id == 109 召回授权弹框 */
-message RecallWindow {
 }
 
 /* id == 110 | 132 视频发送 status:(1:接收到邀请, 2:接收到对方同意, 3:双方拒绝（还没接通）, 4：对方挂断（接通后）diamondBalance 只有status=2,才出现)*/
@@ -165,17 +108,19 @@ message Video {
     string sendUserId = 6;
     string receiveUserId = 7;
     uint32 status = 8;
-    uint32 diamondBalance = 9;
     User sendUser = 10;
 }
 
+/* id == 109 召回授权弹框 */
+message RecallWindow {
+}
+
 /* id == 111 视频通话准备 */
 message VideoCallReady {
     uint64 startTimestamp = 1;
     uint64 endTimestamp = 2;
     uint64 callDuration = 3;
     string channelId = 4;
-    uint64 remainDiamond = 5;
 }
 
 /* id == 112 互相喜欢 */
@@ -213,6 +158,7 @@ message GlobalGiftBanner {
     uint32 bannerType = 14; // 类型：0.普通礼物 1.cp直接送礼 2.cp告白礼物
     uint32 cpLevel = 15; // cp等级
     string receiveUserAvatar = 16;
+    uint32 nobleLevel = 17; // 贵族等级
 }
 
 /* id == 116 横幅的回应，用来测量RTT */
@@ -289,6 +235,7 @@ message GlobalBroadcast {
     string msg = 6;
     string groupId = 7;
     uint32 senderNobleLevel = 8;
+    bool isPinned = 9;
 }
 
 /* id == 124 全球消息 */
@@ -322,13 +269,11 @@ message VideoTimeMinuteSuccess {
     uint32 senderAgoraId = 5;
     string videoUniqueId = 6;
     bool isSend = 7;
-    uint32 sendRemainDiamond = 8;
 }
 
 /* id == 129 1对1视频1分钟加时询问检查 */
 message VideoTimeMinuteCheck {
     string videoUniqueId = 1;
-    uint32 diamond = 2;
     string uuid = 3;
 }
 
@@ -369,6 +314,7 @@ message GlobalGameBanner {
     uint64 diamond = 4;
     string bannerUrl = 5;
     uint64 gameId = 6; // 1.ludo 2.uno 3.dice 4.lucky wheel 5.lucky box 6.fruit 7.slot
+    bool isPink = 7; // 是否粉钻
 }
 
 /* id == 147 羊羊匹配成功 */
@@ -377,6 +323,11 @@ message SheepMatchSuccess {
     User user = 2;
     User otherUser = 3;
     uint64 game_id = 4;
+    string channelId = 5;
+    string token = 6;
+    uint32 agoraId = 7;
+    uint32 provider = 8;
+    uint32 otherAgoraId = 9;
 }
 
 message SheepGamePlayer {
@@ -463,4 +414,34 @@ message MicUserData {
     string micEffect = 14;
     string headwearIcon = 15;
     Svip svip = 16;
+}
+
+/* id == 157 游戏大厅匹配成功 */
+message LobbyMatchSuccess {
+    uint64 game_id = 1;
+    uint64 mode = 2;
+    string group_id = 3;
+    User user = 4;
+    User otherUser = 5;
+    string gameCode = 6;
+}
+
+/* id == 158 H5游戏静音 */
+message H5GameVoiceMute {
+}
+
+/* id == 159 H5游戏打开语音 */
+message H5GameVoiceUnMute {
+}
+
+/* id == 160 退出房间 */
+message QuitRoom {
+    uint32 reason = 1; // 原因1.被拉黑；2.被踢出
+    string group_id = 2;
+}
+
+/* id == 161 国家管理员横幅 */
+message GlobalCountryMgrBanner {
+    string country = 1; // 国家
+    User user = 2; // 用户信息
 }
\ No newline at end of file
-- 
2.22.0