Cjw/Zqdn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-05-26 23:06:25 +08:00
parent 6014884981
commit 01b2efc69e
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UnityProject/Assets/AssetRaw/UI/GiftItem.prefab
View File

@ -24582,7 +24582,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 16777215 rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -29735,7 +29735,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 16777215 rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -34793,6 +34793,7 @@ MonoBehaviour:
m_GiftName: {fileID: 4498083401356541153} m_GiftName: {fileID: 4498083401356541153}
m_InfoTex: {fileID: 2874010131932181680} m_InfoTex: {fileID: 2874010131932181680}
m_NumTex: {fileID: 1816369889891508950} m_NumTex: {fileID: 1816369889891508950}
m_tmpTeamName: {fileID: 3204217026467600319}
m_HeadIcon: {fileID: 2011421134320649736} m_HeadIcon: {fileID: 2011421134320649736}
m_GiftIcon: {fileID: 2335167136819988394} m_GiftIcon: {fileID: 2335167136819988394}
--- !u!1 &5934200575477332767 --- !u!1 &5934200575477332767
@ -39927,7 +39928,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 16244570 rgba: 4294434650
m_fontColor: {r: 0.3529412, g: 0.8745099, b: 0.9686275, a: 1} m_fontColor: {r: 0.3529412, g: 0.8745099, b: 0.9686275, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -40107,7 +40108,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 16777215 rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -45285,7 +45286,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 8119294 rgba: 4286309374
m_fontColor: {r: 0.9960785, g: 0.89019614, b: 0.48235297, a: 1} m_fontColor: {r: 0.9960785, g: 0.89019614, b: 0.48235297, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3
@ -45465,7 +45466,7 @@ MonoBehaviour:
m_fontMaterials: [] m_fontMaterials: []
m_fontColor32: m_fontColor32:
serializedVersion: 2 serializedVersion: 2
rgba: 16777215 rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0 m_enableVertexGradient: 0
m_colorMode: 3 m_colorMode: 3

9
UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
View File

@ -77,9 +77,12 @@ namespace GameLogic
m_imgSign.sprite = GameModule.Resource.LoadAsset<Sprite>("zjm_mz_" + assetsId); m_imgSign.sprite = GameModule.Resource.LoadAsset<Sprite>("zjm_mz_" + assetsId);
m_imgValue.sprite = GameModule.Resource.LoadAsset<Sprite>("zjm_jdt_" + assetsId); m_imgValue.sprite = GameModule.Resource.LoadAsset<Sprite>("zjm_jdt_" + assetsId);
m_imgValue.material = GameModule.Resource.LoadAsset<Material>("JDT" + assetsId); m_imgValue.material = GameModule.Resource.LoadAsset<Material>("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(); m_tmpAllValue.text = m_AllPush.ToString();
// 播放序列图,通过Gpu的形式 // 播放序列图,通过Gpu的形式
LoadTextureMatRes(textureId + 1); LoadTextureMatRes(textureId + 1);
} }
@ -341,8 +344,8 @@ namespace GameLogic
buff.m_EffectGo = eGo; buff.m_EffectGo = eGo;
Log.Debug(eGo.gameObject.activeInHierarchy); //Log.Debug(eGo.gameObject.activeInHierarchy);
Log.Debug("生成Buff特效:" + giftConfig.EffectName); //Log.Debug("生成Buff特效:" + giftConfig.EffectName);
} }
/// <summary> /// <summary>

3
UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
View File

@ -127,6 +127,9 @@ namespace GameLogic
teamId = targetId.ToString() teamId = targetId.ToString()
}; };
//Log.Debug("玩家加入阵营id: " + targetId);
if (string.IsNullOrEmpty(protCustMessageData.imgURL)) if (string.IsNullOrEmpty(protCustMessageData.imgURL))
{ {
protCustMessageData.imgURL = EventConts.TestPlayerUrl; protCustMessageData.imgURL = EventConts.TestPlayerUrl;

3
UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGiftItem.cs
View File

@ -17,6 +17,7 @@ namespace GameLogic
public TextMeshProUGUI m_GiftName; public TextMeshProUGUI m_GiftName;
public TextMeshProUGUI m_InfoTex; public TextMeshProUGUI m_InfoTex;
public TextMeshProUGUI m_NumTex; public TextMeshProUGUI m_NumTex;
public TextMeshProUGUI m_tmpTeamName;
public RawImage m_HeadIcon; public RawImage m_HeadIcon;
public Image m_GiftIcon; public Image m_GiftIcon;
//public Image m_Group; //public Image m_Group;
@ -28,7 +29,7 @@ namespace GameLogic
//GameModule.Audio.Play(TEngine.AudioType.UISound, "礼物UI弹窗" + Random.Range(1, 5)); //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_tmpTeamName.text = DataGameSceneManager.Instance.GetStrs(int.Parse(unitPlayerData.teamId));
m_GiftName.text = unitPlayerData.protCustMessageData.nickName; m_GiftName.text = unitPlayerData.protCustMessageData.nickName;
AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, m_HeadIcon); AsyncImageDownload.Instance.SetAsyncImage(unitPlayerData.protCustMessageData.imgURL, m_HeadIcon);
StartCoroutine(ScrollNumber(num)); // Start the number scrolling coroutine StartCoroutine(ScrollNumber(num)); // Start the number scrolling coroutine

5
UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIJiaRuItem.cs
View File

@ -21,7 +21,10 @@ namespace GameLogic
public async Task OnInit(UnitPlayerData unitPlayerData) public async Task OnInit(UnitPlayerData unitPlayerData)
{ {
m_PlayerName.text = unitPlayerData.protCustMessageData.nickName; 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); await UniTask.Delay(2000);