diff --git a/Assets/Art/UIPrefab/UI3DObjShow.prefab b/Assets/Art/UIPrefab/UI3DObjShow.prefab index 06410a52..b6e0a459 100644 --- a/Assets/Art/UIPrefab/UI3DObjShow.prefab +++ b/Assets/Art/UIPrefab/UI3DObjShow.prefab @@ -338,7 +338,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -378,6 +378,7 @@ GameObject: - component: {fileID: 1915876869541640623} - component: {fileID: 7277770534815806214} - component: {fileID: 5964642934946449171} + - component: {fileID: 5887092968505518654} m_Layer: 0 m_Name: Right m_TagString: Untagged @@ -443,6 +444,22 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5887092968505518654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587529206278800681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.Image --- !u!1 &3408871029033640143 GameObject: m_ObjectHideFlags: 0 @@ -743,8 +760,9 @@ GameObject: - component: {fileID: 826586917723392204} - component: {fileID: 1954549762747143972} - component: {fileID: 2228057524689582266} + - component: {fileID: 4892270682288098217} m_Layer: 0 - m_Name: Bg + m_Name: ObjBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -791,7 +809,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -804,6 +822,22 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!114 &4892270682288098217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6704188004419676826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3} + m_Name: + m_EditorClassIdentifier: + MarkType: 0 + CustomComponentName: + CustomComment: + mComponentName: UnityEngine.UI.RawImage --- !u!1 &6831573971870136393 GameObject: m_ObjectHideFlags: 0 @@ -967,8 +1001,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2922fa71b7d60e942b5b06b785dc37c0, type: 3} m_Name: m_EditorClassIdentifier: + Right: {fileID: 5964642934946449171} Scroll: {fileID: 4147329925826600491} Content: {fileID: 7417210800730282872} + ObjBg: {fileID: 2228057524689582266} DeviceRawImage: {fileID: 7397484820841873523} ItemPrefab: {fileID: 1826394720132835709} --- !u!1 &7986150287571393044 diff --git a/Assets/Scripts/UI/UI3DObjShow.Designer.cs b/Assets/Scripts/UI/UI3DObjShow.Designer.cs index 5c81badf..d47d23c8 100644 --- a/Assets/Scripts/UI/UI3DObjShow.Designer.cs +++ b/Assets/Scripts/UI/UI3DObjShow.Designer.cs @@ -5,16 +5,20 @@ using QFramework; namespace QFramework.Example { - // Generate Id:5590b0b6-d056-4a95-a14d-4e5b14aedaac + // Generate Id:1419ca94-de6c-4a9d-9a3d-b2f838aea3ba public partial class UI3DObjShow { public const string Name = "UI3DObjShow"; + [SerializeField] + public UnityEngine.UI.Image Right; [SerializeField] public UnityEngine.UI.ScrollRect Scroll; [SerializeField] public RectTransform Content; [SerializeField] + public UnityEngine.UI.RawImage ObjBg; + [SerializeField] public UnityEngine.UI.RawImage DeviceRawImage; [SerializeField] public UnityEngine.UI.Image ItemPrefab; @@ -23,8 +27,10 @@ namespace QFramework.Example protected override void ClearUIComponents() { + Right = null; Scroll = null; Content = null; + ObjBg = null; DeviceRawImage = null; ItemPrefab = null; diff --git a/Assets/Scripts/UI/UI3DObjShow.cs b/Assets/Scripts/UI/UI3DObjShow.cs index 8c01c049..c4058761 100644 --- a/Assets/Scripts/UI/UI3DObjShow.cs +++ b/Assets/Scripts/UI/UI3DObjShow.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using TMPro; using GCSeries.Core; using UnityEngine.EventSystems; +using System; namespace QFramework.Example { @@ -82,8 +83,14 @@ namespace QFramework.Example }); } - loader.LoadAsync(); + loader.LoadAsync(() => + { + Right.gameObject.SetActive(mData.datas.Count > 1); + Content.GetChild(0).GetComponent().isOn = true; + }); } + + protected override void OnShow() { }