Compare commits
No commits in common. "f644edadc42250062f510df757a287a3d748f1f2" and "efa5a3c5e31b1798b6dd780aa9390fd443ca4735" have entirely different histories.
f644edadc4
...
efa5a3c5e3
@ -338,7 +338,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 1
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
@ -378,7 +378,6 @@ GameObject:
|
|||||||
- component: {fileID: 1915876869541640623}
|
- component: {fileID: 1915876869541640623}
|
||||||
- component: {fileID: 7277770534815806214}
|
- component: {fileID: 7277770534815806214}
|
||||||
- component: {fileID: 5964642934946449171}
|
- component: {fileID: 5964642934946449171}
|
||||||
- component: {fileID: 5887092968505518654}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Right
|
m_Name: Right
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -444,22 +443,6 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
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
|
--- !u!1 &3408871029033640143
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -760,9 +743,8 @@ GameObject:
|
|||||||
- component: {fileID: 826586917723392204}
|
- component: {fileID: 826586917723392204}
|
||||||
- component: {fileID: 1954549762747143972}
|
- component: {fileID: 1954549762747143972}
|
||||||
- component: {fileID: 2228057524689582266}
|
- component: {fileID: 2228057524689582266}
|
||||||
- component: {fileID: 4892270682288098217}
|
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: ObjBg
|
m_Name: Bg
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@ -809,7 +791,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_RaycastTarget: 0
|
m_RaycastTarget: 1
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
m_Maskable: 1
|
m_Maskable: 1
|
||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
@ -822,22 +804,6 @@ MonoBehaviour:
|
|||||||
y: 0
|
y: 0
|
||||||
width: 1
|
width: 1
|
||||||
height: 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
|
--- !u!1 &6831573971870136393
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1001,10 +967,8 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 2922fa71b7d60e942b5b06b785dc37c0, type: 3}
|
m_Script: {fileID: 11500000, guid: 2922fa71b7d60e942b5b06b785dc37c0, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
Right: {fileID: 5964642934946449171}
|
|
||||||
Scroll: {fileID: 4147329925826600491}
|
Scroll: {fileID: 4147329925826600491}
|
||||||
Content: {fileID: 7417210800730282872}
|
Content: {fileID: 7417210800730282872}
|
||||||
ObjBg: {fileID: 2228057524689582266}
|
|
||||||
DeviceRawImage: {fileID: 7397484820841873523}
|
DeviceRawImage: {fileID: 7397484820841873523}
|
||||||
ItemPrefab: {fileID: 1826394720132835709}
|
ItemPrefab: {fileID: 1826394720132835709}
|
||||||
--- !u!1 &7986150287571393044
|
--- !u!1 &7986150287571393044
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 65 KiB |
8
Assets/Scripts/UI/UI3DObjShow.Designer.cs
generated
8
Assets/Scripts/UI/UI3DObjShow.Designer.cs
generated
@ -5,20 +5,16 @@ using QFramework;
|
|||||||
|
|
||||||
namespace QFramework.Example
|
namespace QFramework.Example
|
||||||
{
|
{
|
||||||
// Generate Id:1419ca94-de6c-4a9d-9a3d-b2f838aea3ba
|
// Generate Id:5590b0b6-d056-4a95-a14d-4e5b14aedaac
|
||||||
public partial class UI3DObjShow
|
public partial class UI3DObjShow
|
||||||
{
|
{
|
||||||
public const string Name = "UI3DObjShow";
|
public const string Name = "UI3DObjShow";
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
public UnityEngine.UI.Image Right;
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public UnityEngine.UI.ScrollRect Scroll;
|
public UnityEngine.UI.ScrollRect Scroll;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public RectTransform Content;
|
public RectTransform Content;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public UnityEngine.UI.RawImage ObjBg;
|
|
||||||
[SerializeField]
|
|
||||||
public UnityEngine.UI.RawImage DeviceRawImage;
|
public UnityEngine.UI.RawImage DeviceRawImage;
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public UnityEngine.UI.Image ItemPrefab;
|
public UnityEngine.UI.Image ItemPrefab;
|
||||||
@ -27,10 +23,8 @@ namespace QFramework.Example
|
|||||||
|
|
||||||
protected override void ClearUIComponents()
|
protected override void ClearUIComponents()
|
||||||
{
|
{
|
||||||
Right = null;
|
|
||||||
Scroll = null;
|
Scroll = null;
|
||||||
Content = null;
|
Content = null;
|
||||||
ObjBg = null;
|
|
||||||
DeviceRawImage = null;
|
DeviceRawImage = null;
|
||||||
ItemPrefab = null;
|
ItemPrefab = null;
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,6 @@ using System.Collections.Generic;
|
|||||||
using TMPro;
|
using TMPro;
|
||||||
using GCSeries.Core;
|
using GCSeries.Core;
|
||||||
using UnityEngine.EventSystems;
|
using UnityEngine.EventSystems;
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace QFramework.Example
|
namespace QFramework.Example
|
||||||
{
|
{
|
||||||
@ -83,14 +82,8 @@ namespace QFramework.Example
|
|||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
loader.LoadAsync(() =>
|
loader.LoadAsync();
|
||||||
{
|
|
||||||
Right.gameObject.SetActive(mData.datas.Count > 1);
|
|
||||||
Content.GetChild(0).GetComponent<Toggle>().isOn = true;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected override void OnShow()
|
protected override void OnShow()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user