diff --git a/EintooAR/Assets/AssetRaw/UI/AR/Search/UISearchScrollView.prefab b/EintooAR/Assets/AssetRaw/UI/AR/Search/UISearchScrollView.prefab index fad664b7..76ddeda6 100644 --- a/EintooAR/Assets/AssetRaw/UI/AR/Search/UISearchScrollView.prefab +++ b/EintooAR/Assets/AssetRaw/UI/AR/Search/UISearchScrollView.prefab @@ -354,6 +354,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3326037143687747246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4996154618828138962} + - component: {fileID: 6899808792495964410} + - component: {fileID: 6100129919559553961} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4996154618828138962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3326037143687747246} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6416667784294157467} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -2.2, y: -0.000061035156} + m_SizeDelta: {x: -21.8809, y: -24.867798} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6899808792495964410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3326037143687747246} + m_CullTransparentMesh: 1 +--- !u!114 &6100129919559553961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3326037143687747246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5023285269360186550 GameObject: m_ObjectHideFlags: 0 @@ -602,7 +677,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: -20.1019, y: -17} m_Pivot: {x: 1, y: 1} --- !u!222 &6416667783163931862 CanvasRenderer: @@ -886,13 +961,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4996154618828138962} m_Father: {fileID: 8347992031880413858} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -354.35, y: 0.000088692} - m_SizeDelta: {x: 41.3, y: 41.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 68.0517, y: 0} + m_SizeDelta: {x: 60, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6416667784294157465 CanvasRenderer: @@ -915,7 +991,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.27707815, g: 0.25605196, b: 0.3962264, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -932,7 +1008,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 - m_DrawShape: 0 + m_DrawShape: 1 m_ImageType: 0 m_MaterialMode: 0 m_StrokeWidth: 0 @@ -950,8 +1026,8 @@ MonoBehaviour: m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} m_UniformCornerRadius: 0 m_Circle: - m_Radius: 0 - m_FitRadius: 0 + m_Radius: 29.95 + m_FitRadius: 1 m_Pentagon: m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} m_UniformCornerRadius: 0 diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs index 898542ad..726b8482 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/CompanyDataConfigSystem.cs @@ -13,7 +13,7 @@ namespace GameLogic public async UniTask GetSingleProjectAllData(string page, string userCode) { - if (m_dictallProject.TryGetValue(userCode,out var projectData)) + if (m_dictallProject.TryGetValue(userCode, out var projectData)) { return projectData; } @@ -21,12 +21,17 @@ namespace GameLogic var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm); var projectConfigRoot = JsonUtility.FromJson(jsonData); - return GetProjectData(projectConfigRoot.data,userCode); + var projectDataist = GetProjectData(projectConfigRoot.data, userCode); + if (projectDataist.Count > 0) + { + return projectDataist[0]; + } + return null; } public async UniTask GetSingleCompanyAllData(string page, string userCode) { - if (m_dictallProject.TryGetValue(userCode,out var projectData)) + if (m_dictallProject.TryGetValue(userCode, out var projectData)) { return projectData; } @@ -34,9 +39,22 @@ namespace GameLogic var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm); var projectConfigRoot = JsonUtility.FromJson(jsonData); - return GetProjectData(projectConfigRoot.data,userCode); + var projectDataist = GetProjectData(projectConfigRoot.data, userCode); + if (projectDataist.Count > 0) + { + return projectDataist[0]; + } + return null; } + public async UniTask> GetSearchCompanyAllData(string page, string companyName) + { + string jsonParm = $"{{\"companyName\":\"{companyName}\"}}"; + var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm); + Log.Info("jsonData"+jsonData); + var projectConfigRoot = JsonUtility.FromJson(jsonData); + return GetProjectData(projectConfigRoot.data, companyName); + } #region 场景数据 @@ -47,35 +65,35 @@ namespace GameLogic } - public ProjectData GetProjectData(ProjectConfigData projectConfigData,string userCode) + public List GetProjectData(ProjectConfigData projectConfigData, string userCode) { if (projectConfigData.list == null || projectConfigData.list.Count <= 0) { return null; } - var companyUnitData = projectConfigData.list[0]; - var projectListVo = companyUnitData.projectListVo; - - var projectData = new ProjectData(); - - //projectData._currentProjectType = currentProjectType; - projectData._companyName = companyUnitData.userInfoVo.companyName; - projectData._coverAddressNameUrl = companyUnitData.userInfoVo.logoPath; - - // 筛选出 wxProjectType 为 "wxVirtualHall" 的项目 - SetVirtualSceneData(ProjectType.wxVirtualHall, projectListVo, ref projectData); - SetARData(ProjectType.wxPlane, projectListVo, ref projectData); - SetARTrackData(projectData._companyName,ProjectType.wxTrack, projectListVo, ref projectData); - SetARVirtualHumanData(ProjectType.wxVirtualHumans, projectListVo, ref projectData); - if (!m_dictallProject.ContainsKey(userCode)) + List projectDataList = new List(); + foreach (var companyUnitData in projectConfigData.list) { - m_dictallProject.Add(userCode,projectData); + var projectListVo = companyUnitData.projectListVo; + var projectData = new ProjectData(); + //projectData._currentProjectType = currentProjectType; + projectData._companyName = companyUnitData.userInfoVo.companyName; + projectData._coverAddressNameUrl = companyUnitData.userInfoVo.logoPath; + + // 筛选出 wxProjectType 为 "wxVirtualHall" 的项目 + SetVirtualSceneData(ProjectType.wxVirtualHall, projectListVo, ref projectData); + SetARData(ProjectType.wxPlane, projectListVo, ref projectData); + SetARTrackData(projectData._companyName, ProjectType.wxTrack, projectListVo, ref projectData); + SetARVirtualHumanData(ProjectType.wxVirtualHumans, projectListVo, ref projectData); + if (!m_dictallProject.ContainsKey(userCode)) + { + m_dictallProject.Add(userCode, projectData); + } + projectDataList.Add(projectData); } - return projectData; - - return projectData; + return projectDataList; } private static void SetVirtualSceneData(ProjectType currentProjectType, @@ -104,10 +122,11 @@ namespace GameLogic sceneData._sceneCoverhttpName = sceneChild.thumbnailUrl; sceneData.list_players.Add(new PlayerData() { - _playerAddressName = "Player_female", _playerCoverAddressName = "show_car_player_female" + _playerAddressName = "Player_female", + _playerCoverAddressName = "show_car_player_female" }); sceneData.list_players.Add(new PlayerData() - { _playerAddressName = "Player_man", _playerCoverAddressName = "show_car_player_man" }); + { _playerAddressName = "Player_man", _playerCoverAddressName = "show_car_player_man" }); sceneDataList.Add(sceneData); } } @@ -150,12 +169,12 @@ namespace GameLogic } } - private static void SetARTrackData(string userCode,ProjectType currentProjectType, List projectListVo, + private static void SetARTrackData(string userCode, ProjectType currentProjectType, List projectListVo, ref ProjectData projectData) { var projects = projectListVo .FindAll(p => p.wxProjectType == currentProjectType.ToString()); - // Log.Warning($"userCode{userCode} type :{currentProjectType.ToString()} 数量 {projects.Count} "); + // Log.Warning($"userCode{userCode} type :{currentProjectType.ToString()} 数量 {projects.Count} "); if (projects != null) { List arTrackList = new List(); @@ -236,7 +255,7 @@ namespace GameLogic #endregion #region 私有方法 - + #endregion } diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Search/UISearchScrollView.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Search/UISearchScrollView.cs index 2f5e4d7d..2f971be0 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Search/UISearchScrollView.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/UI/Search/UISearchScrollView.cs @@ -7,6 +7,8 @@ using UnityEngine; using UnityEngine.UI; using TEngine; using TMPro; +using System; +using GameConfig.item; namespace GameLogic { @@ -21,7 +23,9 @@ namespace GameLogic private MPImage m_mpimg; private TextMeshProUGUI m_tmptext; private LoopListView m_loopListView; - public List m_datalllist = new List(); + public List m_datalllist = new List(); + + public List m_widgetList = new List(); protected override void ScriptGenerator() { m_btnReturn = FindChildComponent