UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wsh
2025-05-29 01:27:15 +09:00
parent 31ec8e39b1 1bedfd565e
commit a332f6782f
10 changed files with 894 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Image/UI/Panel_ObjectDetails/IMG_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

15
Assets/Image/UI/Panel_ObjectDetails/Item.png.meta → Assets/Image/UI/Panel_ObjectDetails/IMG_background.png.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 04d5bf3075524784aacfee0819b03873
guid: 443b36cbe45187148ba8c17b337e1dc7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -93,19 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []

BIN
Assets/Image/UI/Panel_ObjectDetails/Item.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

18
Assets/Prefabs/AAA/Panel_AssetLibrary.prefab
View File

@@ -1018,7 +1018,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 5808496954263173159}
m_Direction: 2
m_Value: 0
m_Size: 0.99999654
m_Size: 0.9999817
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -1062,8 +1062,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -398.88998}
m_SizeDelta: {x: 420, y: 797.78}
m_AnchoredPosition: {x: 210, y: -408.97}
m_SizeDelta: {x: 420, y: 817.93}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7966294254755768478
CanvasRenderer:
@@ -1741,7 +1741,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -0.00034048597, y: -0.000008776059}
m_AnchoredPosition: {x: -0.00034048597, y: 0.009771946}
m_SizeDelta: {x: 282.99957, y: 2}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2780744526690132257
@@ -1925,7 +1925,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7484356029459005624}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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
@@ -1937,8 +1937,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -95}
m_SizeDelta: {x: 420, y: 890}
m_AnchoredPosition: {x: 0, y: -77.5}
m_SizeDelta: {x: 420, y: 925}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &4816600667775265712
MonoBehaviour:
@@ -2202,8 +2202,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -491.10995}
m_SizeDelta: {x: 420, y: 797.78}
m_AnchoredPosition: {x: 210, y: -501.18732}
m_SizeDelta: {x: 420, y: 817.9348}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5930958411786542109
MonoBehaviour:

30
Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab
View File

@@ -922,11 +922,11 @@ RectTransform:
- {fileID: 8087868963247660372}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 400, y: 820}
m_Pivot: {x: 1, y: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -77.5}
m_SizeDelta: {x: 420, y: 925}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &3204440169533292654
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -7814,10 +7814,10 @@ RectTransform:
- {fileID: 7371513793317205394}
m_Father: {fileID: 3139464284964212418}
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: -200, y: 0}
m_SizeDelta: {x: 100, y: 40}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -20}
m_SizeDelta: {x: 140, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3283633643606947265
CanvasRenderer:
@@ -8042,8 +8042,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 200, y: 0}
m_SizeDelta: {x: 400, y: 40}
m_AnchoredPosition: {x: 209, y: 0}
m_SizeDelta: {x: 418, y: 40}
m_Pivot: {x: 0.5, y: 1}
--- !u!1 &6269277020008061638
GameObject:
@@ -8419,10 +8419,10 @@ RectTransform:
- {fileID: 3808403507287603347}
m_Father: {fileID: 3139464284964212418}
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: -99, y: 0}
m_SizeDelta: {x: 298, y: 38}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 141, y: -20}
m_SizeDelta: {x: 278, y: 38}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8040521731111549232
CanvasRenderer:

213
Assets/Prefabs/AAA/Panel_ObjectDetails.prefab
View File

@@ -33,12 +33,13 @@ RectTransform:
m_Children:
- {fileID: 3284575757984556307}
- {fileID: 8240198726563448281}
- {fileID: 3988095339414947754}
m_Father: {fileID: 8548883030255984469}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -28}
m_SizeDelta: {x: 0, y: -68}
m_AnchoredPosition: {x: 0, y: -16.25}
m_SizeDelta: {x: -20, y: -72.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4715266643647709109
CanvasRenderer:
@@ -144,7 +145,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -21}
m_AnchoredPosition: {x: -5, y: -21}
m_SizeDelta: {x: 10, y: -42}
m_Pivot: {x: 1, y: 1}
--- !u!222 &2753432120652475347
@@ -270,7 +271,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 20, y: 0}
m_SizeDelta: {x: 114.79, y: 21.48}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7895264907707339938
CanvasRenderer:
@@ -420,9 +421,9 @@ RectTransform:
m_Father: {fileID: 979949929095112567}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -7, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &9146053391999549397
CanvasRenderer:
@@ -508,7 +509,7 @@ RectTransform:
m_Father: {fileID: 32824153168451268}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: 10, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -615,7 +616,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 04d5bf3075524784aacfee0819b03873, type: 3}
m_Sprite: {fileID: 21300000, guid: 443b36cbe45187148ba8c17b337e1dc7, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -625,7 +626,7 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3160034621987612258
--- !u!1 &4392427264406353105
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -633,10 +634,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5663835385068053268}
- component: {fileID: 4572823544555744691}
- component: {fileID: 3509179322429146433}
- component: {fileID: 5051537947376100282}
- component: {fileID: 8181815092923155471}
- component: {fileID: 4843164269163945077}
- component: {fileID: 3525556506104548824}
m_Layer: 5
m_Name: Line
m_TagString: Untagged
@@ -644,47 +644,47 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5663835385068053268
--- !u!224 &8181815092923155471
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3160034621987612258}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_GameObject: {fileID: 4392427264406353105}
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: 6366813177479495702}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4572823544555744691
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -46}
m_SizeDelta: {x: 385, y: 1}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &4843164269163945077
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3160034621987612258}
m_GameObject: {fileID: 4392427264406353105}
m_CullTransparentMesh: 1
--- !u!114 &3509179322429146433
--- !u!114 &3525556506104548824
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3160034621987612258}
m_GameObject: {fileID: 4392427264406353105}
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_Color: {r: 0.8509804, g: 0.8509804, b: 0.8509804, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -701,21 +701,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5051537947376100282
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3160034621987612258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.8509804, g: 0.8509804, b: 0.8509804, a: 0.5}
m_EffectDistance: {x: 0, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &5670507951867143541
GameObject:
m_ObjectHideFlags: 0
@@ -736,7 +721,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8548883030255984469
RectTransform:
m_ObjectHideFlags: 0
@@ -877,7 +862,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -373, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7494035802797757901
MonoBehaviour:
@@ -948,14 +933,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5663835385068053268}
- {fileID: 2295368823960692346}
- {fileID: 8181815092923155471}
m_Father: {fileID: 8548883030255984469}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -1}
m_SizeDelta: {x: 380, y: 46}
m_AnchoredPosition: {x: 0, y: -6.5}
m_SizeDelta: {x: 385, y: 46}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &574496857715440853
MonoBehaviour:
@@ -1005,3 +990,139 @@ RectTransform:
m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -10, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9019157317412241967
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3988095339414947754}
- component: {fileID: 8854862766194869772}
- component: {fileID: 2465658723878994224}
m_Layer: 5
m_Name: Text_NoData
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3988095339414947754
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9019157317412241967}
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: 979949929095112567}
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: 0, y: 0}
m_SizeDelta: {x: 360, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8854862766194869772
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9019157317412241967}
m_CullTransparentMesh: 1
--- !u!114 &2465658723878994224
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9019157317412241967}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: No Data
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

1006
Assets/Scenes/pre-0.24.0.unity
View File

File diff suppressed because it is too large Load Diff

52
Assets/Scripts/Studio/AssetTool/CustomAssetRenderObject.cs
View File

@@ -67,37 +67,37 @@ namespace Studio.AssetTool
}
private void OnTriggerEnter(Collider other)
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
if (otherRenderObject != null)
{
isCollided = true;
objectsInTrigger.Add(other.gameObject);
if (isSelected == false)
{
objectRenderer.material = matCubeCollided;
}
Show();
}
//CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
//if (otherRenderObject != null)
//{
// isCollided = true;
// objectsInTrigger.Add(other.gameObject);
// if (isSelected == false)
// {
// objectRenderer.material = matCubeCollided;
// }
// Show();
//}
OnOverlabBegin?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
//OnOverlabBegin?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
}
private void OnTriggerExit(Collider other)
{
CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
if (otherRenderObject != null)
{
objectsInTrigger.Remove(other.gameObject);
}
if (objectsInTrigger.Count == 0)
{
isCollided = false;
if (isSelected == false)
{
Hide();
}
}
//CustomAssetRenderObject otherRenderObject = other.gameObject.GetComponent<CustomAssetRenderObject>();
//if (otherRenderObject != null)
//{
// objectsInTrigger.Remove(other.gameObject);
//}
//if (objectsInTrigger.Count == 0)
//{
// isCollided = false;
// if (isSelected == false)
// {
// Hide();
// }
//}
OnOverlabEnd?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
//OnOverlabEnd?.Invoke(GetComponent<TwinObject>(), other.gameObject.GetComponent<TwinObject>());
}
public void OnPointerEnter(PointerEventData eventData)
{

1
Assets/Scripts/Studio/UI/Elements/UI_FolderPathItem.cs
View File

@@ -30,6 +30,7 @@ namespace Studio.UI
return;
onEndEditInputFieldURL?.Invoke(this);
Debug.Log("action " + onEndEditInputFieldURL.GetInvocationList().Length);
}
private void OnClickSelectedFolderButton()
{

12
Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs
View File

@@ -19,6 +19,7 @@ namespace Studio.UI
private bool itemInit;
private AbstractFunctionObject curObj;
private ScrollRect ScrollView;
private RectTransform Text_NoData;
public override void AfterAwake()
{
@@ -53,10 +54,8 @@ namespace Studio.UI
{
itemInit = false;
}
else
{
ClearText();
}
ClearText();
curObj = obj;
OnUpdateData(curObj.Info);
curObj.onDataUpdate += OnUpdateData;
@@ -82,7 +81,10 @@ namespace Studio.UI
textDict.Clear();
if (entity == null || entity.Count == 0)
{
Text_NoData.gameObject.SetActive(true);
return;
}
itemInit = true;
@@ -100,6 +102,8 @@ namespace Studio.UI
textDict[kvp.Key] = valueText;
}
Text_NoData.gameObject.SetActive(false);
}
string ChangeLine(string text)