From 7f2f16a6d573c2df8208916d964c92376c6b4a27 Mon Sep 17 00:00:00 2001 From: SnowShow Date: Fri, 11 Apr 2025 18:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=94=B6=E8=97=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E4=B8=8D=E5=AF=B9=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/System/DataConfigSystem.cs | 20 ----- .../OSA/UICollectWinScrollListAdapter.cs | 79 +++---------------- .../Core/UI/Collect/UIWinCollectAllCompany.cs | 2 +- 3 files changed, 12 insertions(+), 89 deletions(-) diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs index 90db42a7..e7ac2b4d 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/DataConfigSystem.cs @@ -49,26 +49,6 @@ namespace GameLogic } - public List 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 GetAllCompanyListData() - { - if (m_dataQueryAllCompany != null) - { - var list = m_dataQueryAllCompany.data; - return list; - } - - return null; - } } } \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/Scroller/OSA/UICollectWinScrollListAdapter.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/Scroller/OSA/UICollectWinScrollListAdapter.cs index 33a94a79..058b4b85 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/Scroller/OSA/UICollectWinScrollListAdapter.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/Scroller/OSA/UICollectWinScrollListAdapter.cs @@ -34,6 +34,7 @@ using frame8.Logic.Misc.Other.Extensions; using Com.ForbiddenByte.OSA.Core; using Com.ForbiddenByte.OSA.CustomParams; using Com.ForbiddenByte.OSA.DataHelpers; +using Cysharp.Threading.Tasks; using DG.Tweening; using GameLogic; using Sirenix.OdinInspector; @@ -62,7 +63,7 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists public ScrollRect m_topscroll; public Transform m_moveIcon; - public Dictionary> m_projectDataDic = new Dictionary>(); + public Dictionary> m_projectDataDic = new Dictionary>(); #region OSA implementation protected override void Start() { @@ -114,6 +115,11 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists GetCompanyProjectData(); } + public async UniTaskVoid ConfigAsync() + { + //await + } + #region 滑动定位 protected override void OnEnable() @@ -336,74 +342,11 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists public void GetCompanyProjectData() { - - //所有 - List projectDataListAll = new List(); - for (int i = 0; i < DataConfigSystem.Instance.GetAllCompanyListData().Count; i++) + var industryIndex = new int[] { - 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 projectDataListxiaofei = new List(); - 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 projectDataListzhineng = new List(); - 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 projectDataListGonggguan = new List(); - 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 projectDataListqita = new List(); - 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, 3,1,4 + }; + } diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/UIWinCollectAllCompany.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/UIWinCollectAllCompany.cs index f30d9080..8475979e 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/UIWinCollectAllCompany.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Collect/UIWinCollectAllCompany.cs @@ -72,7 +72,7 @@ namespace GameLogic { base.OnCreate(); m_uiCollectWinScrollListAdapter.SetUp(m_scrollRectTopGroup, m_tfShowMoveIcon); - Log.Debug("所有公司的数量" + DataConfigSystem.Instance.GetAllCompanyListData().Count); + //Log.Debug("所有公司的数量" + DataConfigSystem.Instance.GetAllCompanyListData().Count); AddUIEvent(UIEventCollect_Event.CollectCompany, CollectCompany); }