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

패널 활성화

Browse Source
This commit is contained in:
jmaniuvc
2025-05-23 19:00:09 +09:00
parent 67af2fb862
commit 1be2d715d4
41 changed files with 1034 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

346
Assets/Prefabs/UI/Panel_Repository.prefab → Assets/Prefabs/UI/Panel_DataRepository.prefab
View File

@@ -1282,8 +1282,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -600, y: 0}
m_SizeDelta: {x: 600, y: 0}
m_AnchoredPosition: {x: -600, y: -50}
m_SizeDelta: {x: 600, y: -50}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8388295997354118169
CanvasRenderer:
@@ -2372,6 +2372,142 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!1 &1465948113823712534
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6545722073901615182}
- component: {fileID: 8149840384808633062}
- component: {fileID: 1913973981447742101}
m_Layer: 0
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6545722073901615182
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1465948113823712534}
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: 2120707956871359796}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8149840384808633062
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1465948113823712534}
m_CullTransparentMesh: 1
--- !u!114 &1913973981447742101
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1465948113823712534}
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: Data Repository
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, 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: 1
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: 0
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}
--- !u!1 &1476984658506109675
GameObject:
m_ObjectHideFlags: 0
@@ -3958,6 +4094,126 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2906546064044160544
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 156449074801645440}
- component: {fileID: 5887059520920124689}
- component: {fileID: 2341260522933458450}
- component: {fileID: 5596144068754701616}
m_Layer: 0
m_Name: CloseButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &156449074801645440
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2906546064044160544}
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: 2120707956871359796}
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: -30, y: 0}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5887059520920124689
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2906546064044160544}
m_CullTransparentMesh: 1
--- !u!114 &2341260522933458450
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2906546064044160544}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0179547eff27daf4e8f258c40b1a47b5, 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!114 &5596144068754701616
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2906546064044160544}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2341260522933458450}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &2908495987941234120
GameObject:
m_ObjectHideFlags: 0
@@ -5828,6 +6084,83 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &4654241239484279402
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2120707956871359796}
- component: {fileID: 6933928695010498942}
- component: {fileID: 8383773770137679521}
m_Layer: 0
m_Name: Header
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2120707956871359796
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4654241239484279402}
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:
- {fileID: 6545722073901615182}
- {fileID: 156449074801645440}
m_Father: {fileID: 5570335413386744247}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6933928695010498942
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4654241239484279402}
m_CullTransparentMesh: 1
--- !u!114 &8383773770137679521
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4654241239484279402}
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: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
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 &4782774751280369100
GameObject:
m_ObjectHideFlags: 0
@@ -7088,7 +7421,7 @@ GameObject:
- component: {fileID: 2093269182715616388}
- component: {fileID: 592732255318513658}
m_Layer: 0
m_Name: Panel_Repository
m_Name: Panel_DataRepository
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -7106,6 +7439,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2120707956871359796}
- {fileID: 6168399780560355685}
- {fileID: 6000886842103843825}
m_Father: {fileID: 0}
@@ -10536,7 +10870,7 @@ RectTransform:
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_AnchoredPosition: {x: 0, y: -42}
m_SizeDelta: {x: 17, y: -592}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3544795031479297343
@@ -10875,8 +11209,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 0}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: 200, y: -50}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6632032000108487324
CanvasRenderer:

0
Assets/Prefabs/UI/Panel_Repository.prefab.meta → Assets/Prefabs/UI/Panel_DataRepository.prefab.meta
View File

2
Assets/SceneDataContainer.cs
View File

@@ -2,7 +2,7 @@ using Studio.AssetTool;
using System.Collections.Generic;
using UnityEngine;
namespace XED
namespace Studio
{
public class SceneDataContainer : MonoBehaviour
{

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

@@ -1776,6 +1776,7 @@ RectTransform:
- {fileID: 1158992910}
- {fileID: 416036583}
- {fileID: 1223093458}
- {fileID: 1233437901}
m_Father: {fileID: 1981809316}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -1827,6 +1828,7 @@ MonoBehaviour:
panel_multilingualsettingmodal: {fileID: 0}
panel_loggingmodal: {fileID: 0}
panel_exitchecker: {fileID: 0}
panel_datarepository: {fileID: 0}
panel_dataconnectmodal: {fileID: 0}
panel_alarmconnectmodal: {fileID: 0}
panel_dynamicobjectinfo: {fileID: 0}
@@ -2998,6 +3000,7 @@ GameObject:
m_Component:
- component: {fileID: 1093055756}
- component: {fileID: 1093055757}
- component: {fileID: 1093055758}
m_Layer: 0
m_Name: System
m_TagString: Untagged
@@ -3043,6 +3046,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2778cc56cc78c8a46846112e3aad69d2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1093055758
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1093055755}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 12899bf44d0ad334fac9db78807dca00, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1149817088
GameObject:
m_ObjectHideFlags: 0
@@ -6491,6 +6506,11 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 8505836957447598286, guid: fd428f69696481b45a252d4ae922627b, type: 3}
m_PrefabInstance: {fileID: 1229281890}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1233437901 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
m_PrefabInstance: {fileID: 1512078834}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1287523440
GameObject:
m_ObjectHideFlags: 0
@@ -6665,6 +6685,463 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 612661662354727518, guid: 89c287ba69e9fff49ba14affeaa83e9c, type: 3}
m_PrefabInstance: {fileID: 1439596646}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1512078834
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 545811781}
m_Modifications:
- target: {fileID: 436272971326210540, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 436272971326210540, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1278068010924803958, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1278068010924803958, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 1349050481430596897, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -338
objectReference: {fileID: 0}
- target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1630686248379312651, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: -8
objectReference: {fileID: 0}
- target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 2049852804490375644, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -383
objectReference: {fileID: 0}
- target: {fileID: 2822090260079876239, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2822090260079876239, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 3055460113867970060, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -23
objectReference: {fileID: 0}
- target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 3195042276600652843, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -158
objectReference: {fileID: 0}
- target: {fileID: 3356956008821289435, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: -157
objectReference: {fileID: 0}
- target: {fileID: 3844317292563568359, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3844317292563568359, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: 53
objectReference: {fileID: 0}
- target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 98
objectReference: {fileID: 0}
- target: {fileID: 4581842186450540828, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -83.5
objectReference: {fileID: 0}
- target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: 53
objectReference: {fileID: 0}
- target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 98
objectReference: {fileID: 0}
- target: {fileID: 5440122521088475074, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -30.5
objectReference: {fileID: 0}
- target: {fileID: 5534746474241454325, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5534746474241454325, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 800
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: 600
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5570335413386744247, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5771394843837740805, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_Name
value: panel_datarepository
objectReference: {fileID: 0}
- target: {fileID: 5771394843837740805, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 5817902735413061103, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -293
objectReference: {fileID: 0}
- target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 94
objectReference: {fileID: 0}
- target: {fileID: 6025084379521254983, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -48
objectReference: {fileID: 0}
- target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 94
objectReference: {fileID: 0}
- target: {fileID: 6361828770316176506, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -48
objectReference: {fileID: 0}
- target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 6364807944314346356, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -203
objectReference: {fileID: 0}
- target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 6368692094279635234, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -428
objectReference: {fileID: 0}
- target: {fileID: 6878974675812328970, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6878974675812328970, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 6937397376140915326, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -68
objectReference: {fileID: 0}
- target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 6985039377563521908, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -248
objectReference: {fileID: 0}
- target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.x
value: 584
objectReference: {fileID: 0}
- target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.x
value: 300
objectReference: {fileID: 0}
- target: {fileID: 7942508702092165427, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchoredPosition.y
value: -113
objectReference: {fileID: 0}
- target: {fileID: 8345779493912287860, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_SizeDelta.y
value: -490
objectReference: {fileID: 0}
- target: {fileID: 8779561970847334551, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8779561970847334551, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6cd73227415ad0641a0549a54080ba77, type: 3}
--- !u!224 &1523668493 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3}

2
Assets/Scripts/Studio/AppMain.cs
View File

@@ -1,6 +1,6 @@
using UnityEngine;
namespace XED
namespace Studio
{
public class AppMain : MonoBehaviour
{

2
Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs
View File

@@ -8,7 +8,7 @@ using Studio.HierarchyTree;
using System.Linq;
using System.Collections;
using Studio.AssetLibraryTree;
using XED;
using Studio;
namespace Studio.AssetTool
{

2
Assets/Scripts/Studio/Command/CreateConnectedAssetCommand.cs
View File

@@ -1,6 +1,6 @@
using Studio.AssetTool;
using Studio.Manage;
using XED;
using Studio;
namespace Studio.Command
{

2
Assets/Scripts/Studio/Configs/AppConfig.cs
View File

@@ -1,6 +1,6 @@
using UnityEngine;
namespace XED
namespace Studio
{
public class AppConfig : MonoBehaviour
{

2
Assets/Scripts/Studio/Connect/APITotalBoardEntity.cs
View File

@@ -1,7 +1,7 @@
using System;
using UnityEngine;
namespace XED
namespace Studio
{
[Serializable]
public class APITotalBoardEntity

10
Assets/Scripts/Studio/Connect/StudioRepoistory.cs
View File

@@ -19,6 +19,16 @@ namespace Studio
public class StudioRepoistory
{
private MQTTClient client;
public bool isConnected
{
get
{
if (client == null)
return false;
return client.State == ClientStates.Connected;
}
}
public Action<string, Dictionary<string, Dictionary<string, string>>> OnTopicList;
public StudioRepoistory()
{

52
Assets/Scripts/Studio/Connect/StudioService.cs
View File

@@ -4,7 +4,8 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using XED;
using Studio;
using Studio.Core;
namespace Studio
{
@@ -20,16 +21,22 @@ namespace Studio
}
}
public class StudioService
public class StudioService : UnitySingleton<StudioService>
{
#region Singleton
private static readonly StudioService instance = new StudioService(new StudioRepoistory());
public static StudioService Instance => instance;
static StudioService() { }
#endregion
private Dictionary<string, Dictionary<string, EventHandler<StudioServiceTypeEventArgs>>> listenerIdMap;
private StudioRepoistory repository;
public bool isConnected
{
get
{
return repository.isConnected;
}
}
private Dictionary<string, float> updateTime = new();
private int totalRequestPacket;
private int totalResponsePacket;
@@ -42,12 +49,16 @@ namespace Studio
private string maxResponseApi;
private string maxResponseTimeApi;
public Dictionary<string, StudioEntityWithState<object>> baseData = new();
public Dictionary<string, StudioEntityWithState<object>> apiData = new();
public Dictionary<string, (Dictionary<string, Dictionary<string, string>>, TimeSpan)> mqttData = new();
private Dictionary<string, DateTime> lastUpdateTime = new();
public event Action<string, StudioEntityWithState<object>> onAPIDataLoaded;
public event Action<string, Dictionary<string, Dictionary<string, string>>, TimeSpan> onMQTTDataLoaded;
bool isMQTTConnected;
//private string
private StudioService(StudioRepoistory repository)
{
@@ -59,7 +70,15 @@ namespace Studio
}
public void ConnectMQTT()
{
if (isMQTTConnected)
return;
this.repository = new StudioRepoistory();
listenerIdMap = new Dictionary<string, Dictionary<string, EventHandler<StudioServiceTypeEventArgs>>>();
repository.OnTopicList += OnTopicList;
repository.MQTTConnect();
isMQTTConnected = true;
}
public void SubscribeMQTT(string topic)
@@ -90,6 +109,15 @@ namespace Studio
UpdateTopicData(type, idKey.Key, idKey.Value);
}
if (!mqttData.ContainsKey(type))
{
mqttData.Add(type, (entities, elapsedTime));
}
else
{
mqttData[type] = (entities, elapsedTime);
}
onMQTTDataLoaded?.Invoke(type, entities, elapsedTime); // 나중에 클래스 밖으로 이동 필요
}
@@ -159,13 +187,13 @@ namespace Studio
if (data.State.Equals(APIState.Loaded))
{
if (!baseData.ContainsKey(url))
baseData.Add(url, new());
if (!apiData.ContainsKey(url))
apiData.Add(url, new());
data.lastRequestTime = startTime;
data.lastResponseTime = endTime;
data.elapsedTime = sw.Elapsed;
baseData[url] = data;
apiData[url] = data;
CheckAPIBoarder(data.Entity.ToString(), data.ReqSize, url, t);
UpdateEntity(url, data.Entity.ToString());
}
@@ -206,11 +234,11 @@ namespace Studio
{
var boardEntity = new APITotalBoardEntity();
boardEntity.TotalRequestPacketSize = totalRequestPacket;
boardEntity.AverageRequestPacketSize = totalRequestPacket / baseData.Count;
boardEntity.AverageRequestPacketSize = totalRequestPacket / apiData.Count;
boardEntity.TotalResponsePacketSize = totalResponsePacket;
boardEntity.AverageResponsePacketSize = totalResponsePacket / baseData.Count;
boardEntity.AverageResponsePacketSize = totalResponsePacket / apiData.Count;
boardEntity.MaximumResponseTime = maxElapsedTime;
boardEntity.AverageResponseTime = totalElapsedTime / baseData.Count;
boardEntity.AverageResponseTime = totalElapsedTime / apiData.Count;
boardEntity.MaximumRequestPacketAPI = maxReuqestApi;
boardEntity.MaximumResponsePacketAPI = maxResponseApi;
boardEntity.MaximumResponseTimeAPI = maxResponseTimeApi;

3
Assets/Scripts/Studio/Managers/StaticCanvasHandler.cs
View File

@@ -15,10 +15,11 @@ namespace Studio.Manage
GameObject hierarchyWindow = canvas_Popup.panel_hierarchy.gameObject;
GameObject interferedobjectlistWindow = canvas_Popup.panel_interferedobjectlist.gameObject;
GameObject assetLibraryWindow = canvas_Popup.panel_assetlibrary.gameObject;
GameObject repository = canvas_Popup.panel_datarepository.gameObject;
canvas_static.panel_studiotopbar.onClickAssetLibraryWindow += (() => assetLibraryWindow.SetActive(true));
canvas_static.panel_studiotopbar.onClickHierarchyWindow += (() => hierarchyWindow.SetActive(true));
canvas_static.panel_studiotopbar.onClickDataStorage += (() => repository.SetActive(true));
}
}
}

11
Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs
View File

@@ -5,10 +5,11 @@ using Studio.Util;
using Studio.Test;
using XRLib;
using XRLib.UI;
using XED;
using XED.UI;
using Studio;
using Studio.UI;
using Studio.AssetTool;
using Studio.Command;
using static UnityEngine.Rendering.DebugUI;
namespace Studio
{
@@ -48,11 +49,17 @@ namespace Studio
public Panel_MultilingualSettingModal panel_multilingualsettingmodal;
public Panel_LoggingModal panel_loggingmodal;
public Panel_ExitChecker panel_exitchecker;
public Panel_DataRepository panel_datarepository;
public Panel_DataConnectModal panel_dataconnectmodal;
public Panel_AlarmConnectModal panel_alarmconnectmodal;
public Panel_DynamicObjectInfo panel_dynamicobjectinfo;
private void Awake()
{
panel_datarepository = GetComponentInChildren<Panel_DataRepository>(true);
panel_datarepository.onEnableEvent += SetPanelAsLastSibling;
}
public override void AfterAwake()
{

2
Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs
View File

@@ -4,7 +4,7 @@ using UnityEngine;
using Studio.Manage;
using Studio.Util;
using Studio.Command;
using XED;
using Studio;
using Studio.AssetTool;
namespace Studio.UI

4
Assets/Scripts/Studio/UI/Canvas/Canvas_Studio_Popup.cs
View File

@@ -2,8 +2,8 @@
using Studio.Manage;
using Studio.UI;
using XRLib.UI;
using XED;
using XED.UI;
using Studio;
using Studio.UI;
namespace Studio
{

23
Assets/Scripts/Studio/UI/Elements/UI_APIConnection.cs
View File

@@ -5,8 +5,10 @@ using UnityEngine.UI;
using System.Collections.Generic;
using System;
using Studio.Util;
using Studio.Conifg;
using Studio.Auth;
namespace XED
namespace Studio
{
public class UI_APIConnection : UIBase
{
@@ -23,6 +25,7 @@ namespace XED
public Action onTestAPI;
public Action<UI_APIConnection> onRemoveAPIConnectionItem;
public Panel_DataRepository panel_DataRepository;
public override void AfterAwake()
{
@@ -42,9 +45,25 @@ namespace XED
AddURLItem(item);
Button_AddURLItem.transform.SetAsLastSibling();
}
private void OnClickTestAPIButton()
private async void OnClickTestAPIButton()
{
onTestAPI?.Invoke();
// API ¿¬°á
Constants.APIDomain = InputField_Domain.text;
Constants.APIPort = int.Parse(InputField_Port.text);
//StudioService.instance.ConnectMQTT();
await AuthService.Instance.Login("xr", "@dbqlTl1");
foreach (UI_InputURLItem item in inputURLItems)
{
string url = "/api/" + item.InputField_URL.text;
await StudioService.instance.LoadBaseData(url);
panel_DataRepository = FindAnyObjectByType<Panel_DataRepository>(FindObjectsInactive.Include);
panel_DataRepository.apiConnected = true;
}
}
private void OnClickRemoveItemButton()
{

4
Assets/Scripts/Studio/UI/Elements/UI_InputTopicItem.cs
View File

@@ -5,11 +5,11 @@ using UnityEngine.UI;
using XRLib.UI;
using Studio.Util;
namespace XED
namespace Studio
{
public class UI_InputTopicItem : UIBase
{
private TMP_InputField InputField_Topic;
public TMP_InputField InputField_Topic;
private Button Button_RemoveItem;
public Action<UI_InputTopicItem> onRemoveItem;

4
Assets/Scripts/Studio/UI/Elements/UI_InputURLItem.cs
View File

@@ -5,11 +5,11 @@ using TMPro;
using System;
using Studio.Util;
namespace XED
namespace Studio
{
public class UI_InputURLItem : UIBase
{
private TMP_InputField InputField_URL;
public TMP_InputField InputField_URL;
private Button Button_RemoveItem;
public Action<UI_InputURLItem> onRemoveItem;

16
Assets/Scripts/Studio/UI/Elements/UI_MQTTConnection.cs
View File

@@ -5,8 +5,9 @@ using UnityEngine.UI;
using System.Collections.Generic;
using System;
using Studio.Util;
using Studio.Conifg;
namespace XED
namespace Studio
{
public class UI_MQTTConnection : UIBase
{
@@ -23,6 +24,7 @@ namespace XED
public Action onMQTTTest;
public Action<UI_MQTTConnection> onRemoveMQTTConnectionItem;
public Panel_DataRepository panel_DataRepository;
public override void AfterAwake()
{
@@ -46,6 +48,18 @@ namespace XED
{
Debug.Log("On Click MQTT Test");
onMQTTTest?.Invoke();
Constants.MQTTDomain = InputField_Domain.text;
Constants.MQTTPort = int.Parse(InputField_Port.text);
StudioService.instance.ConnectMQTT();
foreach (UI_InputTopicItem item in inputTopicItems)
{
StudioService.instance.SubscribeMQTT(item.InputField_Topic.text);
panel_DataRepository = FindAnyObjectByType<Panel_DataRepository>(FindObjectsInactive.Include);
panel_DataRepository.mqttConnected = true;
}
}
private void OnClickRemoveItemButton()
{

2
Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs
View File

@@ -4,7 +4,7 @@ using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace XED.UI
namespace Studio.UI
{
public class UI_MiniMapHeightButton : UIBase
{

2
Assets/Scripts/Studio/UI/Elements/UI_SceneTabButton.cs
View File

@@ -4,7 +4,7 @@ using XRLib.UI;
using TMPro;
using System;
namespace XED
namespace Studio
{
public class UI_SceneTabButton : UIBase
{

2
Assets/Scripts/Studio/UI/Panel/Panel_APISetting.cs
View File

@@ -5,7 +5,7 @@ using XRLib.UI;
using System;
using Studio.Util;
namespace XED
namespace Studio
{
public class Panel_APISetting : PanelBase

2
Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs
View File

@@ -8,7 +8,7 @@ using TMPro;
using TriLibCore.SFB;
using Studio.Util;
namespace XED.UI
namespace Studio.UI
{
public enum AnimationStyle
{

2
Assets/Scripts/Studio/UI/Panel/Panel_AuthSetting.cs
View File

@@ -1,7 +1,7 @@
using UnityEngine;
using XRLib.UI;
namespace XED
namespace Studio
{
public class Panel_AuthSetting : PanelBase
{

2
Assets/Scripts/Studio/UI/Panel/Panel_MQTTSetting.cs
View File

@@ -5,7 +5,7 @@ using XRLib.UI;
using System;
using Studio.Util;
namespace XED
namespace Studio
{
public class Panel_MQTTSetting : PanelBase
{

2
Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs
View File

@@ -8,7 +8,7 @@ using UnityEngine.UI;
using XRLib;
using XRLib.UI;
namespace XED.UI
namespace Studio.UI
{
public class Panel_MiniMap : PanelBase
{

2
Assets/Scripts/Studio/UI/Panel/Panel_SceneTab.cs
View File

@@ -4,7 +4,7 @@ using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace XED
namespace Studio
{
public class Panel_SceneTab : PanelBase
{

4
Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs
View File

@@ -2,11 +2,11 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
using XED.UI;
using Studio.UI;
using TMPro;
using System;
namespace XED
namespace Studio
{
public class Panel_StartSetting : PanelBase
{

3
Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs
View File

@@ -20,6 +20,7 @@ namespace Studio.UI
public event Action onClickSaveProject;
public event Action onClickSaveAsProject;
public event Action onClickExit;
public event Action onClickDataStorage;
/*Window*/
public Button Button_DataStorage;
@@ -83,7 +84,7 @@ namespace Studio.UI
private void OnClickDataStorage()
{
onClickOpenProject?.Invoke();
onClickDataStorage?.Invoke();
}
private void OnClickDataUpdateSetting()

2
Assets/TMPFolder/Panel_APIDataInfo.cs
View File

@@ -7,7 +7,7 @@ using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace XED.UI
namespace Studio.UI
{
public class Panel_APIDataInfo : PanelBase
{

74
Assets/TMPFolder/Panel_Repository.cs → Assets/TMPFolder/Panel_DataRepository.cs
View File

@@ -11,13 +11,14 @@ using UnityEngine.UI;
using System.Collections.Generic;
using System;
namespace XED.UI
namespace Studio
{
public class Panel_Repository : PanelBase
public class Panel_DataRepository : PanelBase
{
UI_BaseDataButton apiDataButtonPrefab;
UI_MQTTDataButton mqttDataButtonPrefab;
Button CloseButton;
RectTransform APIDataList;
RectTransform MQTTDataList;
@@ -41,6 +42,9 @@ namespace XED.UI
Dictionary<string, UI_BaseDataButton> apiButtons = new();
Dictionary<string, UI_MQTTDataButton> mqttButtons = new();
public bool apiConnected;
public bool mqttConnected;
public override void AfterAwake()
{
UI_ProtocolLabel[] protocolLabels = GetComponentsInChildren<UI_ProtocolLabel>();
@@ -49,15 +53,66 @@ namespace XED.UI
label.panel_Repository = this;
}
StudioService.Instance.onAPIDataLoaded += UpdateAPIDataButton;
StudioService.Instance.onMQTTDataLoaded += UpdateMQTTDataButton;
apiDataButtonPrefab = Resources.Load<UI_BaseDataButton>("Prefabs/UI/Button/UI_BaseDataButton");
mqttDataButtonPrefab = Resources.Load<UI_MQTTDataButton>("Prefabs/UI/Button/UI_MQTTDataButton");
CloseButton.onClick.AddListener(Deactivate);
layoutGroups = GetComponentsInChildren<LayoutGroup>();
}
private void OnEnable()
{
gameObject.transform.SetAsLastSibling();
/*
StudioService studioService = StudioService.Instance;
studioService.onAPIDataLoaded += UpdateAPIDataButton;
studioService.onMQTTDataLoaded += UpdateMQTTDataButton;
foreach (string key in studioService.apiData.Keys)
{
UpdateAPIDataButton(key, studioService.apiData[key]);
}
foreach (string key in studioService.mqttData.Keys)
{
UpdateMQTTDataButton(key, studioService.mqttData[key].Item1, studioService.mqttData[key].Item2);
}
*/
if (apiConnected)
{
StudioService studioService = StudioService.instance;
studioService.onAPIDataLoaded += UpdateAPIDataButton;
foreach (string key in studioService.apiData.Keys)
{
UpdateAPIDataButton(key, studioService.apiData[key]);
}
}
if (mqttConnected)
{
StudioService studioService = StudioService.instance;
studioService.onMQTTDataLoaded += UpdateMQTTDataButton;
foreach (string key in studioService.mqttData.Keys)
{
UpdateMQTTDataButton(key, studioService.mqttData[key].Item1, studioService.mqttData[key].Item2);
}
}
}
private void OnDisable()
{
//StudioService.Instance.onAPIDataLoaded -= UpdateAPIDataButton;
//StudioService.Instance.onMQTTDataLoaded -= UpdateMQTTDataButton;
}
void UpdateAPIDataButton(string name, StudioEntityWithState<object> value)
{
if (!apiButtons.ContainsKey(name))
@@ -104,7 +159,7 @@ namespace XED.UI
public void ShowInformation_API()
{
APITotalBoardEntity info = StudioService.Instance.GetAPIStatusBoarder();
APITotalBoardEntity info = StudioService.instance.GetAPIStatusBoarder();
TotalRequestPacketSize.text = info.TotalRequestPacketSize.ToString();
AverageRequestPacketSize.text = info.AverageRequestPacketSize.ToString();
@@ -149,5 +204,10 @@ namespace XED.UI
Panel_MQTTInfo.gameObject.SetActive(false);
Panel_MQTTDataInfo.gameObject.SetActive(true);
}
void Deactivate()
{
gameObject.SetActive(false);
}
}
}

0
Assets/TMPFolder/Panel_Repository.cs.meta → Assets/TMPFolder/Panel_DataRepository.cs.meta
View File

2
Assets/TMPFolder/Panel_MQTTDataInfo.cs
View File

@@ -6,7 +6,7 @@ using UnityEngine;
using UnityEngine.UI;
using XRLib.UI;
namespace XED.UI
namespace Studio.UI
{
public class Panel_MQTTDataInfo : PanelBase
{

10
Assets/TMPFolder/RJHTest.cs
View File

@@ -4,7 +4,7 @@ using Studio.Conifg;
using System.Threading.Tasks;
using UnityEngine;
namespace XED
namespace Studio
{
public class RJHTest : MonoBehaviour
{
@@ -16,14 +16,14 @@ namespace XED
Constants.APIDomain = "220.90.135.190";
Constants.APIPort = 23000;
Constants.MQTTPort = 8088;
StudioService.Instance.ConnectMQTT();
StudioService.instance.ConnectMQTT();
}
private async void Test()
{
await AuthService.Instance.Login("xr", "@dbqlTl1");
await StudioService.Instance.LoadBaseData("/api/agv");
await StudioService.instance.LoadBaseData("/api/agv");
Debug.Log(AuthService.Instance.Entiti.accessToken);
}
private void Update()
@@ -34,12 +34,12 @@ namespace XED
}
if (Input.GetKeyDown(KeyCode.I))
{
StudioService.Instance.SubscribeMQTT("STOCKER_CRANE");
StudioService.instance.SubscribeMQTT("STOCKER_CRANE");
}
if(Input.GetKeyDown(KeyCode.U))
{
StudioService.Instance.SubscribeMQTT("AGV");
StudioService.instance.SubscribeMQTT("AGV");
}
if(Input.GetKeyDown(KeyCode.T))
{

2
Assets/TMPFolder/UIAPIStatusBoard.cs
View File

@@ -1,7 +1,7 @@
using TMPro;
using UnityEngine;
namespace XED
namespace Studio
{
public class UIAPIStatusBoard : MonoBehaviour
{

4
Assets/TMPFolder/UILinkedList.cs
View File

@@ -6,7 +6,7 @@ using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UI.Extensions;
namespace XED
namespace Studio
{
public class UILinkedList : MonoBehaviour
{
@@ -26,7 +26,7 @@ namespace XED
private void SetItem()
{
var apiItem = CreateAccordion();
var basedatas = StudioService.Instance.baseData;
var basedatas = StudioService.instance.apiData;
foreach(var data in basedatas)
{
CreateTabButton(data.Key, apiItem.BarList);

6
Assets/TMPFolder/UI_BaseDataButton.cs
View File

@@ -1,16 +1,16 @@
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using XED.UI;
using Studio.UI;
using Studio.Setting.Connect;
using XRLib.UI;
namespace XED
namespace Studio
{
public class UI_BaseDataButton : UIBase
{
public Panel_Repository panel_Repository;
public Panel_DataRepository panel_Repository;
Button button;
TextMeshProUGUI buttonName;

2
Assets/TMPFolder/UI_DataRepositoryButtonList.cs
View File

@@ -3,7 +3,7 @@ using Studio.Setting.Connect;
using System.Collections.Generic;
using UnityEngine;
namespace XED
namespace Studio
{
public class UI_DataRepositoryButtonList : MonoBehaviour
{

6
Assets/TMPFolder/UI_MQTTDataButton.cs
View File

@@ -4,14 +4,14 @@ using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using XED.UI;
using Studio.UI;
using XRLib.UI;
namespace XED
namespace Studio
{
public class UI_MQTTDataButton : UIBase
{
public Panel_Repository panel_Repository;
public Panel_DataRepository panel_Repository;
Button button;
TextMeshProUGUI buttonName;

4
Assets/TMPFolder/UI_ProtocolLabel.cs
View File

@@ -5,7 +5,7 @@ using UnityEngine.UI;
using XRLib.UI;
using static UnityEngine.Analytics.IAnalytic;
namespace XED.UI
namespace Studio.UI
{
public enum ProtocolType
{
@@ -17,7 +17,7 @@ namespace XED.UI
{
public ProtocolType protocolType;
public Panel_Repository panel_Repository;
public Panel_DataRepository panel_Repository;
Button ClickButton;
Button FoldButton;

199
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long