EintooAR/Eintoo
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除收藏数据 不对情况

Browse Source
This commit is contained in:
SnowShow 2025-04-11 18:03:58 +08:00
parent 3748d3e689
commit 7f2f16a6d5
3 changed files with 12 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs
View File

@ -49,26 +49,6 @@ namespace GameLogic
} }
public List<JsonData.QueryCompanyData> GetCompanyListFromIndustry(int industryid)
{
if (m_dataQueryAllCompany != null)
{
// Log.Warning(m_dataQueryAllCompany.data.Count);
var list = m_dataQueryAllCompany.data.FindAll(x => x.industry == industryid);
return list;
}
return null;
}
public List<JsonData.QueryCompanyData> GetAllCompanyListData()
{
if (m_dataQueryAllCompany != null)
{
var list = m_dataQueryAllCompany.data;
return list;
}
return null;
}
} }
} }

79
EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/Scroller/OSA/UICollectWinScrollListAdapter.cs
View File

@ -34,6 +34,7 @@ using frame8.Logic.Misc.Other.Extensions;
using Com.ForbiddenByte.OSA.Core; using Com.ForbiddenByte.OSA.Core;
using Com.ForbiddenByte.OSA.CustomParams; using Com.ForbiddenByte.OSA.CustomParams;
using Com.ForbiddenByte.OSA.DataHelpers; using Com.ForbiddenByte.OSA.DataHelpers;
using Cysharp.Threading.Tasks;
using DG.Tweening; using DG.Tweening;
using GameLogic; using GameLogic;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
@ -62,7 +63,7 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists
public ScrollRect m_topscroll; public ScrollRect m_topscroll;
public Transform m_moveIcon; public Transform m_moveIcon;
public Dictionary<int,List<ProjectData>> m_projectDataDic = new Dictionary<int, List<ProjectData>>(); public Dictionary<int,List<CompanyData>> m_projectDataDic = new Dictionary<int, List<CompanyData>>();
#region OSA implementation #region OSA implementation
protected override void Start() protected override void Start()
{ {
@ -114,6 +115,11 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists
GetCompanyProjectData(); GetCompanyProjectData();
} }
public async UniTaskVoid ConfigAsync()
{
//await
}
#region 滑动定位 #region 滑动定位
protected override void OnEnable() protected override void OnEnable()
@ -336,74 +342,11 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists
public void GetCompanyProjectData() public void GetCompanyProjectData()
{ {
var industryIndex = new int[]
{
2, 3,1,4
};
//所有
List<ProjectData> projectDataListAll = new List<ProjectData>();
for (int i = 0; i < DataConfigSystem.Instance.GetAllCompanyListData().Count; i++)
{
var companyData = DataConfigSystem.Instance.GetAllCompanyListData()[i];
var projectData = DataConfigSystem.Instance.GetProjectData(companyData.companyName);
if (projectData != null)
{
projectDataListAll.Add(projectData);
}
}
m_projectDataDic.Add(0, projectDataListAll);
List<ProjectData> projectDataListxiaofei = new List<ProjectData>();
for (int i = 0; i < DataConfigSystem.Instance.GetCompanyListFromIndustry(2).Count; i++)
{
var companyData = DataConfigSystem.Instance.GetCompanyListFromIndustry(2)[i];
var projectData = DataConfigSystem.Instance.GetProjectData(companyData.companyName);
if (projectData != null)
{
projectDataListxiaofei.Add(projectData);
}
}
m_projectDataDic.Add(1, projectDataListxiaofei);
//智能
List<ProjectData> projectDataListzhineng = new List<ProjectData>();
for (int i = 0; i < DataConfigSystem.Instance.GetCompanyListFromIndustry(3).Count; i++)
{
var companyData = DataConfigSystem.Instance.GetCompanyListFromIndustry(3)[i];
var projectData = DataConfigSystem.Instance.GetProjectData(companyData.companyName);
if(projectData != null)
{
projectDataListzhineng.Add(projectData);
}
}
m_projectDataDic.Add(2, projectDataListzhineng);
//公关服务
List<ProjectData> projectDataListGonggguan = new List<ProjectData>();
for (int i = 0; i < DataConfigSystem.Instance.GetCompanyListFromIndustry(1).Count; i++)
{
var companyData = DataConfigSystem.Instance.GetCompanyListFromIndustry(1)[i];
var projectData = DataConfigSystem.Instance.GetProjectData(companyData.companyName);
if (projectData != null)
{
projectDataListGonggguan.Add(projectData);
}
}
m_projectDataDic.Add(3, projectDataListGonggguan);
//其他
List<ProjectData> projectDataListqita = new List<ProjectData>();
for (int i = 0; i < DataConfigSystem.Instance.GetCompanyListFromIndustry(4).Count; i++)
{
var companyData = DataConfigSystem.Instance.GetCompanyListFromIndustry(4)[i];
var projectData = DataConfigSystem.Instance.GetProjectData(companyData.companyName);
if(projectData != null)
{
projectDataListqita.Add(projectData);
}
}
m_projectDataDic.Add(4, projectDataListqita);
} }

2
EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/UIWinCollectAllCompany.cs
View File

@ -72,7 +72,7 @@ namespace GameLogic
{ {
base.OnCreate(); base.OnCreate();
m_uiCollectWinScrollListAdapter.SetUp(m_scrollRectTopGroup, m_tfShowMoveIcon); m_uiCollectWinScrollListAdapter.SetUp(m_scrollRectTopGroup, m_tfShowMoveIcon);
Log.Debug("所有公司的数量" + DataConfigSystem.Instance.GetAllCompanyListData().Count); //Log.Debug("所有公司的数量" + DataConfigSystem.Instance.GetAllCompanyListData().Count);
AddUIEvent<string>(UIEventCollect_Event.CollectCompany, CollectCompany); AddUIEvent<string>(UIEventCollect_Event.CollectCompany, CollectCompany);
} }