|
@@ -2,6 +2,7 @@ using UI.RoleInfo;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using FairyGUI;
|
|
using FairyGUI;
|
|
using UI.CommonGame;
|
|
using UI.CommonGame;
|
|
|
|
+using UnityEngine;
|
|
|
|
|
|
namespace GFGGame
|
|
namespace GFGGame
|
|
{
|
|
{
|
|
@@ -51,9 +52,9 @@ namespace GFGGame
|
|
RoleInfoManager.Instance.SortHeadDatas();
|
|
RoleInfoManager.Instance.SortHeadDatas();
|
|
RoleInfoManager.Instance.SortHeadBorderDatas();
|
|
RoleInfoManager.Instance.SortHeadBorderDatas();
|
|
_headCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEAD));
|
|
_headCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEAD));
|
|
- _headCfgs = SoreItemCfgDatas(_headCfgs);
|
|
|
|
|
|
+ _headCfgs = SortItemCfgDatas(_headCfgs);
|
|
_headBorderCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEADBORDER));
|
|
_headBorderCfgs.AddRange(ItemCfgArray.Instance.GetCfgsByitemTypeAndsubType(ConstItemType.HEAD, ConstItemSubType.ROLE_HEADBORDER));
|
|
- _headBorderCfgs = SoreItemCfgDatas(_headBorderCfgs);
|
|
|
|
|
|
+ _headBorderCfgs = SortItemCfgDatas(_headBorderCfgs);
|
|
OnTabChange();
|
|
OnTabChange();
|
|
// _ui.m_list.selectedIndex = 0;
|
|
// _ui.m_list.selectedIndex = 0;
|
|
// _ui.m_listBorder.selectedIndex = 0;
|
|
// _ui.m_listBorder.selectedIndex = 0;
|
|
@@ -102,6 +103,11 @@ namespace GFGGame
|
|
|
|
|
|
private void RenderListItem(int index, GObject obj)
|
|
private void RenderListItem(int index, GObject obj)
|
|
{
|
|
{
|
|
|
|
+ if (index >= _headCfgs.Count)
|
|
|
|
+ {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
int headId = _headCfgs[index].id;
|
|
int headId = _headCfgs[index].id;
|
|
UI_ListHeadItem item = UI_ListHeadItem.Proxy(obj);
|
|
UI_ListHeadItem item = UI_ListHeadItem.Proxy(obj);
|
|
item.m_loaIcon.url = ResPathUtil.GetHeadPath(_headCfgs[index].res);
|
|
item.m_loaIcon.url = ResPathUtil.GetHeadPath(_headCfgs[index].res);
|
|
@@ -118,8 +124,14 @@ namespace GFGGame
|
|
item.target.data = headId;
|
|
item.target.data = headId;
|
|
UI_ListHeadItem.ProxyEnd();
|
|
UI_ListHeadItem.ProxyEnd();
|
|
}
|
|
}
|
|
|
|
+
|
|
private void RenderListBorderItem(int index, GObject obj)
|
|
private void RenderListBorderItem(int index, GObject obj)
|
|
{
|
|
{
|
|
|
|
+ if (index >= _headBorderCfgs.Count)
|
|
|
|
+ {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headId);
|
|
ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headId);
|
|
ItemCfg borderCfg = _headBorderCfgs[index];
|
|
ItemCfg borderCfg = _headBorderCfgs[index];
|
|
int headBorderId = borderCfg.id;
|
|
int headBorderId = borderCfg.id;
|
|
@@ -194,7 +206,7 @@ namespace GFGGame
|
|
_ui.m_txtDesc.text = headBorderCfg.desc;
|
|
_ui.m_txtDesc.text = headBorderCfg.desc;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- private List<ItemCfg> SoreItemCfgDatas(List<ItemCfg> list)
|
|
|
|
|
|
+ private List<ItemCfg> SortItemCfgDatas(List<ItemCfg> list)
|
|
{
|
|
{
|
|
list.Sort((ItemCfg a, ItemCfg b) =>
|
|
list.Sort((ItemCfg a, ItemCfg b) =>
|
|
{
|
|
{
|