【游戏服】修改抖单礼物触发逻辑

Config/Proto/OuterMessage_C_10001.proto

@@ -374,6 +374,9 @@ message G2C_LikeInfoPush // IActorMessage
 message G2C_GiftInfoPush // IActorMessage
 {
 	string NickName = 1;	// 昵称
-	string GiftType = 2;	// 礼物类型
-	int64 GiftNum = 3;		// 数量
+	string Url = 2;			// 头像url
+	int32 GiftType = 3;		// 礼物类型
+	int32 GiftNum = 4;		// 数量
+	int32 TotalMoney = 5;	// 刷礼物总钱数：分
+	int32 UnitId = 6;		// 单位objectId
 }

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

@@ -15,48 +15,66 @@ namespace ET.Server
 
             if (map == null)
             {
-                Log.Debug($"未找到房间...roomId={request.RoomId}");
+                Log.Error($"未找到房间...roomId={request.RoomId}");
                 return;
             }
 
             Struct.UnitPlayerData unitPlayerData = map.GetUnitPlayerData(request.OpenId);
-
             // 数据是否存在
             if (unitPlayerData == null)
             {
-                Log.Debug($"未找到单位玩家数据...openId={request.OpenId}");
+                Log.Error($"未找到单位玩家数据...openId={request.OpenId}");
                 return;
             }
 
+            unitPlayerData.GiftMoney += (int)request.GiftValue;
+
+            // 推送客户端
+            if (map.Player != null)
+            {
+                MessageHelper.SendToClient(map.Player, new G2C_GiftInfoPush { NickName = request.NickName, GiftType = DouyinItem.GiftHash[request.GiftId],
+                    GiftNum = (int)request.GiftNum, Url = "", TotalMoney = unitPlayerData.GiftMoney, UnitId = unitPlayerData.ObjId});
+            }
+
             Struct.TriggerEventNotify notify = null;
+            if (request.GiftId == DouyinItem.GiftId_1)
+            {
+                //TODO:复活合适的人
+                map.GetXmdsManager().notifyBattleServer(map.Id.ToString(), NotifyBSName.TriggerEvent, JsonSerializer.Serialize(new Struct.TriggerEventNotify()
+                {
+                    message = BattleNotify.TiktokGift_1.ToString(),
+                    TriggerUnits = unitPlayerData.ObjId.ToString()
+                })) ;
+                return;
+            }
+            else if(request.GiftId == DouyinItem.GiftId_10)
+            {
+                //TODO:复活合适的人
+                map.GetXmdsManager().notifyBattleServer(map.Id.ToString(), NotifyBSName.TriggerEvent, JsonSerializer.Serialize(new Struct.TriggerEventNotify()
+                {
+                    message = BattleNotify.TiktokGift_10.ToString(),
+                    TriggerUnits = unitPlayerData.ObjId.ToString()
+                }));
+                return;
+            }
 
             for (int i = 0; i < request.GiftNum; i++)
             {
                 switch (request.GiftId)
                 {
-                    case DouyinItem.GiftId_1:
-                        // 仙女棒
-                        notify = new Struct.TriggerEventNotify();
-                        notify.message = BattleNotify.TiktokGift_1.ToString();
-                        notify.TriggerUnits = unitPlayerData.ObjId.ToString();
-                        break;
-                    case DouyinItem.GiftId_10:
-                        // 能量药丸
-                        notify = new Struct.TriggerEventNotify();
-                        notify.message = BattleNotify.TiktokGift_10.ToString();
-                        notify.TriggerUnits = unitPlayerData.ObjId.ToString();
-                        break;
                     case DouyinItem.GiftId_52:
                         // 甜甜圈
                         const long maxLevel = 3; // 等级上限
-                        long level = unitPlayerData.Level + request.GiftNum;
-                        if (level >= maxLevel)
+                        notify = new Struct.TriggerEventNotify();
+                        if (unitPlayerData.Level < maxLevel)
                         {
-                            level = maxLevel;
+                            ++unitPlayerData.Level;
+                            notify.message = BattleNotify.TiktokGift_52.ToString();
+                        }
+                        else
+                        {
+                            notify.message = BattleNotify.TiktokGift_52_ext.ToString();
                         }
-                        unitPlayerData.Level = level;
-                        notify = new Struct.TriggerEventNotify();
-                        notify.message = level < 3? BattleNotify.TiktokGift_52.ToString() : BattleNotify.TiktokGift_52_ext.ToString();
                         notify.TriggerUnits = unitPlayerData.ObjId.ToString();
                         break;
                     case DouyinItem.GiftId_99:
@@ -80,15 +98,9 @@ namespace ET.Server
                 }
 
                 map.GetXmdsManager().notifyBattleServer(map.Id.ToString(), NotifyBSName.TriggerEvent, JsonSerializer.Serialize(notify));
+                //间隔30ms，触发一次礼物效果
+                await TimerComponent.Instance.WaitAsync(30);
             }
-
-            // 推送客户端
-            if (map.Player != null)
-            {
-                MessageHelper.SendToClient(map.Player, new G2C_GiftInfoPush{ NickName = request.NickName, GiftType = notify.message, GiftNum = request.GiftNum});
-            }
-
-            await ETTask.CompletedTask;
         }
     }
 }

DotNet/Model/Const/ConstGame.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace ET.Server
@@ -53,6 +54,15 @@ namespace ET.Server
         public const string GiftId_199 = "gx7pmjQfhBaDOG2XkWI2peZ66YFWkCWRjZXpTqb23O/epru+sxWyTV/3Ufs=";
         /** 520抖：神秘空投 **/
         public const string GiftId_520 = "pGLo7HKNk1i4djkicmJXf6iWEyd+pfPBjbsHmd3WcX0Ierm2UdnRR7UINvI=";
+
+        public static Dictionary<string, int> GiftHash = new() {
+            { DouyinItem.GiftId_1, 1 },
+            { DouyinItem.GiftId_10, 2 },
+            { DouyinItem.GiftId_52, 3 },
+            { DouyinItem.GiftId_99, 4 },
+            { DouyinItem.GiftId_199, 5 },
+            { DouyinItem.GiftId_520, 6 }
+        };
     }
 
     /** 通知战斗事件信息 */

DotNet/Model/Const/Struct.cs

@@ -281,6 +281,9 @@
             /** 场景 **/
             public Map Map { get; set; }
 
+            //礼物用钱总数，单位:分
+            public int GiftMoney = 0;
+
             public UnitPlayerData()
             {
             }

DotNet/Model/Generate/Message/OuterMessage_C_10001.cs

@@ -769,10 +769,19 @@ namespace ET
 		public string NickName { get; set; }
 
 		[ProtoMember(2)]
-		public string GiftType { get; set; }
+		public string Url { get; set; }
 
 		[ProtoMember(3)]
-		public long GiftNum { get; set; }
+		public int GiftType { get; set; }
+
+		[ProtoMember(4)]
+		public int GiftNum { get; set; }
+
+		[ProtoMember(5)]
+		public int TotalMoney { get; set; }
+
+		[ProtoMember(6)]
+		public int UnitId { get; set; }
 
 	}