From 2e00970a6a459ac51ba6bef8367c3cf37774c1c6 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Wed, 28 May 2025 20:33:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=B0=B1=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/AAA/Panel_AGV.prefab | 597 +++++++++++++++--- .../Prefabs/UI/PRF_EntityItem.prefab | 20 +- .../TwinObject/AbstractFunctionObject.cs | 5 +- .../Studio/TwinObject/DynamicObject/AGV.cs | 1 - Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs | 39 +- 5 files changed, 557 insertions(+), 105 deletions(-) diff --git a/Assets/Prefabs/AAA/Panel_AGV.prefab b/Assets/Prefabs/AAA/Panel_AGV.prefab index 770f0495..d4c411cb 100644 --- a/Assets/Prefabs/AAA/Panel_AGV.prefab +++ b/Assets/Prefabs/AAA/Panel_AGV.prefab @@ -1,5 +1,301 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &526497522914516728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8228472450116164094} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8228472450116164094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526497522914516728} + 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: 8839646493412544996} + m_Father: {fileID: 401512557060220938} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3116081274131626819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 648271791709130949} + - component: {fileID: 6449206006417756257} + - component: {fileID: 8622579468672111839} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &648271791709130949 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3116081274131626819} + 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: 5284918005107039476} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6449206006417756257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3116081274131626819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &8622579468672111839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3116081274131626819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 1 +--- !u!1 &3282121051687117410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8839646493412544996} + - component: {fileID: 8493490836511210305} + - component: {fileID: 5343463534162107796} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8839646493412544996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282121051687117410} + 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: 8228472450116164094} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8493490836511210305 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282121051687117410} + m_CullTransparentMesh: 1 +--- !u!114 &5343463534162107796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3282121051687117410} + 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: 10905, guid: 0000000000000000f000000000000000, type: 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 &4627321495729127577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5884999876027984185} + - component: {fileID: 8499806511425328339} + - component: {fileID: 8172187617670568482} + - component: {fileID: 5419496100268201668} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5884999876027984185 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4627321495729127577} + 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: 5284918005107039476} + - {fileID: 401512557060220938} + m_Father: {fileID: 890093516518657518} + 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.5, y: 0.5} +--- !u!222 &8499806511425328339 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4627321495729127577} + m_CullTransparentMesh: 1 +--- !u!114 &8172187617670568482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4627321495729127577} + 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: 10907, guid: 0000000000000000f000000000000000, type: 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!114 &5419496100268201668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4627321495729127577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 648271791709130949} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 5284918005107039476} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 5850445065573205654} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4653535049454866169 GameObject: m_ObjectHideFlags: 0 @@ -75,83 +371,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 32.34 ---- !u!1 &7752227893108221529 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 948346715020304857} - - component: {fileID: 5833644895867438262} - - component: {fileID: 3980097042304132475} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &948346715020304857 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7752227893108221529} - 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: 890093516518657518} - 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: 10} - m_SizeDelta: {x: 288, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &5833644895867438262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7752227893108221529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &3980097042304132475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7752227893108221529} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 --- !u!1 &7827388610028740651 GameObject: m_ObjectHideFlags: 0 @@ -168,7 +387,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &890093516518657518 RectTransform: m_ObjectHideFlags: 0 @@ -176,20 +395,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7827388610028740651} - 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 m_Children: - {fileID: 5265721231338045504} - {fileID: 8894985241641706439} - - {fileID: 948346715020304857} + - {fileID: 5884999876027984185} m_Father: {fileID: 0} 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: -344, y: -44} - m_SizeDelta: {x: 318, y: 972.8} + m_SizeDelta: {x: 318, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3708113620981874956 MonoBehaviour: @@ -205,6 +424,222 @@ MonoBehaviour: m_EditorClassIdentifier: itemPrefab: {fileID: 0} Content: {fileID: 0} +--- !u!1 &8376965345148250553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5284918005107039476} + - component: {fileID: 4208425283836653291} + - component: {fileID: 7862337103266189211} + - component: {fileID: 6938476206511996365} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5284918005107039476 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376965345148250553} + 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: 648271791709130949} + m_Father: {fileID: 5884999876027984185} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4208425283836653291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376965345148250553} + m_CullTransparentMesh: 1 +--- !u!114 &7862337103266189211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376965345148250553} + 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: 10917, guid: 0000000000000000f000000000000000, type: 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!114 &6938476206511996365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376965345148250553} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &9073156140848815924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 401512557060220938} + - component: {fileID: 3976759442335169353} + - component: {fileID: 844842048312376472} + - component: {fileID: 5850445065573205654} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &401512557060220938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9073156140848815924} + 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: 8228472450116164094} + m_Father: {fileID: 5884999876027984185} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &3976759442335169353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9073156140848815924} + m_CullTransparentMesh: 1 +--- !u!114 &844842048312376472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9073156140848815924} + 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: 10907, guid: 0000000000000000f000000000000000, type: 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!114 &5850445065573205654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9073156140848815924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 5343463534162107796} + m_HandleRect: {fileID: 8839646493412544996} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &9158034230855959382 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab index 09abf1e5..9caf5dcc 100644 --- a/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab @@ -32,10 +32,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6625112702371143276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 67, y: -25} - m_SizeDelta: {x: 134, y: 25} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -68.5, y: 0} + m_SizeDelta: {x: 151, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4619594656901260396 CanvasRenderer: @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 13 - m_fontSizeBase: 13 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -168,10 +168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6625112702371143276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 211, y: -25} - m_SizeDelta: {x: 154, y: 25} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 75.5, y: 0} + m_SizeDelta: {x: 137, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4902551005294585158 CanvasRenderer: diff --git a/Assets/Scripts/Studio/TwinObject/AbstractFunctionObject.cs b/Assets/Scripts/Studio/TwinObject/AbstractFunctionObject.cs index 12322c4a..cca96363 100644 --- a/Assets/Scripts/Studio/TwinObject/AbstractFunctionObject.cs +++ b/Assets/Scripts/Studio/TwinObject/AbstractFunctionObject.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using UnityEngine; namespace Studio @@ -17,6 +18,8 @@ namespace Studio public virtual ObjectType ObjectType { get; set; } + public Action> onDataUpdate; + public abstract void OnUpdateData(object sender, StudioServiceIdEventArgs e); public abstract void ChangeAutoID(bool isAuto); diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs index 2887be78..d241b411 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs @@ -25,7 +25,6 @@ namespace Studio.Dynamic.TwinObject Quaternion startRot; Quaternion endRot; - public Action> onDataUpdate; public Dictionary CurrentEntity; private bool isPlay = false; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs index 984b36ff..4d4a575f 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs @@ -15,9 +15,8 @@ namespace Studio.UI public RectTransform Content; private Dictionary textDict = new(); private bool itemInit; - private string targetId = string.Empty; + private AbstractFunctionObject curObj; - private AGV prevAgv; public override void AfterAwake() { itemPrefab = Resources.Load("Prefabs/UI/PRF_EntityItem"); @@ -42,19 +41,20 @@ namespace Studio.UI return; GameObject selectedObject = selectedObjects[0]; - if (prevAgv != null) - { - prevAgv.onDataUpdate -= InstantiateUI; - prevAgv = null; - } - if (selectedObject.TryGetComponent(out AGV agv)) + if (curObj != null) + curObj.onDataUpdate -= OnUpdateData; + + if (selectedObject.TryGetComponent(out AbstractFunctionObject obj)) { - var dic = agv.Info; + if(curObj?.GetType().Name != obj.GetType().Name) + { + itemInit = false; + } + curObj = obj; + OnUpdateData(curObj.Info); + curObj.onDataUpdate += OnUpdateData; SetActive(true); - prevAgv = agv; - OnUpdateData(dic); - agv.onDataUpdate += OnUpdateData; } else { @@ -64,6 +64,18 @@ namespace Studio.UI void InstantiateUI(Dictionary entity) { + foreach (var kvp in textDict) + { + print("enter"); + if (kvp.Value != null) + Destroy(kvp.Value.gameObject); + } + + textDict.Clear(); + + if (entity == null) + return; + foreach (var kvp in entity) { GameObject item = Instantiate(itemPrefab, Content); @@ -82,6 +94,9 @@ namespace Studio.UI public void UpdateUI(Dictionary entity) { + if (entity == null) + return; + foreach (var kvp in entity) { if (textDict.TryGetValue(kvp.Key, out var txt)) -- 2.48.1.windows.1 From 0ee42064cadb9ab8acf8cb39d4a1766d8848c843 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Wed, 28 May 2025 23:06:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=98=A4=EB=B8=8C=EC=A0=9D=ED=8A=B8=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=EC=A0=95=EB=B3=B4=20=EC=B0=BD?= =?UTF-8?q?=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=ED=81=AC=EB=A0=88=EC=9D=B8=20=EC=A0=95=EB=B3=B4=EC=B0=BD=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Image/UI/Panel_AssetLibrary.meta | 8 + .../Panel_AssetLibrary/IMG_InputFieldBG.png | Bin 0 -> 464 bytes .../IMG_InputFieldBG.png.meta | 117 ++ Assets/Image/UI/Panel_AssetLibrary/Item.png | Bin 0 -> 1374 bytes .../Image/UI/Panel_AssetLibrary/Item.png.meta | 130 ++ .../Panel_AssetLibrary}/icon-search.png | Bin .../Panel_AssetLibrary}/icon-search.png.meta | 0 Assets/Image/UI/Panel_DynamicObjectInfo.meta | 8 + .../IMG_InputFieldBG.png | Bin 0 -> 464 bytes .../IMG_InputFieldBG.png.meta | 117 ++ .../Panel_DynamicObjectInfo}/Rectangle 39.png | Bin .../Rectangle 39.png.meta | 0 Assets/Image/UI/Panel_ObjectDetails.meta | 8 + Assets/Image/UI/Panel_ObjectDetails/Item.png | Bin 0 -> 1374 bytes .../UI/Panel_ObjectDetails/Item.png.meta | 130 ++ .../UI/Panel_ObjectDetails/Rectangle 64.png | Bin 0 -> 2353 bytes .../Panel_ObjectDetails/Rectangle 64.png.meta | 143 ++ Assets/Prefabs/AAA/Panel_AssetLibrary.prefab | 24 +- .../AAA/Panel_DynamicObjectInfo.prefab | 30 +- ..._AGV.prefab => Panel_ObjectDetails.prefab} | 1230 ++++++++++------- ...b.meta => Panel_ObjectDetails.prefab.meta} | 2 +- .../Prefabs/UI/PRF_EntityItem.prefab | 100 +- .../Studio/AssetTool/CustomAssetConnector.cs | 6 +- .../Scripts/Studio/UI/Canvas/Canvas_Popup.cs | 2 +- .../Scripts/Studio/UI/Panel/Panel_AGV.cs.meta | 2 - .../{Panel_AGV.cs => Panel_ObjectDetails.cs} | 52 +- .../UI/Panel/Panel_ObjectDetails.cs.meta | 2 + 27 files changed, 1544 insertions(+), 567 deletions(-) create mode 100644 Assets/Image/UI/Panel_AssetLibrary.meta create mode 100644 Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png create mode 100644 Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png.meta create mode 100644 Assets/Image/UI/Panel_AssetLibrary/Item.png create mode 100644 Assets/Image/UI/Panel_AssetLibrary/Item.png.meta rename Assets/Image/{AssetLibrary/New => UI/Panel_AssetLibrary}/icon-search.png (100%) rename Assets/Image/{AssetLibrary/New => UI/Panel_AssetLibrary}/icon-search.png.meta (100%) create mode 100644 Assets/Image/UI/Panel_DynamicObjectInfo.meta create mode 100644 Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png create mode 100644 Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png.meta rename Assets/Image/{ => UI/Panel_DynamicObjectInfo}/Rectangle 39.png (100%) rename Assets/Image/{ => UI/Panel_DynamicObjectInfo}/Rectangle 39.png.meta (100%) create mode 100644 Assets/Image/UI/Panel_ObjectDetails.meta create mode 100644 Assets/Image/UI/Panel_ObjectDetails/Item.png create mode 100644 Assets/Image/UI/Panel_ObjectDetails/Item.png.meta create mode 100644 Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png create mode 100644 Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta rename Assets/Prefabs/AAA/{Panel_AGV.prefab => Panel_ObjectDetails.prefab} (52%) rename Assets/Prefabs/AAA/{Panel_AGV.prefab.meta => Panel_ObjectDetails.prefab.meta} (74%) delete mode 100644 Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta rename Assets/Scripts/Studio/UI/Panel/{Panel_AGV.cs => Panel_ObjectDetails.cs} (67%) create mode 100644 Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs.meta diff --git a/Assets/Image/UI/Panel_AssetLibrary.meta b/Assets/Image/UI/Panel_AssetLibrary.meta new file mode 100644 index 00000000..08e33e45 --- /dev/null +++ b/Assets/Image/UI/Panel_AssetLibrary.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6df1a8516f89074b969841f537aa4c0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png b/Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png new file mode 100644 index 0000000000000000000000000000000000000000..0bec6c96e3261e1cf84e84f04e1b3432f39579f3 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0y~yVA%j<%W<#)Nt=r2PC$yYz$3Dlfq`2Xgc%uT&5-~K zG8PB9J29*~C-V}>VM%xNb!1@J*w6hZkrgPH>gnPbQo;E4_Qu>p0V1srzw2BK*tx)Y zQR2p&hE0q!6?zWDiEsoaX--Q$*~-oCe^7JZ`rX=pthP_ve*0}%-tBK8*}2?6V;O30 zY|{B_;(Pt@!w<3VzyD6%e}BH&Y+pv8OoPa0o9WL#SFT%s{dNBK+mUe~L4oD3ckTOV z#sOqHtlAoD3UmqsLlb8Nh;k7I`HP`LEdi|3_W%=+r!cDlq{hL75oBFM29p?&Vz|hn z1ELnuL*v;^I<;W`IArh6I##&n%;y-8-3ljftyz}2>)O`}8@c_r-+o(t?H1T+KQ@$B hn(`ceT4D3=5A!5;yGt4J9lt>uJYD@<);T3K0RW86iYx#C literal 0 HcmV?d00001 diff --git a/Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png.meta b/Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png.meta new file mode 100644 index 00000000..1800a2e5 --- /dev/null +++ b/Assets/Image/UI/Panel_AssetLibrary/IMG_InputFieldBG.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 904d2ede4c73ebf4fb68a894caca44e1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 50, y: 0, z: 50, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + 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: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UI/Panel_AssetLibrary/Item.png b/Assets/Image/UI/Panel_AssetLibrary/Item.png new file mode 100644 index 0000000000000000000000000000000000000000..64d1fd6bb89789836a96f6ee38a17f5468a865cb GIT binary patch literal 1374 zcmeAS@N?(olHy`uVBq!ia0y~yU`+tB7jUov$tLxq=YSMvfk$L91A~q?2s19VowgDv z$XFcY?!>U}oXkrghb7(7*O7r?V?XzwL{=d8v!{z=NCo5D8w&-S9T*r6`b%~8E%~w#-}hKOd-_f#JiwO|t#}_`qx-HXRV{aHIif6azzt#0C(> zAjm8Rq7;%2Fo9?no(K@t(80(Jq6G{S7(ukssOHfC8%-pm8H3J+!3oxXUF^qwW|eLO OS?uZR=d#Wzp$PzR3B23@ literal 0 HcmV?d00001 diff --git a/Assets/Image/UI/Panel_AssetLibrary/Item.png.meta b/Assets/Image/UI/Panel_AssetLibrary/Item.png.meta new file mode 100644 index 00000000..9a43ce36 --- /dev/null +++ b/Assets/Image/UI/Panel_AssetLibrary/Item.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 468cf9bafdc63b349964fb9003d6ae6b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/AssetLibrary/New/icon-search.png b/Assets/Image/UI/Panel_AssetLibrary/icon-search.png similarity index 100% rename from Assets/Image/AssetLibrary/New/icon-search.png rename to Assets/Image/UI/Panel_AssetLibrary/icon-search.png diff --git a/Assets/Image/AssetLibrary/New/icon-search.png.meta b/Assets/Image/UI/Panel_AssetLibrary/icon-search.png.meta similarity index 100% rename from Assets/Image/AssetLibrary/New/icon-search.png.meta rename to Assets/Image/UI/Panel_AssetLibrary/icon-search.png.meta diff --git a/Assets/Image/UI/Panel_DynamicObjectInfo.meta b/Assets/Image/UI/Panel_DynamicObjectInfo.meta new file mode 100644 index 00000000..4579f709 --- /dev/null +++ b/Assets/Image/UI/Panel_DynamicObjectInfo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cc9e9b8fc933ea4088d92a68e2279ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png b/Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png new file mode 100644 index 0000000000000000000000000000000000000000..0bec6c96e3261e1cf84e84f04e1b3432f39579f3 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0y~yVA%j<%W<#)Nt=r2PC$yYz$3Dlfq`2Xgc%uT&5-~K zG8PB9J29*~C-V}>VM%xNb!1@J*w6hZkrgPH>gnPbQo;E4_Qu>p0V1srzw2BK*tx)Y zQR2p&hE0q!6?zWDiEsoaX--Q$*~-oCe^7JZ`rX=pthP_ve*0}%-tBK8*}2?6V;O30 zY|{B_;(Pt@!w<3VzyD6%e}BH&Y+pv8OoPa0o9WL#SFT%s{dNBK+mUe~L4oD3ckTOV z#sOqHtlAoD3UmqsLlb8Nh;k7I`HP`LEdi|3_W%=+r!cDlq{hL75oBFM29p?&Vz|hn z1ELnuL*v;^I<;W`IArh6I##&n%;y-8-3ljftyz}2>)O`}8@c_r-+o(t?H1T+KQ@$B hn(`ceT4D3=5A!5;yGt4J9lt>uJYD@<);T3K0RW86iYx#C literal 0 HcmV?d00001 diff --git a/Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png.meta b/Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png.meta new file mode 100644 index 00000000..7f59442f --- /dev/null +++ b/Assets/Image/UI/Panel_DynamicObjectInfo/IMG_InputFieldBG.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: afed828612c52d94da84460b8ce54227 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 50, y: 0, z: 50, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + 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: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/Rectangle 39.png b/Assets/Image/UI/Panel_DynamicObjectInfo/Rectangle 39.png similarity index 100% rename from Assets/Image/Rectangle 39.png rename to Assets/Image/UI/Panel_DynamicObjectInfo/Rectangle 39.png diff --git a/Assets/Image/Rectangle 39.png.meta b/Assets/Image/UI/Panel_DynamicObjectInfo/Rectangle 39.png.meta similarity index 100% rename from Assets/Image/Rectangle 39.png.meta rename to Assets/Image/UI/Panel_DynamicObjectInfo/Rectangle 39.png.meta diff --git a/Assets/Image/UI/Panel_ObjectDetails.meta b/Assets/Image/UI/Panel_ObjectDetails.meta new file mode 100644 index 00000000..191020c9 --- /dev/null +++ b/Assets/Image/UI/Panel_ObjectDetails.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c90c391a9ccbaac4d94985cd19ad3301 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UI/Panel_ObjectDetails/Item.png b/Assets/Image/UI/Panel_ObjectDetails/Item.png new file mode 100644 index 0000000000000000000000000000000000000000..64d1fd6bb89789836a96f6ee38a17f5468a865cb GIT binary patch literal 1374 zcmeAS@N?(olHy`uVBq!ia0y~yU`+tB7jUov$tLxq=YSMvfk$L91A~q?2s19VowgDv z$XFcY?!>U}oXkrghb7(7*O7r?V?XzwL{=d8v!{z=NCo5D8w&-S9T*r6`b%~8E%~w#-}hKOd-_f#JiwO|t#}_`qx-HXRV{aHIif6azzt#0C(> zAjm8Rq7;%2Fo9?no(K@t(80(Jq6G{S7(ukssOHfC8%-pm8H3J+!3oxXUF^qwW|eLO OS?uZR=d#Wzp$PzR3B23@ literal 0 HcmV?d00001 diff --git a/Assets/Image/UI/Panel_ObjectDetails/Item.png.meta b/Assets/Image/UI/Panel_ObjectDetails/Item.png.meta new file mode 100644 index 00000000..ea196231 --- /dev/null +++ b/Assets/Image/UI/Panel_ObjectDetails/Item.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 04d5bf3075524784aacfee0819b03873 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png b/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png new file mode 100644 index 0000000000000000000000000000000000000000..14a652bb0e64f5614276ec3d2c45a87e065d76dc GIT binary patch literal 2353 zcmeAS@N?(olHy`uVBq!ia0vp^8Vn3<4jgPi7I!B@0+8Y?@Q5sCV9@afVaBDl(^din z8H@jF{Fa=?X|zTB0pstK7Rb9#K?A2 zb_SP|mPN3Wm4}wa3Wjw}pF;)KHBD()-((^BfNulKwpPKiy5z(s%6lZ_j=zzg-)~~D z+j?>BpSjcLPJL;;x9V%w=UZE|>n$xUZ_4P)_oTl4Yjj)s^t<1w&wu>*(Z9R=eV+gQ z#HZ0_a)#OL?Ckx=UY&oQr1#BLTYGo%|F=hzKAv71y}e9-&wW?3S%<%U|31G@|7Ybc zne%#5zpfs*zCPYwD$##g{+t`(`zw4(bo||)ypO+=_p9j6HC4a2laF1z85J8_`)B9* zaJ$WyZ#{hYaR0q{hVaDaFJ8QO`0LlNd&lK#j0$2n{>v5eFVi-OcSxSZZ(mpc@uT$T z#J#U}+_ac#cD(%mFZ=iN>kZ9*{J!yF{$+lXw$BwlMX%p{Z9ht;>6^2cJk#P_}0`!(aQ z{0ZJ2aj5wH9`?_ndkl5gZ?*goH2<^S&09%PMNHa_QxAA0sBRF7;9SEJHp(3hjnTv~ zniockfzAo+jnLT^ z{%q>szkjDc-oG_-=bL*wi=Y2{nVU8x&-ZkC^}pvOP5SZsVs-;-l+&4=GP1IF?3b7v#m*>rUw8QY9(cgr{4_`*! zdE>wT=<3z0qwPNhoWE}?RrmjL_552O9z1yP^M|+D^3_|7^R(;#{y6JzcXkiZru@%* zmqjHH-h zKR-XWf1il??^n#P_f~(Ow^#oE=9iPs1Xlx<{}udxJAC`xeFt}h=k-)SoxE|E<+R@X z8((vhq96DF&E2;&wq$=km(BYRA3iL9{P^+NjlU9fq?HqrS=P+$o~c}R%A#i_Z g>FaCqm&p00i_>zopr0GGkOr2qf` literal 0 HcmV?d00001 diff --git a/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta b/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta new file mode 100644 index 00000000..73778d89 --- /dev/null +++ b/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f1cb146576e19ef44982428e10cc95cc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + 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: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AAA/Panel_AssetLibrary.prefab b/Assets/Prefabs/AAA/Panel_AssetLibrary.prefab index 29899b92..ab784900 100644 --- a/Assets/Prefabs/AAA/Panel_AssetLibrary.prefab +++ b/Assets/Prefabs/AAA/Panel_AssetLibrary.prefab @@ -1018,7 +1018,7 @@ MonoBehaviour: m_HandleRect: {fileID: 5808496954263173159} m_Direction: 2 m_Value: 0 - m_Size: 0.9999879 + m_Size: 0.99999654 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: -383.64026} - m_SizeDelta: {x: 420, y: 767.2806} + m_AnchoredPosition: {x: 210, y: -398.88998} + m_SizeDelta: {x: 420, y: 797.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7966294254755768478 CanvasRenderer: @@ -1542,7 +1542,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7b41071fb8834ed41a0bc8bd6a8bb179, type: 3} + m_Sprite: {fileID: 21300000, guid: 468cf9bafdc63b349964fb9003d6ae6b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -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.001809986} + m_AnchoredPosition: {x: -0.00034048597, y: -0.000008776059} 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 @@ -2056,7 +2056,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: 904d2ede4c73ebf4fb68a894caca44e1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -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: -473.35403} - m_SizeDelta: {x: 420, y: 762.2681} + m_AnchoredPosition: {x: 210, y: -491.10995} + m_SizeDelta: {x: 420, y: 797.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5930958411786542109 MonoBehaviour: @@ -2374,13 +2374,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 diff --git a/Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab b/Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab index b3d558aa..7a388231 100644 --- a/Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab +++ b/Assets/Prefabs/AAA/Panel_DynamicObjectInfo.prefab @@ -67,7 +67,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1931,7 +1931,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2260,7 +2260,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3124,13 +3124,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -3776,7 +3776,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3954,7 +3954,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4457,7 +4457,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5542,7 +5542,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5819,7 +5819,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6133,7 +6133,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6621,7 +6621,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8112,7 +8112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9236,7 +9236,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa7d0094ac9100e469d4353b04eb9808, type: 3} + m_Sprite: {fileID: 21300000, guid: afed828612c52d94da84460b8ce54227, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Prefabs/AAA/Panel_AGV.prefab b/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab similarity index 52% rename from Assets/Prefabs/AAA/Panel_AGV.prefab rename to Assets/Prefabs/AAA/Panel_ObjectDetails.prefab index d4c411cb..5222f70f 100644 --- a/Assets/Prefabs/AAA/Panel_AGV.prefab +++ b/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &526497522914516728 +--- !u!1 &994776427293782661 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,164 +8,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8228472450116164094} + - component: {fileID: 979949929095112567} + - component: {fileID: 4715266643647709109} + - component: {fileID: 7339657729187670402} + - component: {fileID: 8615167723002528565} m_Layer: 5 - m_Name: Sliding Area + m_Name: ScrollView m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8228472450116164094 +--- !u!224 &979949929095112567 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526497522914516728} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 994776427293782661} + 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: 8839646493412544996} - m_Father: {fileID: 401512557060220938} + - {fileID: 3284575757984556307} + - {fileID: 8240198726563448281} + 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: 0} - m_SizeDelta: {x: -20, y: -20} + m_AnchoredPosition: {x: 0, y: -28} + m_SizeDelta: {x: 0, y: -68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3116081274131626819 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 648271791709130949} - - component: {fileID: 6449206006417756257} - - component: {fileID: 8622579468672111839} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &648271791709130949 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3116081274131626819} - 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: 5284918005107039476} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &6449206006417756257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3116081274131626819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &8622579468672111839 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3116081274131626819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 1 ---- !u!1 &3282121051687117410 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8839646493412544996} - - component: {fileID: 8493490836511210305} - - component: {fileID: 5343463534162107796} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8839646493412544996 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3282121051687117410} - 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: 8228472450116164094} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8493490836511210305 +--- !u!222 &4715266643647709109 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3282121051687117410} + m_GameObject: {fileID: 994776427293782661} m_CullTransparentMesh: 1 ---- !u!114 &5343463534162107796 +--- !u!114 &7339657729187670402 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3282121051687117410} - m_Enabled: 1 + m_GameObject: {fileID: 994776427293782661} + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -175,84 +65,6 @@ MonoBehaviour: 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: 10905, guid: 0000000000000000f000000000000000, type: 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 &4627321495729127577 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5884999876027984185} - - component: {fileID: 8499806511425328339} - - component: {fileID: 8172187617670568482} - - component: {fileID: 5419496100268201668} - m_Layer: 5 - m_Name: Scroll View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5884999876027984185 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4627321495729127577} - 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: 5284918005107039476} - - {fileID: 401512557060220938} - m_Father: {fileID: 890093516518657518} - 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.5, y: 0.5} ---- !u!222 &8499806511425328339 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4627321495729127577} - m_CullTransparentMesh: 1 ---- !u!114 &8172187617670568482 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4627321495729127577} - 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: [] @@ -266,29 +78,29 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5419496100268201668 +--- !u!114 &8615167723002528565 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4627321495729127577} + m_GameObject: {fileID: 994776427293782661} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: - m_Content: {fileID: 648271791709130949} - m_Horizontal: 1 + m_Content: {fileID: 5270306773246299784} + m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 m_ScrollSensitivity: 1 - m_Viewport: {fileID: 5284918005107039476} + m_Viewport: {fileID: 3284575757984556307} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 5850445065573205654} + m_VerticalScrollbar: {fileID: 309722690153808588} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 @@ -296,7 +108,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &4653535049454866169 +--- !u!1 &1067352029484629165 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -304,228 +116,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5265721231338045504} - - component: {fileID: 9023385513771329929} - - component: {fileID: 5635362752153648150} - m_Layer: 5 - m_Name: Shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5265721231338045504 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4653535049454866169} - 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: 890093516518657518} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5, y: -5} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9023385513771329929 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4653535049454866169} - m_CullTransparentMesh: 1 ---- !u!114 &5635362752153648150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4653535049454866169} - 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: 0, g: 0, b: 0, a: 0.5882353} - 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: f56ca32cb6412e8408f7cbb20ec76055, type: 3} - 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: 32.34 ---- !u!1 &7827388610028740651 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 890093516518657518} - - component: {fileID: 3708113620981874956} - m_Layer: 5 - m_Name: Panel_AGV - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &890093516518657518 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7827388610028740651} - 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: 5265721231338045504} - - {fileID: 8894985241641706439} - - {fileID: 5884999876027984185} - m_Father: {fileID: 0} - 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: -344, y: -44} - m_SizeDelta: {x: 318, y: 350} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3708113620981874956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7827388610028740651} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50cc14a8fa6b2cb44ad7d2426e7e46eb, type: 3} - m_Name: - m_EditorClassIdentifier: - itemPrefab: {fileID: 0} - Content: {fileID: 0} ---- !u!1 &8376965345148250553 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5284918005107039476} - - component: {fileID: 4208425283836653291} - - component: {fileID: 7862337103266189211} - - component: {fileID: 6938476206511996365} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5284918005107039476 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376965345148250553} - 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: 648271791709130949} - m_Father: {fileID: 5884999876027984185} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!222 &4208425283836653291 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376965345148250553} - m_CullTransparentMesh: 1 ---- !u!114 &7862337103266189211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376965345148250553} - 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: 10917, guid: 0000000000000000f000000000000000, type: 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!114 &6938476206511996365 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8376965345148250553} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!1 &9073156140848815924 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 401512557060220938} - - component: {fileID: 3976759442335169353} - - component: {fileID: 844842048312376472} - - component: {fileID: 5850445065573205654} + - component: {fileID: 8240198726563448281} + - component: {fileID: 2753432120652475347} + - component: {fileID: 4782079994301126644} + - component: {fileID: 309722690153808588} m_Layer: 5 m_Name: Scrollbar Vertical m_TagString: Untagged @@ -533,41 +127,41 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &401512557060220938 +--- !u!224 &8240198726563448281 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9073156140848815924} + m_GameObject: {fileID: 1067352029484629165} 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: 8228472450116164094} - m_Father: {fileID: 5884999876027984185} + - {fileID: 32824153168451268} + m_Father: {fileID: 979949929095112567} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_AnchoredPosition: {x: -10, y: -21} + m_SizeDelta: {x: 10, y: -42} m_Pivot: {x: 1, y: 1} ---- !u!222 &3976759442335169353 +--- !u!222 &2753432120652475347 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9073156140848815924} + m_GameObject: {fileID: 1067352029484629165} m_CullTransparentMesh: 1 ---- !u!114 &844842048312376472 +--- !u!114 &4782079994301126644 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9073156140848815924} + m_GameObject: {fileID: 1067352029484629165} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -581,8 +175,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -591,13 +185,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5850445065573205654 +--- !u!114 &309722690153808588 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9073156140848815924} + m_GameObject: {fileID: 1067352029484629165} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} @@ -631,8 +225,8 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 5343463534162107796} - m_HandleRect: {fileID: 8839646493412544996} + m_TargetGraphic: {fileID: 8948871968567272353} + m_HandleRect: {fileID: 7223710907167175225} m_Direction: 2 m_Value: 0 m_Size: 1 @@ -640,7 +234,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &9158034230855959382 +--- !u!1 &1313217097417152501 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -648,65 +242,217 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8894985241641706439} - - component: {fileID: 6579675664579006244} - - component: {fileID: 8479324318254670499} - - component: {fileID: 7110797760534477117} + - component: {fileID: 2295368823960692346} + - component: {fileID: 7895264907707339938} + - component: {fileID: 1071224575033047940} + - component: {fileID: 3179333408656176646} m_Layer: 5 - m_Name: Image + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8894985241641706439 +--- !u!224 &2295368823960692346 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9158034230855959382} + m_GameObject: {fileID: 1313217097417152501} 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: 890093516518657518} + 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.5, y: 0.5} ---- !u!222 &6579675664579006244 + 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_Pivot: {x: 0, y: 0.5} +--- !u!222 &7895264907707339938 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9158034230855959382} + m_GameObject: {fileID: 1313217097417152501} m_CullTransparentMesh: 1 ---- !u!114 &8479324318254670499 +--- !u!114 &1071224575033047940 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9158034230855959382} + m_GameObject: {fileID: 1313217097417152501} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.10980392, b: 0.16470589, a: 1} + 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: 6ec9606ed4ae1114797a6477c630dc6a, type: 3} + m_text: Object Details + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2} + m_sharedMaterial: {fileID: 682561501981441939, guid: 9a2c7e704ad3e62438526dc8aecaeb56, 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: 18 + m_fontSizeBase: 18 + 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} +--- !u!114 &3179333408656176646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1313217097417152501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &1839572976385614123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3284575757984556307} + - component: {fileID: 9146053391999549397} + - component: {fileID: 2500553213858281822} + - component: {fileID: 5907310272105474969} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3284575757984556307 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839572976385614123} + 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: 5270306773246299784} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -7, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &9146053391999549397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839572976385614123} + m_CullTransparentMesh: 1 +--- !u!114 &2500553213858281822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839572976385614123} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -715,17 +461,547 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2.24 ---- !u!114 &7110797760534477117 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5907310272105474969 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9158034230855959382} + m_GameObject: {fileID: 1839572976385614123} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 + m_ShowMaskGraphic: 0 +--- !u!1 &2153055613226380309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7223710907167175225} + - component: {fileID: 81140109405287434} + - component: {fileID: 8948871968567272353} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7223710907167175225 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153055613226380309} + 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: 32824153168451268} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 10, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &81140109405287434 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153055613226380309} + m_CullTransparentMesh: 1 +--- !u!114 &8948871968567272353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153055613226380309} + 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: 0.8235294, g: 0.039215688, b: 0.06666667, 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: f1cb146576e19ef44982428e10cc95cc, 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 &2879873035033371409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7454734005950276455} + - component: {fileID: 4769479853751107732} + - component: {fileID: 9063655258294320490} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7454734005950276455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879873035033371409} + 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: 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4769479853751107732 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879873035033371409} + m_CullTransparentMesh: 1 +--- !u!114 &9063655258294320490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879873035033371409} + 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: 04d5bf3075524784aacfee0819b03873, 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 &3160034621987612258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5663835385068053268} + - component: {fileID: 4572823544555744691} + - component: {fileID: 3509179322429146433} + - component: {fileID: 5051537947376100282} + m_Layer: 5 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5663835385068053268 +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_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 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3160034621987612258} + m_CullTransparentMesh: 1 +--- !u!114 &3509179322429146433 +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: 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: 0} + 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 &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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8548883030255984469} + - component: {fileID: 4012943723070547587} + - component: {fileID: 1645696031615345962} + - component: {fileID: 9010114120321912530} + - component: {fileID: 2634423054637621953} + - component: {fileID: 6393868047658525319} + m_Layer: 5 + m_Name: Panel_ObjectDetails + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8548883030255984469 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5670507951867143541} + 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: 7454734005950276455} + - {fileID: 6366813177479495702} + - {fileID: 979949929095112567} + m_Father: {fileID: 0} + 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: 820} + m_SizeDelta: {x: 380, y: 490} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4012943723070547587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5670507951867143541} + m_CullTransparentMesh: 1 +--- !u!114 &1645696031615345962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5670507951867143541} + 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} + 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: 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 &9010114120321912530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5670507951867143541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!114 &2634423054637621953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5670507951867143541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3} + m_Name: + m_EditorClassIdentifier: + state: 0 + resizeDirection: 0 + handleThickness: 5 + minWidth: 100 + minHeight: 100 +--- !u!114 &6393868047658525319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5670507951867143541} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ec4bfde96c6f0542a6067bbdbacef07, type: 3} + m_Name: + m_EditorClassIdentifier: + itemPrefab: {fileID: 0} + Content: {fileID: 0} +--- !u!1 &6174212624029587273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5270306773246299784} + - component: {fileID: 7494035802797757901} + - component: {fileID: 5873980849089174723} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5270306773246299784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6174212624029587273} + 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: 3284575757984556307} + 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: 0} + m_SizeDelta: {x: -373, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7494035802797757901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6174212624029587273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5873980849089174723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6174212624029587273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 1 +--- !u!1 &7136169929383467880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6366813177479495702} + - component: {fileID: 574496857715440853} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6366813177479495702 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7136169929383467880} + 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: 5663835385068053268} + - {fileID: 2295368823960692346} + 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_Pivot: {x: 0.5, y: 1} +--- !u!114 &574496857715440853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7136169929383467880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa81ed666c3432441a47113a8812fc7c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7343595336361273330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32824153168451268} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &32824153168451268 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7343595336361273330} + 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: 7223710907167175225} + m_Father: {fileID: 8240198726563448281} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: -20} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/AAA/Panel_AGV.prefab.meta b/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab.meta similarity index 74% rename from Assets/Prefabs/AAA/Panel_AGV.prefab.meta rename to Assets/Prefabs/AAA/Panel_ObjectDetails.prefab.meta index 94897178..ac313be4 100644 --- a/Assets/Prefabs/AAA/Panel_AGV.prefab.meta +++ b/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0ffcbbc80efa4d4bab82b349252c4b1 +guid: f931459c154b09e4c98ab9a5082560e6 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab index 9caf5dcc..683a5015 100644 --- a/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1410781885430910492 +--- !u!1 &898623599988785233 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,50 +8,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2490111260065955132} - - component: {fileID: 4619594656901260396} - - component: {fileID: 3858053886766842753} + - component: {fileID: 2864750750059960060} + - component: {fileID: 4863941770406657708} + - component: {fileID: 3689444863914804834} m_Layer: 5 - m_Name: PRF_EntityItem + m_Name: Key m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2490111260065955132 +--- !u!224 &2864750750059960060 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410781885430910492} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 898623599988785233} + 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: 6625112702371143276} 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: -68.5, y: 0} - m_SizeDelta: {x: 151, y: 25} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 97.5, y: -15} + m_SizeDelta: {x: 145, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4619594656901260396 +--- !u!222 &4863941770406657708 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410781885430910492} + m_GameObject: {fileID: 898623599988785233} m_CullTransparentMesh: 1 ---- !u!114 &3858053886766842753 +--- !u!114 &3689444863914804834 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1410781885430910492} + m_GameObject: {fileID: 898623599988785233} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -65,17 +65,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + 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: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4285558896 + m_fontColor: {r: 0.4392157, g: 0.4392157, b: 0.4392157, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -92,13 +92,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -136,7 +136,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1546915061005647563 +--- !u!1 &5896256822038658749 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -144,50 +144,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3883938803033704821} - - component: {fileID: 4902551005294585158} - - component: {fileID: 1916338139708908773} + - component: {fileID: 1365789929337841785} + - component: {fileID: 1968510501827111838} + - component: {fileID: 2222224087702925707} m_Layer: 5 - m_Name: PRF_EntityItem + m_Name: Value m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3883938803033704821 +--- !u!224 &1365789929337841785 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1546915061005647563} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 5896256822038658749} + 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: 6625112702371143276} 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: 75.5, y: 0} - m_SizeDelta: {x: 137, y: 25} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 260, y: -15} + m_SizeDelta: {x: 180, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4902551005294585158 +--- !u!222 &1968510501827111838 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1546915061005647563} + m_GameObject: {fileID: 5896256822038658749} m_CullTransparentMesh: 1 ---- !u!114 &1916338139708908773 +--- !u!114 &2222224087702925707 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1546915061005647563} + m_GameObject: {fileID: 5896256822038658749} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -201,17 +201,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + 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: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -228,8 +228,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 11 - m_fontSizeBase: 11 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -300,12 +300,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2490111260065955132} - - {fileID: 3883938803033704821} + - {fileID: 2864750750059960060} + - {fileID: 1365789929337841785} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 288, y: 25} + m_SizeDelta: {x: 350, y: 30} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index d2e294ee..ad13c6a9 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -249,7 +249,7 @@ namespace Studio.AssetTool public void OnDeselectAll() { var canvas_Popup = CanvasManager.instance.GetCanvas(); - canvas_Popup.panel_agv.gameObject.SetActive(false); + canvas_Popup.panel_objectdetails.gameObject.SetActive(false); canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false); componentScrollView.DeselectAll(); canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull(); @@ -288,13 +288,13 @@ namespace Studio.AssetTool if (ManagerHub.instance.Get().curState == RunManager.EState.Run) { canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false); - canvas_Popup.panel_agv.SetTarget(selectedObjects); + canvas_Popup.panel_objectdetails.SetTarget(selectedObjects); } else { canvas_Popup.panel_dynamicobjectinfo.SetObjectInfo(name, selectedObjects); canvas_Popup.panel_dynamicobjectinfo.SetActive(true); - canvas_Popup.panel_agv.gameObject.SetActive(false); + canvas_Popup.panel_objectdetails.gameObject.SetActive(false); } canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects); } diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index efc74811..08e25597 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -47,7 +47,7 @@ namespace Studio public Panel_SaveAndNewChecker panel_saveandnewchecker; public Panel_SaveAndOpenChecker panel_saveandopenchecker; public Panel_DataRepository panel_datarepository; - public Panel_AGV panel_agv; + public Panel_ObjectDetails panel_objectdetails; public Panel_Toolbar panel_toolbar; public Panel_DataConnectModal panel_dataconnectmodal; public Panel_AlarmConnectModal panel_alarmconnectmodal; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta deleted file mode 100644 index a599f0a5..00000000 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 50cc14a8fa6b2cb44ad7d2426e7e46eb \ No newline at end of file diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs similarity index 67% rename from Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs rename to Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs index 4d4a575f..0d702df6 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs @@ -6,16 +6,19 @@ using UnityEngine; using XRLib.UI; using System.Linq; using Studio.Core; +using UnityEngine.UI; +using UnityEngine.UIElements; namespace Studio.UI { - public class Panel_AGV : PanelBase + public class Panel_ObjectDetails : PanelBase { public GameObject itemPrefab; public RectTransform Content; private Dictionary textDict = new(); private bool itemInit; private AbstractFunctionObject curObj; + private ScrollRect ScrollView; public override void AfterAwake() { @@ -27,7 +30,6 @@ namespace Studio.UI if (!itemInit) { InstantiateUI(entity); - itemInit = true; } else { @@ -51,9 +53,14 @@ namespace Studio.UI { itemInit = false; } + else + { + ClearText(); + } curObj = obj; OnUpdateData(curObj.Info); curObj.onDataUpdate += OnUpdateData; + ScrollView.verticalNormalizedPosition = 1f; SetActive(true); } else @@ -66,16 +73,19 @@ namespace Studio.UI { foreach (var kvp in textDict) { - print("enter"); if (kvp.Value != null) - Destroy(kvp.Value.gameObject); + { + Destroy(kvp.Value.transform.parent.gameObject); + } } textDict.Clear(); - if (entity == null) + if (entity == null || entity.Count == 0) return; + itemInit = true; + foreach (var kvp in entity) { GameObject item = Instantiate(itemPrefab, Content); @@ -85,13 +95,43 @@ namespace Studio.UI TMP_Text keyText = texts[0]; TMP_Text valueText = texts[1]; - keyText.text = kvp.Key; + keyText.text = ChangeLine(kvp.Key); valueText.text = kvp.Value; textDict[kvp.Key] = valueText; } } + string ChangeLine(string text) + { + int underscoreCount = 0; + var result = new System.Text.StringBuilder(); + + foreach (char c in text) + { + result.Append(c); + if (c == '_') + { + underscoreCount++; + if (underscoreCount % 2 == 0) + result.Append('\n'); + } + } + + return result.ToString(); + } + + private void ClearText() + { + foreach (var kvp in textDict) + { + if (kvp.Value != null) + { + kvp.Value.text = string.Empty; + } + } + } + public void UpdateUI(Dictionary entity) { if (entity == null) diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs.meta b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs.meta new file mode 100644 index 00000000..04c34b70 --- /dev/null +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDetails.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5ec4bfde96c6f0542a6067bbdbacef07 \ No newline at end of file -- 2.48.1.windows.1 From 2d32c93d8268fbb087470ed30989872e14e0bad1 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Wed, 28 May 2025 23:20:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Run=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Panel_Toolbox.cs | 2 +- Assets/Prefabs/AAA/Panel_ObjectDetails.prefab | 2 +- Assets/Scripts/Studio/Managers/RunManager.cs | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/Panel_Toolbox.cs b/Assets/Panel_Toolbox.cs index ebe4c658..2d71f822 100644 --- a/Assets/Panel_Toolbox.cs +++ b/Assets/Panel_Toolbox.cs @@ -64,7 +64,7 @@ namespace Studio.UI private void OnClickRun() { Debug.Log("On Click ToolBox Run"); - ManagerHub.instance.Get().Run(); + ManagerHub.instance.Get().ChangeState(); } private void OnClickCopyObject() diff --git a/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab b/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab index 5222f70f..4c0a32d6 100644 --- a/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab +++ b/Assets/Prefabs/AAA/Panel_ObjectDetails.prefab @@ -756,7 +756,7 @@ RectTransform: 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: 820} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 380, y: 490} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4012943723070547587 diff --git a/Assets/Scripts/Studio/Managers/RunManager.cs b/Assets/Scripts/Studio/Managers/RunManager.cs index 9fa2a417..23a283c4 100644 --- a/Assets/Scripts/Studio/Managers/RunManager.cs +++ b/Assets/Scripts/Studio/Managers/RunManager.cs @@ -27,7 +27,7 @@ namespace Studio.Manage { } - void ChangeState() + public void ChangeState() { ManagerHub.instance.Get().rtgController.ResetGizmo(); ManagerHub.instance.Get().OnDeselectAll(); @@ -49,7 +49,6 @@ namespace Studio.Manage public void Run() { - ChangeState(); MQTTConeect(); onRun?.Invoke(); } -- 2.48.1.windows.1