【优化】礼物推送增加礼物类型

Config/Proto/OuterMessage_C_10001.proto

@@ -374,5 +374,6 @@ message G2C_LikeInfoPush // IActorMessage
 message G2C_GiftInfoPush // IActorMessage
 {
 	string NickName = 1;	// 昵称
-	int64 GiftNum = 2;		// 数量
+	string GiftType = 2;	// 礼物类型
+	int64 GiftNum = 3;		// 数量
 }

DotNet/Hotfix/Scenes/Game/GameDouyinComponentSystem.cs

@@ -13,6 +13,7 @@ namespace ET.Server
         {
             protected override void Awake(GameDouyinComponent self)
             {
+                self.InitAccessToken();
             }
         }
 
@@ -94,14 +95,14 @@ namespace ET.Server
         /// <returns></returns>
         public static JObject GetRoomInfo(this GameDouyinComponent self, string token)
         {
-            if (string.IsNullOrEmpty(self.AccessToken))
+            if (string.IsNullOrEmpty(self.AccessToken.Trim()))
             {
                 Log.Error($"InitRoomId...AccessToken为null");
                 return null;
             }
             // 请求头
             Dictionary<string, string> head = new Dictionary<string, string>();
-            head.Add("X-Token", self.AccessToken);
+            head.Add("X-Token", self.AccessToken.Trim());
             // 参数
             JObject param = new JObject();
             param.Add("token", token);

DotNet/Hotfix/Scenes/Game/Handler/C2G_LoginGameHandler.cs

@@ -43,6 +43,14 @@ namespace ET.Server
             {
                 JObject roomInfo = scene.GetComponent<GameDouyinComponent>().GetRoomInfo(request.Token.Trim());
 
+                if (roomInfo == null)
+                {
+                    Log.Debug($"获取抖音roomInfo失败...");
+                    response.Error = ErrorCode.ERR_RoomInfoError;
+                    reply();
+                    return;
+                }
+
                 playerInfo.RoomId = Convert.ToInt64(roomInfo.SelectToken("data").SelectToken("info").SelectToken("room_id"));
                 playerInfo.AnchorOpenId = Convert.ToString(roomInfo.SelectToken("data").SelectToken("info").SelectToken("anchor_open_id"));
                 playerInfo.AvatarUrl = Convert.ToString(roomInfo.SelectToken("data").SelectToken("info").SelectToken("avatar_url"));

DotNet/Hotfix/Scenes/Game/Handler/R2G_LiveGiftHandler.cs

@@ -85,7 +85,7 @@ namespace ET.Server
             // 推送客户端
             if (map.Player != null)
             {
-                MessageHelper.SendToClient(map.Player, new G2C_GiftInfoPush{ NickName = request.NickName, GiftNum = request.GiftNum});
+                MessageHelper.SendToClient(map.Player, new G2C_GiftInfoPush{ NickName = request.NickName, GiftType = notify.message, GiftNum = request.GiftNum});
             }
 
             await ETTask.CompletedTask;

DotNet/Model/Generate/Message/OuterMessage_C_10001.cs

@@ -769,6 +769,9 @@ namespace ET
 		public string NickName { get; set; }
 
 		[ProtoMember(2)]
+		public string GiftType { get; set; }
+
+		[ProtoMember(3)]
 		public long GiftNum { get; set; }
 
 	}

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_10001.cs

@@ -769,6 +769,9 @@ namespace ET
 		public string NickName { get; set; }
 
 		[ProtoMember(2)]
+		public string GiftType { get; set; }
+
+		[ProtoMember(3)]
 		public long GiftNum { get; set; }
 
 	}

Unity/Assets/Scripts/Codes/Model/Share/Module/Message/ErrorCode.cs

@@ -57,8 +57,8 @@
         public const int ERR_PlayerAlreadyLoggedInElsewhere = 200022;
         /** 创建单位玩家有误 **/
         public const int ERR_CreateUnitPlayerError = 200023;
-        /** 直播间id为空 **/
-        public const int ERR_RoomIdIsNull = 200024;
+        /** 获取抖音roomInfo失败 **/
+        public const int ERR_RoomInfoError = 200024;
 
         public enum EnterMap
         {