点赞

UnityProject/Assets/AssetRaw/UI/UIDianZanItem.prefab

@@ -134,7 +134,7 @@ GameObject:
   - component: {fileID: 7511310185787727501}
   - component: {fileID: 7290082953466709855}
   m_Layer: 5
-  m_Name: ID
+  m_Name: m_tmp_PlayerName
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -289,7 +289,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5848586857130893629}
   m_Layer: 5
-  m_Name: DZ
+  m_Name: UIDianZanItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab

@@ -37358,6 +37358,7 @@ RectTransform:
   - {fileID: 6805953989209425366}
   - {fileID: 2729579121250304069}
   - {fileID: 2161047130895777792}
+  - {fileID: 4562045038044513515}
   - {fileID: 1439052953720149583}
   - {fileID: 1774168000858424399}
   - {fileID: 6349199766664341784}
@@ -98468,6 +98469,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1508900408836313865}
     m_Modifications:
+    - target: {fileID: 1692405933705303185, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2086495790586595751, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -98556,6 +98565,14 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7153298816184537644, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8974151139768587644, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -99069,6 +99086,112 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3}
   m_PrefabInstance: {fileID: 7773043956047322897}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &7955038133814568406
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1508900408836313865}
+    m_Modifications:
+    - target: {fileID: 1628715804799990733, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_Name
+      value: m_rect_Dz
+      objectReference: {fileID: 0}
+    - target: {fileID: 1628715804799990733, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+--- !u!224 &4562045038044513515 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3}
+  m_PrefabInstance: {fileID: 7955038133814568406}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8070411266750871969
 PrefabInstance:
   m_ObjectHideFlags: 0

UnityProject/Assets/AssetRaw/ZQDN/FX/Shaders/Shader Graphs_nao.mat

@@ -41,7 +41,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.24063015
+    - _Alpha: 1
     - _Light: 1
     - _QueueControl: 0
     - _QueueOffset: 0

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs

@@ -73,6 +73,7 @@ namespace GameLogic
         public const string SwitchTeamId = "SwitchTeamId";
         public const string HuangJinGameEnd = "HuangJinGameEnd";
         public const string GuanJunShiKe = "GuanJunShiKe";
+        public const string UIDianZan = "UIDianZan";
         #endregion
 
 

UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs

@@ -219,37 +219,7 @@ namespace GameLogic
 
             if (data == null)
             {
-
                 Log.Error("玩家 {0} 没有加入过阵营,无法点赞", protCustMessageData.openId);
-
-                //data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData);
-                //// 二次容错
-                //if (data == null)
-                //{
-                //    return;
-                //}
-
-                //// 随机落座
-                //if (EventConts.gameStateType == GameStateType.团队赛)
-                //{
-                //    int targetId = Random.Range(1, EventConts.MaxPlayerIds);
-                //    Actor actor1 = DataGameSceneManager.Instance.GetTeamActor((targetId - 1).ToString());
-                //    if (actor1 == null)
-                //    {
-                //        Log.Error("没有获取到实体玩家,tid = {0}", targetId);
-                //        return;
-                //    }
-                //    actor1.AddUnitPlayer(data);
-                //}
-                //else if (EventConts.gameStateType == GameStateType.个人赛)
-                //{
-                //    var actor2 = DataGameSceneManager.Instance.GetTeamActor(data.teamId);
-                //    if (actor2 == null)
-                //    {
-                //        actor2 = DataGameSceneManager.Instance.CraeteTeamActor(data);
-                //        actor2.AddUnitPlayer(data);
-                //    }
-                //}
             }
             else
             {
@@ -269,6 +239,8 @@ namespace GameLogic
                     //Log.Debug("点赞:" + data.teamId);
                     DataGameSceneManager.Instance.OnGiftFunc(giftConfig, int.Parse(protCustMessageData.Count), data);
 
+                    GameEvent.Send(EventConts.UIDianZan, data.protCustMessageData.nickName);
+
                     if (DataGameSceneManager.Instance.isLiShiShiJian)
                     {
                         DataGameSceneManager.Instance.m_LiShiShiJianLikeCount += int.Parse(protCustMessageData.Count);

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIDianZanItem.cs

@@ -0,0 +1,41 @@
+using UnityEngine;
+using UnityEngine.UI;
+using TEngine;
+using TMPro;
+using System.Threading.Tasks;
+using Cysharp.Threading.Tasks;
+
+namespace GameLogic
+{
+    [Window(UILayer.UI)]
+    class UIDianZanItem : UIWidget
+    {
+        #region 脚本工具生成的代码
+        private TextMeshProUGUI m_tmp_PlayerName;
+        protected override void ScriptGenerator()
+        {
+            m_tmp_PlayerName = FindChildComponent<TextMeshProUGUI>("Icon/m_tmp_PlayerName");
+        }
+        #endregion
+
+        #region 事件
+        #endregion
+
+        public void OnInit(string nickname)
+        {
+            if (!string.IsNullOrEmpty(nickname))
+            {
+                m_tmp_PlayerName.text = nickname;
+                UniTask.Delay(3000).ContinueWith(() => { Destroy(); });
+
+            }
+            else
+            {
+                Debug.LogError("m_tmp_PlayerName is null");
+                Destroy();
+            }
+
+        }
+
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIDianZanItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f8a34cad44bb7349a3e89abb6a336d9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs

@@ -37,6 +37,8 @@ namespace GameLogic
         private TextMeshProUGUI m_tmpCount;
         private RawImage m_rimg_ViewTexture;
         private VideoPlayer m_video_Video;
+        private RectTransform m_rect_Dz;
+        private TextMeshProUGUI m_tmp_dzPlayer;
         private RectTransform m_rectGjsk;
         private Image m_img_HuangJinShiDai;
         private Text m_textHuangJinInfo;
@@ -69,6 +71,8 @@ namespace GameLogic
             m_tmpCount = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpCount");
             m_rimg_ViewTexture = FindChildComponent<RawImage>("Bg/BattleBg/m_rimg_ViewTexture");
             m_video_Video = FindChildComponent<VideoPlayer>("Bg/BattleBg/m_video_Video");
+            m_rect_Dz = FindChildComponent<RectTransform>("Bg/m_rect_Dz");
+            m_tmp_dzPlayer = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_Dz/Icon/m_tmp_dzPlayer");
             m_rectGjsk = FindChildComponent<RectTransform>("Bg/m_rectGjsk");
             m_img_HuangJinShiDai = FindChildComponent<Image>("Bg/m_img_HuangJinShiDai");
             m_textHuangJinInfo = FindChildComponent<Text>("Bg/m_img_HuangJinShiDai/m_textHuangJinInfo");
@@ -83,7 +87,6 @@ namespace GameLogic
             m_btn_StartBtn.onClick.AddListener(OnClick_StartBtnBtn);
         }
         #endregion
-
         #region 事件
         private void OnClick_StartBtnBtn()
         {
@@ -253,6 +256,7 @@ namespace GameLogic
             GameEvent.AddEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
             GameEvent.AddEventListener(EventConts.HuangJinGameEnd, HuangJinGameEndFunc);
             GameEvent.AddEventListener(EventConts.GuanJunShiKe, GuanJunShiKeFunc);
+            GameEvent.AddEventListener<string>(EventConts.UIDianZan, UIDianZanFunc);
             GameEvent.AddEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
         }
 
@@ -266,9 +270,14 @@ namespace GameLogic
             GameEvent.RemoveEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
             GameEvent.RemoveEventListener(EventConts.HuangJinGameEnd, HuangJinGameEndFunc);
             GameEvent.RemoveEventListener(EventConts.GuanJunShiKe, GuanJunShiKeFunc);
+            GameEvent.RemoveEventListener<string>(EventConts.UIDianZan, UIDianZanFunc);
             GameEvent.RemoveEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
         }
 
+        private void UIDianZanFunc(string nickName)
+        {
+            CreateWidgetByPrefab<UIDianZanItem>(m_rect_Dz.gameObject).OnInit(nickName);
+        }
 
         private void GuanJunShiKeFunc()
         {