111

UnityProject/Assets/AssetRaw/Materials/JDT1.mat

@@ -191,7 +191,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 0
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/Materials/JDT2.mat

@@ -191,7 +191,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 1
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/Materials/JDT4.mat

@@ -191,7 +191,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 0
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/Materials/JDT5.mat

@@ -191,7 +191,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 1
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/Materials/JDT9.mat

@@ -191,7 +191,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 0
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/UI/GiftItem.prefab

@@ -34749,6 +34749,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6403937887474270162}
+  - component: {fileID: 7200052204214008222}
   m_Layer: 5
   m_Name: GiftItem
   m_TagString: Untagged
@@ -34777,6 +34778,23 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7200052204214008222
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5218893830113109492}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2fe018f56f652bf42830caed28789cef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_GiftName: {fileID: 4498083401356541153}
+  m_InfoTex: {fileID: 2874010131932181680}
+  m_NumTex: {fileID: 1816369889891508950}
+  m_HeadIcon: {fileID: 2011421134320649736}
+  m_GiftIcon: {fileID: 2335167136819988394}
 --- !u!1 &5934200575477332767
 GameObject:
   m_ObjectHideFlags: 0

UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab

@@ -2305,6 +2305,7 @@ RectTransform:
   - {fileID: 3586785766027361055}
   - {fileID: 245133209852100473}
   - {fileID: 6282578790962902355}
+  - {fileID: 6805953989209425366}
   - {fileID: 2729579121250304069}
   m_Father: {fileID: 2338385386102721414}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2841,6 +2842,42 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5702767750423085930
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6805953989209425366}
+  m_Layer: 5
+  m_Name: m_rect_GiftPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6805953989209425366
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5702767750423085930}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4655219308374456140}
+  m_Father: {fileID: 1508900408836313865}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.0012207, y: 0.0020752}
+  m_SizeDelta: {x: 1080, y: 2340.6}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5818212637391323579
 GameObject:
   m_ObjectHideFlags: 0
@@ -3719,3 +3756,109 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &1749071072740984990
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 6805953989209425366}
+    m_Modifications:
+    - target: {fileID: 5218893830113109492, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_Name
+      value: GiftItem
+      objectReference: {fileID: 0}
+    - target: {fileID: 5218893830113109492, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+--- !u!224 &4655219308374456140 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+  m_PrefabInstance: {fileID: 1749071072740984990}
+  m_PrefabAsset: {fileID: 0}

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

@@ -45,6 +45,7 @@ namespace GameLogic
     public class GiftItemData
     {
         public int giftId;
+        public int num;
         public ProtCustMessageData m_ProtCustMessageData; // 玩家基本数据
     }
 

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

@@ -282,6 +282,7 @@ namespace GameLogic
             GiftItemData giftItemData = new GiftItemData()
             {
                 giftId = giftConfig.Id,
+                num = num,
                 m_ProtCustMessageData = unitPlayerData.protCustMessageData
             };
 
@@ -441,11 +442,11 @@ namespace GameLogic
             }
 
 
-            if (giftConfig.Id != 1)
+            //if (giftConfig.Id != 1)
-            {
+            //{
-                // 发送玩家送礼事件
+            //    // 发送玩家送礼事件
-                GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num);
+            //    GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num);
-            }
+            //}
 
 
             // 每次积分变动

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

@@ -21,6 +21,7 @@ namespace GameLogic
         private Button m_btnRank;
         private RectTransform m_rectHPanel;
         private GameObject m_itemActorHItem;
+        private RectTransform m_rect_GiftPanel;
         protected override void ScriptGenerator()
         {
             m_tmpTimer = FindChildComponent<TextMeshProUGUI>("Bg/Top/TopImg/m_tmpTimer");
@@ -30,6 +31,7 @@ namespace GameLogic
             m_btnRank = FindChildComponent<Button>("Bg/Top/m_btnRank");
             m_rectHPanel = FindChildComponent<RectTransform>("Bg/Main/m_rectHPanel");
             m_itemActorHItem = FindChild("Bg/Main/m_rectHPanel/m_itemActorHItem").gameObject;
+            m_rect_GiftPanel = FindChildComponent<RectTransform>("Bg/m_rect_GiftPanel");
             m_btnSetting.onClick.AddListener(OnClickSettingBtn);
             m_btnRank.onClick.AddListener(OnClickRankBtn);
         }
@@ -183,12 +185,12 @@ namespace GameLogic
 
         private async void AddGiftMessageFunc(UnitPlayerData unitPlayerData, GiftConfig giftConfig, int num)
         {
-            //var giftItem = GameObject.Instantiate(m_rect_GiftPanel.transform.GetChild(0));
+            var giftItem = GameObject.Instantiate(m_rect_GiftPanel.transform.GetChild(0));
-            //giftItem.transform.SetParent(m_rect_GiftPanel);
+            giftItem.transform.SetParent(m_rect_GiftPanel);
-            //giftItem.transform.localScale = Vector3.one;
+            giftItem.transform.localScale = Vector3.one;
-            //giftItem.transform.localPosition = Vector3.zero;
+            giftItem.transform.localPosition = Vector3.zero;
-            //giftItem.gameObject.SetActive(true);
+            giftItem.gameObject.SetActive(true);
-            //giftItem.GetComponent<UIGiftItem>().OnInit(unitPlayerData, giftConfig, num);
+            giftItem.GetComponent<UIGiftItem>().OnInit(unitPlayerData, giftConfig, num);
 
 
             //// 生成飘屏

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

@@ -14,12 +14,12 @@ namespace GameLogic
     {
         // Start is called before the first frame update
 
-        public TextMeshProUGUI m_Name;
+        public TextMeshProUGUI m_GiftName;
         public TextMeshProUGUI m_InfoTex;
         public TextMeshProUGUI m_NumTex;
         public RawImage m_HeadIcon;
         public Image m_GiftIcon;
-        public Image m_Group;
+        //public Image m_Group;
 
 
         public async void OnInit(UnitPlayerData unitPlayerData, GiftConfig giftConfig, int num)
@@ -27,9 +27,9 @@ namespace GameLogic
             // 随机播放
             GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物UI弹窗" + Random.Range(1, 5));
 
-            m_Group.sprite = GameModule.Resource.LoadAsset<Sprite>("Z_lw_t_box_" + (giftConfig.Id - 1));
+            //m_Group.sprite = GameModule.Resource.LoadAsset<Sprite>("Z_lw_t_box_" + (giftConfig.Id - 1));
 
-            m_Name.text = unitPlayerData.protCustMessageData.nickName;
+            m_GiftName.text = unitPlayerData.protCustMessageData.nickName;
             AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, m_HeadIcon);
             StartCoroutine(ScrollNumber(num)); // Start the number scrolling coroutine
             m_InfoTex.text = "送" + giftConfig.Name;

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

@@ -7,6 +7,7 @@ using Cysharp.Threading.Tasks;
 using System.Collections.Generic;
 using YooAsset;
 using GameConfig.giftConfig;
+using System;
 
 namespace GameLogic
 {
@@ -45,7 +46,7 @@ namespace GameLogic
             m_VideoPlayer.loopPointReached += HiddenVideoPlay;
 
             var videoClip = GameModule.Resource.LoadAsset<VideoClip>(videoName);
-            
+
             //string audioName = "礼物" + (giftItemData.giftId - 1);
             //// 播放音效
             //GameModule.Audio.Play(TEngine.AudioType.UISound, audioName, false, 0.5f, true);
@@ -63,9 +64,19 @@ namespace GameLogic
         {
             await UniTask.Delay(2000);
             m_VideoPlayer.targetTexture.DiscardContents();
-             GameModule.UI.CloseUI<UIVipLiWuHongItem>();
+            GameModule.UI.CloseUI<UIVipLiWuHongItem>();
             //GameModule.UI.CloseUI<UIVipItem_Old>();
             //GameModule.UI.ShowUI<UIVipItem>(UserDatas);
+
+            GiftItemData giftItemData = UserData as GiftItemData;
+            var giftConfig = ConfigSystem.Instance.Tables.TbGiftConfig.Get(giftItemData.giftId);
+            var data = DataGameSceneManager.Instance.GetUnitPlayerData(giftItemData.m_ProtCustMessageData.openId);
+            //var go = GameModule.Resource.LoadGameObject("GiftItem");
+            //go.GetComponent<UIGiftItem>().OnInit(data, giftConfig, giftItemData.num);
+
+            // 发送玩家送礼事件
+            GameEvent.Send(EventConts.AddGiftMessage, data, giftConfig, giftItemData.num);
+
         }
 
         private void HiddenVideoPlay(VideoPlayer player)