From 01b2efc69e535484b390fbb0b5cb142712dfc254 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Mon, 26 May 2025 23:06:25 +0800 Subject: [PATCH] 1 --- UnityProject/Assets/AssetRaw/UI/GiftItem.prefab | 13 +++++++------ .../HotFix/GameLogic/Actor/ActorHItem.cs | 9 ++++++--- .../GameLogic/Manager/DataGameSceneManager.cs | 3 +++ .../GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs | 3 ++- .../GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs | 5 ++++- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab b/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab index 856c9059..161dbf21 100644 --- a/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab +++ b/UnityProject/Assets/AssetRaw/UI/GiftItem.prefab @@ -24582,7 +24582,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 16777215 + rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -29735,7 +29735,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 16777215 + rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -34793,6 +34793,7 @@ MonoBehaviour: m_GiftName: {fileID: 4498083401356541153} m_InfoTex: {fileID: 2874010131932181680} m_NumTex: {fileID: 1816369889891508950} + m_tmpTeamName: {fileID: 3204217026467600319} m_HeadIcon: {fileID: 2011421134320649736} m_GiftIcon: {fileID: 2335167136819988394} --- !u!1 &5934200575477332767 @@ -39927,7 +39928,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 16244570 + rgba: 4294434650 m_fontColor: {r: 0.3529412, g: 0.8745099, b: 0.9686275, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -40107,7 +40108,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 16777215 + rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -45285,7 +45286,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 8119294 + rgba: 4286309374 m_fontColor: {r: 0.9960785, g: 0.89019614, b: 0.48235297, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -45465,7 +45466,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 16777215 + rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 22e611f2..69d21d04 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -77,9 +77,12 @@ namespace GameLogic m_imgSign.sprite = GameModule.Resource.LoadAsset("zjm_mz_" + assetsId); m_imgValue.sprite = GameModule.Resource.LoadAsset("zjm_jdt_" + assetsId); m_imgValue.material = GameModule.Resource.LoadAsset("JDT" + assetsId); - m_tmpSign.text = DataGameSceneManager.Instance.m_Strs[i]; + //m_tmpSign.text = DataGameSceneManager.Instance.m_Strs[i]; + m_tmpSign.text = DataGameSceneManager.Instance.GetStrs(m_Index); m_tmpAllValue.text = m_AllPush.ToString(); + + // 播放序列图,通过Gpu的形式 LoadTextureMatRes(textureId + 1); } @@ -341,8 +344,8 @@ namespace GameLogic buff.m_EffectGo = eGo; - Log.Debug(eGo.gameObject.activeInHierarchy); - Log.Debug("生成Buff特效:" + giftConfig.EffectName); + //Log.Debug(eGo.gameObject.activeInHierarchy); + //Log.Debug("生成Buff特效:" + giftConfig.EffectName); } /// diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 213a2a90..4f707add 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -127,6 +127,9 @@ namespace GameLogic teamId = targetId.ToString() }; + + //Log.Debug("玩家加入阵营id: " + targetId); + if (string.IsNullOrEmpty(protCustMessageData.imgURL)) { protCustMessageData.imgURL = EventConts.TestPlayerUrl; diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs index 365f13c2..08501ca6 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs @@ -17,6 +17,7 @@ namespace GameLogic public TextMeshProUGUI m_GiftName; public TextMeshProUGUI m_InfoTex; public TextMeshProUGUI m_NumTex; + public TextMeshProUGUI m_tmpTeamName; public RawImage m_HeadIcon; public Image m_GiftIcon; //public Image m_Group; @@ -28,7 +29,7 @@ namespace GameLogic //GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物UI弹窗" + Random.Range(1, 5)); //m_Group.sprite = GameModule.Resource.LoadAsset("Z_lw_t_box_" + (giftConfig.Id - 1)); - + m_tmpTeamName.text = DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId)); m_GiftName.text = unitPlayerData.protCustMessageData.nickName; AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, m_HeadIcon); StartCoroutine(ScrollNumber(num)); // Start the number scrolling coroutine diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs index 8b154be1..0963b919 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs @@ -21,7 +21,10 @@ namespace GameLogic public async Task OnInit(UnitPlayerData unitPlayerData) { m_PlayerName.text = unitPlayerData.protCustMessageData.nickName; - m_Info.text = DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId)); + + //Log.Debug("ҼӪ" + DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId))); + + m_Info.text = DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId) - 1); await UniTask.Delay(2000);