加入弹窗

UnityProject/Assets/AssetRaw/UI/UIVipItem.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 9136506616039880762}
   - component: {fileID: 907474280966644842}
   m_Layer: 5
-  m_Name: PM_Number
+  m_Name: m_tmp_Rank
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5100,7 +5100,7 @@ GameObject:
   - component: {fileID: 1603582538889798982}
   - component: {fileID: 7891726384730975023}
   m_Layer: 5
-  m_Name: Image
+  m_Name: m_rimg_HeadIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -10179,7 +10179,7 @@ GameObject:
   - component: {fileID: 9035899966516326780}
   - component: {fileID: 6180167452070864614}
   m_Layer: 5
-  m_Name: ID
+  m_Name: m_tmp_PlayerName
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -10280,8 +10280,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 32
+  m_fontSize: 24
-  m_fontSizeBase: 32
+  m_fontSizeBase: 24
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -10296,7 +10296,7 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
@@ -35009,12 +35009,12 @@ GameObject:
   - component: {fileID: 8997989560146772876}
   - component: {fileID: 3575311121033102508}
   m_Layer: 5
-  m_Name: 03
+  m_Name: m_rect_TimeLine03
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8997989560146772876
 RectTransform:
   m_ObjectHideFlags: 0
@@ -35291,7 +35291,7 @@ GameObject:
   - component: {fileID: 7921321665628193302}
   - component: {fileID: 3576351324262396925}
   m_Layer: 5
-  m_Name: 01
+  m_Name: m_rect01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -45270,7 +45270,7 @@ GameObject:
   - component: {fileID: 6242149794619379595}
   - component: {fileID: 6264713696634169991}
   m_Layer: 5
-  m_Name: 02
+  m_Name: m_rect02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -45487,12 +45487,12 @@ GameObject:
   - component: {fileID: 8472543145270315664}
   - component: {fileID: 7574707965444657956}
   m_Layer: 5
-  m_Name: 02
+  m_Name: m_rect_TimeLine02
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8472543145270315664
 RectTransform:
   m_ObjectHideFlags: 0
@@ -50781,12 +50781,12 @@ GameObject:
   - component: {fileID: 1984246984317795703}
   - component: {fileID: 1871371636471753402}
   m_Layer: 5
-  m_Name: 04
+  m_Name: m_rect04
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1984246984317795703
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60730,7 +60730,7 @@ GameObject:
   - component: {fileID: 5224227303389847359}
   - component: {fileID: 558673429895571218}
   m_Layer: 5
-  m_Name: Team
+  m_Name: m_tmp_TeamName
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -70961,7 +70961,7 @@ GameObject:
   - component: {fileID: 5206471435674762503}
   - component: {fileID: 6863913548056458271}
   m_Layer: 5
-  m_Name: 04
+  m_Name: m_rect_TimeLine04
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -91316,7 +91316,7 @@ GameObject:
   - component: {fileID: 6592289490347217633}
   - component: {fileID: 5145315332710563967}
   m_Layer: 5
-  m_Name: 03
+  m_Name: m_rect03
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -91377,12 +91377,12 @@ GameObject:
   - component: {fileID: 3315927530222063376}
   - component: {fileID: 7160933718492582463}
   m_Layer: 5
-  m_Name: 01
+  m_Name: m_rect_TimeLine01
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3315927530222063376
 RectTransform:
   m_ObjectHideFlags: 0
@@ -96498,6 +96498,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1490517477202741167}
+  - component: {fileID: 8143589470409357485}
   m_Layer: 5
   m_Name: UIVipItem
   m_TagString: Untagged
@@ -96520,11 +96521,34 @@ RectTransform:
   - {fileID: 644667076968463174}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: -980, y: -2240}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &8143589470409357485
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8653166542089597484}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1 &8851136756280992009
 GameObject:
   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: 1
+    - _Alpha: 0.6370627
     - _Light: 1
     - _QueueControl: 0
     - _QueueOffset: 0

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

@@ -2,49 +2,105 @@ using UnityEngine;
 using UnityEngine.UI;
 using TEngine;
 using Cysharp.Threading.Tasks;
+using TMPro;
 
 namespace GameLogic
 {
-	[Window(UILayer.UI)]
+    [Window(UILayer.UI)]
-	class UIVipItem : UIWindow
+    class UIVipItem : UIWindow
-	{
+    {
-		#region 脚本工具生成的代码
+        #region 脚本工具生成的代码
-		private Image m_img_Icon;
+        private RawImage m_rimg_HeadIcon;
-		private Text m_text_Name;
+        private RectTransform m_rect01;
-		private Text m_text_topRank;
+        private RectTransform m_rect02;
-		protected override void ScriptGenerator()
+        private RectTransform m_rect03;
-		{
+        private RectTransform m_rect04;
-			m_img_Icon = FindChildComponent<Image>("HeadItem/m_img_Icon");
+        private TextMeshProUGUI m_tmp_Rank;
-			m_text_Name = FindChildComponent<Text>("m_text_Name");
+        private TextMeshProUGUI m_tmp_TeamName;
-			m_text_topRank = FindChildComponent<Text>("m_text_topRank");
+        private TextMeshProUGUI m_tmp_PlayerName;
-		}
+        private RectTransform m_rect_TimeLine01;
-		#endregion
+        private RectTransform m_rect_TimeLine02;
+        private RectTransform m_rect_TimeLine03;
+        private RectTransform m_rect_TimeLine04;
+        protected override void ScriptGenerator()
+        {
+            m_rimg_HeadIcon = FindChildComponent<RawImage>("SJRC/TX/m_rimg_HeadIcon");
+            m_rect01 = FindChildComponent<RectTransform>("SJRC/m_rect01");
+            m_rect02 = FindChildComponent<RectTransform>("SJRC/m_rect02");
+            m_rect03 = FindChildComponent<RectTransform>("SJRC/m_rect03");
+            m_rect04 = FindChildComponent<RectTransform>("SJRC/m_rect04");
+            m_tmp_Rank = FindChildComponent<TextMeshProUGUI>("SJRC/m_tmp_Rank");
+            m_tmp_TeamName = FindChildComponent<TextMeshProUGUI>("SJRC/m_tmp_TeamName");
+            m_tmp_PlayerName = FindChildComponent<TextMeshProUGUI>("SJRC/m_tmp_PlayerName");
+            m_rect_TimeLine01 = FindChildComponent<RectTransform>("SJRC/Timeline/m_rect_TimeLine01");
+            m_rect_TimeLine02 = FindChildComponent<RectTransform>("SJRC/Timeline/m_rect_TimeLine02");
+            m_rect_TimeLine03 = FindChildComponent<RectTransform>("SJRC/Timeline/m_rect_TimeLine03");
+            m_rect_TimeLine04 = FindChildComponent<RectTransform>("SJRC/Timeline/m_rect_TimeLine04");
+        }
+        #endregion
 
-		#region 事件
+        #region 事件
-		#endregion
+        #endregion
 
 
-		protected async override void OnCreate()
+        protected async override void OnCreate()
-		{
+        {
-			base.OnCreate();
+            base.OnCreate();
 
-			VipItemData giftItemData = UserData as VipItemData;
+            VipItemData giftItemData = UserData as VipItemData;
-			if (giftItemData == null)
+            if (giftItemData == null)
-			{
+            {
-				GameModule.UI.CloseUI<UIVipItem>();
+                GameModule.UI.CloseUI<UIVipItem>();
-				return;
+                return;
-			}
+            }
-			if (giftItemData.m_ProtCustMessageData.imgURL != string.Empty)
+            if (giftItemData.m_ProtCustMessageData.imgURL != string.Empty)
-			{
+            {
-				AsyncImageDownload.Instance.SetAsyncImage(giftItemData.m_ProtCustMessageData.imgURL, m_img_Icon);
+                AsyncImageDownload.Instance.SetAsyncImage(giftItemData.m_ProtCustMessageData.imgURL, m_rimg_HeadIcon);
-			}
+            }
 
-			m_text_Name.text = UITool.ConvertName(giftItemData.m_ProtCustMessageData.nickName);
+            m_tmp_PlayerName.text = UITool.ConvertName(giftItemData.m_ProtCustMessageData.nickName);
-			m_text_topRank.text = giftItemData.m_RankNum.ToString();
+            m_tmp_Rank.text = giftItemData.m_RankNum.ToString();
+            var data = DataGameSceneManager.Instance.GetUnitPlayerData(giftItemData.m_ProtCustMessageData.openId);
+            if (data != null)
+            {
+                m_tmp_TeamName.text = DataGameSceneManager.Instance.GetStrs(int.Parse(data.teamId) - 1);
+            }
 
-			await UniTask.Delay(4000);
+            m_rect01.gameObject.SetActive(false);
-			GameModule.UI.CloseUI<UIVipItem>();
+            m_rect02.gameObject.SetActive(false);
-		}
+            m_rect03.gameObject.SetActive(false);
+            m_rect04.gameObject.SetActive(false);
+            m_rect_TimeLine01.gameObject.SetActive(false);
+            m_rect_TimeLine02.gameObject.SetActive(false);
+            m_rect_TimeLine03.gameObject.SetActive(false);
+            m_rect_TimeLine04.gameObject.SetActive(false);
 
-	}
+
+            if (giftItemData.m_RankNum == 1)
+            {
+                m_rect01.gameObject.SetActive(true);
+                m_rect_TimeLine01.gameObject.SetActive(true);
+            }
+            else if (giftItemData.m_RankNum == 2)
+            {
+                m_rect02.gameObject.SetActive(true);
+                m_rect_TimeLine02.gameObject.SetActive(true);
+            }
+            else if (giftItemData.m_RankNum == 3)
+            {
+                m_rect03.gameObject.SetActive(true);
+                m_rect_TimeLine03.gameObject.SetActive(true);
+            }
+            else
+            {
+                m_rect04.gameObject.SetActive(true);
+                m_rect_TimeLine04.gameObject.SetActive(true);
+
+            }
+
+            await UniTask.Delay(4000);
+            GameModule.UI.CloseUI<UIVipItem>();
+        }
+
+    }
 }

UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIWindow.cs

@@ -419,7 +419,7 @@ namespace TEngine
             _canvas = _panel.GetComponent<Canvas>();
             if (_canvas == null)
             {
-                throw new Exception($"Not found {nameof(Canvas)} in panel {WindowName}");
+                throw new Exception($"Not found {nameof(Canvas)} in panel {WindowName} {panel.name}");
             }
 
             _canvas.overrideSorting = true;