From cf128700a4f197dd6765eb0d6e8a0febbfff624b Mon Sep 17 00:00:00 2001 From: Yuntao Hu <695250295@qq.com> Date: Wed, 26 Mar 2025 12:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=8C=A5=E5=AE=98=E9=98=B5=E5=AE=B9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/ShowAllCharacter/CharacterDataInfo.cs | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/ShowAllCharacter/CharacterDataInfo.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/ShowAllCharacter/CharacterDataInfo.cs index 33dbb3d19fe..ad73fd5aa22 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/ShowAllCharacter/CharacterDataInfo.cs +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/ShowAllCharacter/CharacterDataInfo.cs @@ -214,45 +214,51 @@ public class CharacterDataInfoManager : Singlenton, II public List GetCommanderProvideJobs(uint id) { var jobs = new List(); + DataCharacterAttri cfg = null; if (DataDic.TryGetValue(id, out var characterDataInfo)) { - if (characterDataInfo.Cfg.Job != Ejob.Job_Commander) - { - DebugUtil.LogError("该角色不为指挥官{0}", id); - return jobs; - } - var provideJobs = characterDataInfo.Cfg.ProvideJob; - if (provideJobs.Length == 0) - { - DebugUtil.LogError("该指挥官{0}推荐职位为空", id); - return jobs; - } - - var vehicleList = new List(); - var characterList = new List(); - - foreach (var job in provideJobs) - { - if (job == ProvideJob.ProvideJob_None) - { - DebugUtil.LogError("该指挥官{0}配置的推荐职业包含空"); - continue; - } - - if (job == ProvideJob.ProvideJob_Vehicle) - { - vehicleList.Add(job); - } - else - { - characterList.Add(job); - } - - } - jobs.AddRange(vehicleList); - jobs.AddRange(characterList); + cfg = characterDataInfo.Cfg; + } + else + { + cfg = TableManager.Instance.Tables.CharacterAttri.GetOrDefault((int)id); } + if (cfg.Job != Ejob.Job_Commander) + { + DebugUtil.LogError("该角色不为指挥官{0}", id); + return jobs; + } + var provideJobs = cfg.ProvideJob; + if (provideJobs.Length == 0) + { + DebugUtil.LogError("该指挥官{0}推荐职位为空", id); + return jobs; + } + + var vehicleList = new List(); + var characterList = new List(); + + foreach (var job in provideJobs) + { + if (job == ProvideJob.ProvideJob_None) + { + DebugUtil.LogError("该指挥官{0}配置的推荐职业包含空"); + continue; + } + + if (job == ProvideJob.ProvideJob_Vehicle) + { + vehicleList.Add(job); + } + else + { + characterList.Add(job); + } + + } + jobs.AddRange(vehicleList); + jobs.AddRange(characterList); return jobs; }