From 7006c702700337928af4b64319afdf3a036acd98 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Mon, 26 May 2025 17:41:54 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EB=B0=B1=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/PRF_EntityItem.prefab | 311 ++++++ .../Prefabs/UI/PRF_EntityItem.prefab.meta | 7 + Assets/Scenes/pre-0.24.0.unity | 947 +++++++++++++++++- .../Studio/AssetTool/CustomAssetConnector.cs | 43 + .../Studio/TwinObject/DynamicObject/AGV.cs | 4 +- .../TwinObject/DynamicObject/AGVManager.cs | 14 +- .../Scripts/Studio/UI/Canvas/Canvas_Popup.cs | 1 + Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs | 87 ++ .../Scripts/Studio/UI/Panel/Panel_AGV.cs.meta | 2 + Assets/TMPFolder/RJHTest.cs | 17 +- 10 files changed, 1383 insertions(+), 50 deletions(-) create mode 100644 Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab create mode 100644 Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab.meta create mode 100644 Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs create mode 100644 Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta diff --git a/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab new file mode 100644 index 00000000..09abf1e5 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab @@ -0,0 +1,311 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1410781885430910492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2490111260065955132} + - component: {fileID: 4619594656901260396} + - component: {fileID: 3858053886766842753} + m_Layer: 5 + m_Name: PRF_EntityItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2490111260065955132 +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_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, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 67, y: -25} + m_SizeDelta: {x: 134, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4619594656901260396 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410781885430910492} + m_CullTransparentMesh: 1 +--- !u!114 &3858053886766842753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410781885430910492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 13 + m_fontSizeBase: 13 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 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!1 &1546915061005647563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3883938803033704821} + - component: {fileID: 4902551005294585158} + - component: {fileID: 1916338139708908773} + m_Layer: 5 + m_Name: PRF_EntityItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3883938803033704821 +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_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, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 211, y: -25} + m_SizeDelta: {x: 154, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4902551005294585158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546915061005647563} + m_CullTransparentMesh: 1 +--- !u!114 &1916338139708908773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1546915061005647563} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 11 + m_fontSizeBase: 11 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 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!1 &7595299807217255251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6625112702371143276} + m_Layer: 5 + m_Name: PRF_EntityItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6625112702371143276 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7595299807217255251} + 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: 2490111260065955132} + - {fileID: 3883938803033704821} + 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_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab.meta b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab.meta new file mode 100644 index 00000000..2e5fda81 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/PRF_EntityItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b5e40c47ed9e07c4ea197197c5778d4f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 6bd77ae6..bb92a192 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -593,10 +593,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 5533745587376848395, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533745587376848395, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533745587376848395, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6001165989997805228, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_Name value: Panel_Hierarchy objectReference: {fileID: 0} + - target: {fileID: 6001165989997805228, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6653768687723039217, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -677,6 +693,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6843703199213034175, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6843703199213034175, guid: a2cabb78a78db4a4fa8074f87fa77991, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2241,6 +2265,7 @@ RectTransform: - {fileID: 1847741281} - {fileID: 1330774554} - {fileID: 1158992910} + - {fileID: 9200964090409750142} - {fileID: 416036583} - {fileID: 1223093458} - {fileID: 1265526094} @@ -2303,6 +2328,7 @@ MonoBehaviour: panel_loggingmodal: {fileID: 0} panel_exitchecker: {fileID: 0} panel_datarepository: {fileID: 0} + panel_agv: {fileID: 0} panel_dataconnectmodal: {fileID: 0} panel_alarmconnectmodal: {fileID: 0} panel_dynamicobjectinfo: {fileID: 0} @@ -3112,6 +3138,66 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7903913507570427698, guid: b0f606a28456e384ba973ec4b18be0b8, type: 3} m_PrefabInstance: {fileID: 7508193496350277438} m_PrefabAsset: {fileID: 0} +--- !u!1 &932062834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 932062835} + - component: {fileID: 932062837} + - component: {fileID: 932062836} + m_Layer: 0 + m_Name: AGVManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &932062835 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 932062834} + serializedVersion: 2 + 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: 1093055756} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &932062836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 932062834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86d8ea1a81790154fa1c1c2be6398b6a, type: 3} + m_Name: + m_EditorClassIdentifier: + testcrane: {fileID: 0} +--- !u!114 &932062837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 932062834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1af5890e725b4a74397a6abcbc5c8b43, type: 3} + m_Name: + m_EditorClassIdentifier: + AGVMoveSpeed: 0.35 + AGVRotateSpeed: 0.35 --- !u!1001 &982431036 PrefabInstance: m_ObjectHideFlags: 0 @@ -3510,6 +3596,7 @@ Transform: - {fileID: 294055731} - {fileID: 349372257} - {fileID: 1155210} + - {fileID: 932062835} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1093055757 @@ -3524,6 +3611,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2778cc56cc78c8a46846112e3aad69d2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1101406695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101406696} + - component: {fileID: 1101406698} + - component: {fileID: 1101406697} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1101406696 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101406695} + 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: 9200964090409750142} + 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 &1101406697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101406695} + 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!114 &1101406698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101406695} + 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!1 &1149817088 GameObject: m_ObjectHideFlags: 0 @@ -8035,6 +8199,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 495174325582678740, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8115,10 +8331,178 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2815481224497491875, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3263565422826670613, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3263565422826670613, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3759358454249268061, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3759358454249268061, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 161.97249 + objectReference: {fileID: 0} + - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: -9.5 + objectReference: {fileID: 0} + - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815791146998578607, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815791146998578607, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 141 + objectReference: {fileID: 0} + - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: -13.5 + objectReference: {fileID: 0} + - target: {fileID: 6929874536063340863, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6929874536063340863, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8351774369622538081, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8351774369622538081, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9168477493309714298, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_Name value: Panel_ObjectAlign objectReference: {fileID: 0} + - target: {fileID: 9168477493309714298, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8306,6 +8690,23 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 96b73e9674fb61c489cee99ad24c044c, type: 3} +--- !u!1 &608852145488146923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9200964090409750142} + - component: {fileID: 9200964090409750143} + m_Layer: 5 + m_Name: Panel_AGV + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!1001 &787432012062674274 PrefabInstance: m_ObjectHideFlags: 0 @@ -8979,6 +9380,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1620295574110254215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363657180628423806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1001 &1621939674436309667 PrefabInstance: m_ObjectHideFlags: 0 @@ -9205,10 +9619,50 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 1527203856372769176, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1527203856372769176, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1527203856372769176, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2089303510019304932, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2089303510019304932, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2112941324847836712, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_Name value: Panel_APISetting objectReference: {fileID: 0} + - target: {fileID: 2112941324847836712, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2551747771896630326, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4132525226981379914, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9289,6 +9743,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7312373301845048671, guid: 87e4fb57e7f74c84b93bbf2bcb594c8a, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -9718,6 +10176,36 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5063094354339566518, guid: 5809cf74e3a629e42bf933474b90da9e, type: 3} m_PrefabInstance: {fileID: 9142868344755881623} m_PrefabAsset: {fileID: 0} +--- !u!114 &2530919274335051659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5001823004387564314} + 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!1001 &2570102317851698346 PrefabInstance: m_ObjectHideFlags: 0 @@ -9820,6 +10308,14 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6423067481742790457, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} m_PrefabInstance: {fileID: 2270689292542780063} m_PrefabAsset: {fileID: 0} +--- !u!222 &2814747210913801582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5001823004387564314} + m_CullTransparentMesh: 1 --- !u!223 &3001244944336208615 Canvas: m_ObjectHideFlags: 0 @@ -9863,6 +10359,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &3363657180628423806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6969913027624532241} + - component: {fileID: 7747419271859413151} + - component: {fileID: 5950919761988488574} + - component: {fileID: 1620295574110254215} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &3674406319109641156 PrefabInstance: m_ObjectHideFlags: 0 @@ -10145,6 +10660,25 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 14ad3b0ce045a78489bb6454a8c15961, type: 3} +--- !u!224 &4153123928356064341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5001823004387564314} + 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: 9200964090409750142} + 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!1001 &4758802323030175704 PrefabInstance: m_ObjectHideFlags: 0 @@ -10254,6 +10788,10 @@ PrefabInstance: propertyPath: m_Name value: Panel_DynamiceObjectUISetting objectReference: {fileID: 0} + - target: {fileID: 2555259477019157526, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3208563252271698043, guid: a8d84c1dcfc6e14429622ce8fdad31d9, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10351,6 +10889,190 @@ PrefabInstance: propertyPath: m_Name value: Panel_DynamicObjectInfo objectReference: {fileID: 0} + - target: {fileID: 608852144605647841, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 848618009808465011, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 848618009808465011, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 848618009808465011, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 848618009808465011, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1859309152534818292, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1859309152534818292, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1859309152534818292, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1859309152534818292, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1902394532739411134, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1902394532739411134, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2047448688190000492, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2047448688190000492, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2330555342131705270, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2330555342131705270, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3657663828441376434, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3657663828441376434, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4961531573223514230, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4961531573223514230, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5104854847491523111, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5104854847491523111, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5104854847491523111, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5104854847491523111, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5131968177446389386, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5131968177446389386, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5461146480691723309, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5461146480691723309, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5461146480691723309, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5461146480691723309, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5523660396631953419, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5523660396631953419, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5540980596838283969, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5540980596838283969, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6281812992961326743, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6281812992961326743, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7758613525522378156, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7850683753892271836, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8445303588718473942, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8671480961771225462, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8671480961771225462, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8671480961771225462, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8671480961771225462, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8774443698649805937, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8774443698649805937, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8774443698649805937, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8774443698649805937, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9200964089680358516, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10436,6 +11158,24 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca5e845ff3c23fb41a1de8c2563209f1, type: 3} +--- !u!1 &5001823004387564314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4153123928356064341} + - component: {fileID: 2814747210913801582} + - component: {fileID: 2530919274335051659} + m_Layer: 5 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!224 &5012894770760959717 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} @@ -10603,6 +11343,36 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 238e9bf0b15101242a65d6bbe91baa83, type: 3} +--- !u!114 &5950919761988488574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363657180628423806} + 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.1254902, g: 0.10980392, b: 0.16470589, 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_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: 2.24 --- !u!1001 &6040850779371056381 PrefabInstance: m_ObjectHideFlags: 0 @@ -11303,6 +12073,25 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5646617864462788216, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} m_PrefabInstance: {fileID: 7521543121480788092} m_PrefabAsset: {fileID: 0} +--- !u!224 &6969913027624532241 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363657180628423806} + 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: 9200964090409750142} + 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!224 &7047787819321409150 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5430364097286531733, guid: feb22e94eb6961f40bd6c96cacb64a78, type: 3} @@ -11517,11 +12306,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 128303581629756085, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: -36 + value: 0 objectReference: {fileID: 0} - target: {fileID: 128303581629756085, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: -36.899994 + value: -37 objectReference: {fileID: 0} - target: {fileID: 347672539884164433, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_fontColor32.rgba @@ -11533,11 +12322,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 546968567859260519, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 10.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 546968567859260519, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 607692244183961160, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_sharedMaterial @@ -11545,11 +12334,11 @@ PrefabInstance: objectReference: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - target: {fileID: 1310233556491391864, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 10.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1310233556491391864, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1648310865598655017, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_sharedMaterial @@ -11557,11 +12346,11 @@ PrefabInstance: objectReference: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - target: {fileID: 1777446919333537455, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 8.73 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1777446919333537455, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1820111372267501214, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_fontColor32.rgba @@ -11581,51 +12370,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2880432237260609660, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2880432237260609660, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2880432237260609660, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2880432237260609660, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.y - value: -121.1 + value: -121 objectReference: {fileID: 0} - target: {fileID: 3431762670984669289, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3431762670984669289, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3431762670984669289, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.x - value: 8.972496 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3431762670984669289, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.y - value: -9.55 + value: -9.5 objectReference: {fileID: 0} - target: {fileID: 3760467042678663518, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3760467042678663518, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3760467042678663518, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3760467042678663518, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.y - value: -181.1 + value: -181 objectReference: {fileID: 0} - target: {fileID: 4018861715185301492, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMax.y @@ -11637,7 +12426,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4018861715185301492, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 27.1 + value: 27 objectReference: {fileID: 0} - target: {fileID: 4018861715185301492, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.x @@ -11645,23 +12434,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4018861715185301492, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.y - value: -13.55 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 4529312402391639267, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 10.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4529312402391639267, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4678721307155508104, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 10.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4678721307155508104, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5106688038999997032, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x @@ -11673,11 +12462,11 @@ PrefabInstance: objectReference: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - target: {fileID: 5579865544105394536, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 8.73 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5579865544105394536, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5646617864462788216, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_Pivot.x @@ -11777,7 +12566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6459886294968049577, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.y - value: -9.55 + value: -9.5 objectReference: {fileID: 0} - target: {fileID: 6537147272466692138, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_fontColor32.rgba @@ -11793,11 +12582,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7009426273995205102, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 10.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7009426273995205102, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7019012964559998986, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_fontColor32.rgba @@ -11817,35 +12606,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8166647501648000342, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 8.73 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8166647501648000342, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8403621215984817025, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x - value: 10.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8403621215984817025, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.y - value: 18.41 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509568743348807128, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509568743348807128, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509568743348807128, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509568743348807128, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_AnchoredPosition.y - value: -61.1 + value: -61 objectReference: {fileID: 0} - target: {fileID: 8713117423254242939, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} propertyPath: m_SizeDelta.x @@ -11856,6 +12645,14 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acd990f95a8adab4aa3448c76b2c7ac8, type: 3} +--- !u!222 &7747419271859413151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363657180628423806} + m_CullTransparentMesh: 1 --- !u!1001 &7890537475798597708 PrefabInstance: m_ObjectHideFlags: 0 @@ -11864,6 +12661,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 1079630229525563037, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1079630229525563037, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1241962839263925396, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11944,10 +12749,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3984079060075375163, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3984079060075375163, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3984079060075375163, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_SizeDelta.x + value: -17 + objectReference: {fileID: 0} - target: {fileID: 6916860067061408570, guid: b970071914aa54248b513564c76ca22c, type: 3} propertyPath: m_Name value: Panel_AppSetting objectReference: {fileID: 0} + - target: {fileID: 6916860067061408570, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9032033492709967980, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9032033492709967980, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9032033492709967980, guid: b970071914aa54248b513564c76ca22c, type: 3} + propertyPath: m_SizeDelta.x + value: -2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -12439,6 +13272,42 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d03aebf931b75b440a228af393aa7bbb, type: 3} +--- !u!224 &9200964090409750142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 608852145488146923} + 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: 4153123928356064341} + - {fileID: 6969913027624532241} + - {fileID: 1101406696} + m_Father: {fileID: 545811781} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &9200964090409750143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 608852145488146923} + 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index efd0cf52..78b7de8b 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Collections; using Studio.AssetLibraryTree; using Studio; +using System.Drawing.Printing; namespace Studio.AssetTool { @@ -126,6 +127,7 @@ namespace Studio.AssetTool selectedAssetData = null; return; } + selectedAssetData = item.linkedObject.GetComponent(); if (selectedAssetData == null || selectedAssetData.isLoadComplete == false) { @@ -144,6 +146,44 @@ namespace Studio.AssetTool selectedAssetData.AddTransformToRender(selectedItem.transform); CoroutineRunner.instance.StartCoroutine(ChangeSelectedAssetTransform()); } + public GameObject OnCreateAsset(string name) + { + AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file); + + if (item == null || item.linkedObject == null) + { + selectedAssetData = null; + return null; + } + + selectedAssetData = item.linkedObject.GetComponent(); + if (selectedAssetData == null || selectedAssetData.isLoadComplete == false) + { + selectedAssetData = null; + return null; + } + selectedItem = UnityEngine.GameObject.Instantiate(renderObjectPrefab); + selectRenderObject = selectedItem.GetComponent(); + //selectRenderObject.OnOverlabBegin += interferedObjectManager.AddInterferedPair; + //selectRenderObject.OnOverlabEnd += interferedObjectManager.RemoveInterferedPair; + selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate; + selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject; + selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary; + selectRenderObject.CreateRenderObject(); + selectedAssetData.AddTransformToRender(selectedItem.transform); + + ConnectedAsset connectedAsset = new ConnectedAsset + { + assetData = selectedAssetData, + hierarchyItem = componentScrollView.AddItem(selectedAssetData.assetName, selectedItem, HierarchyItemType.obj), + renderObject = selectRenderObject + }; + connectedAsset.renderObject.onTransformChanged = connectedAsset.assetData.OnTransformDataChanged; + var command = new CreateConnectedAssetCommand(connectedAsset); + CommandInvoker.instance.Invoke(command); + selectedAssetData = null; + return connectedAsset.hierarchyItem.linkedObject; + } public void OnAssetDropped(AssetLibraryItem item) { if (selectedAssetData == null) @@ -208,6 +248,7 @@ namespace Studio.AssetTool { var canvas_Popup = EventConnector.instance.GetCanvas(); canvas_Popup.panel_objectinfo.gameObject.SetActive(false); + canvas_Popup.panel_agv.gameObject.SetActive(false); componentScrollView.DeselectAll(); } @@ -240,6 +281,8 @@ namespace Studio.AssetTool { var canvas_Popup = EventConnector.instance.GetCanvas(); canvas_Popup.panel_objectinfo.SetObjectInfo(name, selectedObjects); + canvas_Popup.panel_objectinfo.SetActive(true); + canvas_Popup.panel_agv.SetTarget(selectedObjects[0]); canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects); } } diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs index 161976d7..d5d02ada 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs @@ -24,7 +24,7 @@ namespace Studio.Dynamic.TwinObject Quaternion startRot; Quaternion endRot; - private Dictionary CurrentEntity; + public Dictionary CurrentEntity; private bool isPlay = false; @@ -66,7 +66,7 @@ namespace Studio.Dynamic.TwinObject s += $"{t.Key}: {t.Value},"; } s += "}"; - Debug.Log(s); + //Debug.Log(s); SetPos(); } diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs index 75946f11..b3683829 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs @@ -4,6 +4,8 @@ using System.Linq; using UnityEngine; using Studio.Dynamic.TwinObject; using Studio.Core; +using Studio.Manage; +using Studio.AssetTool; namespace Studio.Dynamic.M { @@ -14,7 +16,14 @@ namespace Studio.Dynamic.M public float AGVMoveSpeed; public float AGVRotateSpeed; public Queue>> createAgvs = new(); - + + /// + /// MQTT + /// + /// + /// + /// + /// public void Init() { prf_AGV = Resources.Load("TestAGV"); @@ -45,7 +54,8 @@ namespace Studio.Dynamic.M private AGV CreateAGV(string type, string id ,Dictionary entity) { - var agv = Instantiate(prf_AGV,transform); + var agv = ManagerHub.instance.Get().OnCreateAsset("AGV").GetComponent(); + //var agv = Instantiate(prf_AGV,transform); agv.transform.position = Vector3.zero; agv.name = id; agv.SetMoveSpeed(AGVMoveSpeed); diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index e2220c03..1b52aac5 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -52,6 +52,7 @@ namespace Studio public Panel_LoggingModal panel_loggingmodal; public Panel_ExitChecker panel_exitchecker; public Panel_DataRepository panel_datarepository; + public Panel_AGV panel_agv; public Panel_DataConnectModal panel_dataconnectmodal; public Panel_AlarmConnectModal panel_alarmconnectmodal; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs new file mode 100644 index 00000000..9f794290 --- /dev/null +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs @@ -0,0 +1,87 @@ +using Studio.Dynamic.TwinObject; +using Studio.Dynamic.M; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using XRLib.UI; +using System.Linq; + +namespace Studio.UI +{ + public class Panel_AGV : PanelBase + { + public GameObject itemPrefab; + public RectTransform Content; + + private Dictionary keyToValueTextMap = new(); + private bool isInitialized = false; + + private bool itemInit; + public Dictionary CurrentEntity; + + private string targetId = string.Empty; + + public override void AfterAwake() + { + itemPrefab = Resources.Load("Prefabs/UI/PRF_EntityItem"); + } + + internal void OnUpdateData(object sender, StudioServiceIdEventArgs e) + { + if (!itemInit) + { + InstantiateUI(e.Entity); + itemInit = true; + } + else + { + UpdateUI(e.Entity); + } + } + + internal void SetTarget(GameObject selectedObject) + { + if (selectedObject.TryGetComponent(out AGV agv)) + { + StudioService.instance.RemoveTypeIdListener("AGV", targetId); + targetId = agv.name; + StudioService.instance.AddTypeIdListener("AGV", targetId, OnUpdateData); + SetActive(true); + } + else + { + SetActive(false); + } + } + + void InstantiateUI(Dictionary entity) + { + foreach (var kvp in entity) + { + GameObject item = Instantiate(itemPrefab, Content); + + var texts = item.GetComponentsInChildren(); + if (texts.Length < 2) continue; + + TMP_Text keyText = texts[0]; + TMP_Text valueText = texts[1]; + + keyText.text = kvp.Key; + valueText.text = kvp.Value; + + keyToValueTextMap[kvp.Key] = valueText; + } + } + + public void UpdateUI(Dictionary entity) + { + foreach (var kvp in entity) + { + if (keyToValueTextMap.TryGetValue(kvp.Key, out var valueText)) + { + valueText.text = kvp.Value; + } + } + } + } +} diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta new file mode 100644 index 00000000..a599f0a5 --- /dev/null +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 50cc14a8fa6b2cb44ad7d2426e7e46eb \ No newline at end of file diff --git a/Assets/TMPFolder/RJHTest.cs b/Assets/TMPFolder/RJHTest.cs index 3beca4f0..5aa43aaa 100644 --- a/Assets/TMPFolder/RJHTest.cs +++ b/Assets/TMPFolder/RJHTest.cs @@ -1,8 +1,11 @@ -using Studio; +using NUnit.Framework; +using Studio; using Studio.Auth; using Studio.Conifg; using Studio.Dynamic.M; using Studio.Staic.STKC; +using Studio.UI; +using System.Linq; using System.Threading.Tasks; using UnityEngine; @@ -29,7 +32,7 @@ namespace Studio { StudioService.instance.ConnectMQTT(mqtt.domain,mqtt.port,mqtt.topics); } - testcrane.Init("STOCKER_CRANE"); + //testcrane.Init("STOCKER_CRANE"); AGVManager.instance.Init(); } @@ -48,17 +51,17 @@ namespace Studio } if (Input.GetKeyDown(KeyCode.I)) { - // StudioService.instance.SubscribeMQTT("STOCKER_CRANE"); - + //종료 } if(Input.GetKeyDown(KeyCode.U)) { + //시작 + TestConeect(); // StudioService.instance.SubscribeMQTT("AGV"); } - if(Input.GetKeyDown(KeyCode.T)) + if (Input.GetKeyDown(KeyCode.T)) { - - TestTask(); + Studio.Manage.EventConnector.instance.GetCanvas().panel_agv.SetTarget(AGVManager.instance.agvs.ToList()[5].gameObject); } } -- 2.48.1.windows.1 From 1d629af7ee049a026cfc7bdb0dc6dd63db86ba81 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Mon, 26 May 2025 19:13:46 +0900 Subject: [PATCH 2/7] =?UTF-8?q?AGV=20=EC=A0=95=EB=B3=B4=20=EC=B0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Studio/AssetTool/CustomAssetConnector.cs | 51 +++++-------------- .../TwinObject/DynamicObject/AGVManager.cs | 2 +- Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs | 7 ++- Assets/TMPFolder/RJHTest.cs | 4 -- 4 files changed, 19 insertions(+), 45 deletions(-) diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 78b7de8b..021eb9e7 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -120,6 +120,17 @@ namespace Studio.AssetTool } } + public GameObject CreateAsset(string name) + { + AssetLibraryItem item = assetScrollView.FindItem("Palletrobot", AssetLibraryItemType.file); + + OnAssetSelected(item); + GameObject obj = selectRenderObject.gameObject; + OnAssetDropped(item); + return obj; + } + + public void OnAssetSelected(AssetLibraryItem item) { if (item == null || item.linkedObject == null) @@ -146,44 +157,6 @@ namespace Studio.AssetTool selectedAssetData.AddTransformToRender(selectedItem.transform); CoroutineRunner.instance.StartCoroutine(ChangeSelectedAssetTransform()); } - public GameObject OnCreateAsset(string name) - { - AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file); - - if (item == null || item.linkedObject == null) - { - selectedAssetData = null; - return null; - } - - selectedAssetData = item.linkedObject.GetComponent(); - if (selectedAssetData == null || selectedAssetData.isLoadComplete == false) - { - selectedAssetData = null; - return null; - } - selectedItem = UnityEngine.GameObject.Instantiate(renderObjectPrefab); - selectRenderObject = selectedItem.GetComponent(); - //selectRenderObject.OnOverlabBegin += interferedObjectManager.AddInterferedPair; - //selectRenderObject.OnOverlabEnd += interferedObjectManager.RemoveInterferedPair; - selectRenderObject.OnSelected += panel_ObjectDistance.SelectObjectFromCreate; - selectRenderObject.instantiateObject = selectedAssetData.InstantiateLoadedObject; - selectRenderObject.getBounds = selectedAssetData.GetCombinedBoundary; - selectRenderObject.CreateRenderObject(); - selectedAssetData.AddTransformToRender(selectedItem.transform); - - ConnectedAsset connectedAsset = new ConnectedAsset - { - assetData = selectedAssetData, - hierarchyItem = componentScrollView.AddItem(selectedAssetData.assetName, selectedItem, HierarchyItemType.obj), - renderObject = selectRenderObject - }; - connectedAsset.renderObject.onTransformChanged = connectedAsset.assetData.OnTransformDataChanged; - var command = new CreateConnectedAssetCommand(connectedAsset); - CommandInvoker.instance.Invoke(command); - selectedAssetData = null; - return connectedAsset.hierarchyItem.linkedObject; - } public void OnAssetDropped(AssetLibraryItem item) { if (selectedAssetData == null) @@ -282,7 +255,7 @@ namespace Studio.AssetTool var canvas_Popup = EventConnector.instance.GetCanvas(); canvas_Popup.panel_objectinfo.SetObjectInfo(name, selectedObjects); canvas_Popup.panel_objectinfo.SetActive(true); - canvas_Popup.panel_agv.SetTarget(selectedObjects[0]); + canvas_Popup.panel_agv.SetTarget(selectedObjects); canvas_Popup.panel_objectdistance.SelectObjectFromClick(name, selectedObjects); } } diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs index b3683829..3c856891 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs @@ -54,7 +54,7 @@ namespace Studio.Dynamic.M private AGV CreateAGV(string type, string id ,Dictionary entity) { - var agv = ManagerHub.instance.Get().OnCreateAsset("AGV").GetComponent(); + var agv = ManagerHub.instance.Get().CreateAsset("AGV").AddComponent(); //var agv = Instantiate(prf_AGV,transform); agv.transform.position = Vector3.zero; agv.name = id; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs index 9f794290..fd09d27b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs @@ -39,8 +39,13 @@ namespace Studio.UI } } - internal void SetTarget(GameObject selectedObject) + internal void SetTarget(List selectedObjects) { + if (selectedObjects.Count == 0) + return; + + GameObject selectedObject = selectedObjects[0]; + if (selectedObject.TryGetComponent(out AGV agv)) { StudioService.instance.RemoveTypeIdListener("AGV", targetId); diff --git a/Assets/TMPFolder/RJHTest.cs b/Assets/TMPFolder/RJHTest.cs index 5aa43aaa..3ac50571 100644 --- a/Assets/TMPFolder/RJHTest.cs +++ b/Assets/TMPFolder/RJHTest.cs @@ -59,10 +59,6 @@ namespace Studio TestConeect(); // StudioService.instance.SubscribeMQTT("AGV"); } - if (Input.GetKeyDown(KeyCode.T)) - { - Studio.Manage.EventConnector.instance.GetCanvas().panel_agv.SetTarget(AGVManager.instance.agvs.ToList()[5].gameObject); - } } private async Task TestTask() -- 2.48.1.windows.1 From a81e0401238b96ecedfa3810c5a96740fc5a550d Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 27 May 2025 14:54:39 +0900 Subject: [PATCH 3/7] =?UTF-8?q?AGV=20=EC=A0=95=EB=B3=B4=20=EC=B0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Images/Run.png} | Bin .../Images/Run.png.meta} | 0 .../Images/Stop.Png} | Bin .../Images/Stop.Png.meta} | 0 .../Pause.png => Resources/Images/Stop2.png} | Bin .../Images/Stop2.png.meta} | 0 Assets/Scenes/pre-0.24.0.unity | 154 +++++++++++++++++- .../Studio/AssetTool/CustomAssetConnector.cs | 17 +- .../Studio/Connect/StudioRepoistory.cs | 46 +++++- .../Scripts/Studio/Connect/StudioService.cs | 19 ++- Assets/Scripts/Studio/Managers/ManagerHub.cs | 1 + Assets/Scripts/Studio/Managers/RunManager.cs | 71 ++++++++ .../Studio/Managers/RunManager.cs.meta | 2 + .../Studio/TwinObject/DynamicObject/AGV.cs | 2 + .../TwinObject/DynamicObject/AGVManager.cs | 21 ++- .../Scripts/Studio/UI/Canvas/Canvas_Static.cs | 3 + Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs | 36 ++-- .../Studio/UI/Panel/Panel_StudioTopBar.cs | 20 ++- Assets/TMPFolder/RJHTest.cs | 18 +- 19 files changed, 354 insertions(+), 56 deletions(-) rename Assets/{Image/2.0.0/Topbar/solar_play-bold.png => Resources/Images/Run.png} (100%) rename Assets/{Image/2.0.0/Topbar/solar_play-bold.png.meta => Resources/Images/Run.png.meta} (100%) rename Assets/{Image/Icons/Icon_PictoIcons/64/Pictoicon_Control_Pause.Png => Resources/Images/Stop.Png} (100%) rename Assets/{Image/Icons/Icon_PictoIcons/64/Pictoicon_Control_Pause.Png.meta => Resources/Images/Stop.Png.meta} (100%) rename Assets/{Textures/ModernUIPack/Icon/Media/Pause.png => Resources/Images/Stop2.png} (100%) rename Assets/{Textures/ModernUIPack/Icon/Media/Pause.png.meta => Resources/Images/Stop2.png.meta} (100%) create mode 100644 Assets/Scripts/Studio/Managers/RunManager.cs create mode 100644 Assets/Scripts/Studio/Managers/RunManager.cs.meta diff --git a/Assets/Image/2.0.0/Topbar/solar_play-bold.png b/Assets/Resources/Images/Run.png similarity index 100% rename from Assets/Image/2.0.0/Topbar/solar_play-bold.png rename to Assets/Resources/Images/Run.png diff --git a/Assets/Image/2.0.0/Topbar/solar_play-bold.png.meta b/Assets/Resources/Images/Run.png.meta similarity index 100% rename from Assets/Image/2.0.0/Topbar/solar_play-bold.png.meta rename to Assets/Resources/Images/Run.png.meta diff --git a/Assets/Image/Icons/Icon_PictoIcons/64/Pictoicon_Control_Pause.Png b/Assets/Resources/Images/Stop.Png similarity index 100% rename from Assets/Image/Icons/Icon_PictoIcons/64/Pictoicon_Control_Pause.Png rename to Assets/Resources/Images/Stop.Png diff --git a/Assets/Image/Icons/Icon_PictoIcons/64/Pictoicon_Control_Pause.Png.meta b/Assets/Resources/Images/Stop.Png.meta similarity index 100% rename from Assets/Image/Icons/Icon_PictoIcons/64/Pictoicon_Control_Pause.Png.meta rename to Assets/Resources/Images/Stop.Png.meta diff --git a/Assets/Textures/ModernUIPack/Icon/Media/Pause.png b/Assets/Resources/Images/Stop2.png similarity index 100% rename from Assets/Textures/ModernUIPack/Icon/Media/Pause.png rename to Assets/Resources/Images/Stop2.png diff --git a/Assets/Textures/ModernUIPack/Icon/Media/Pause.png.meta b/Assets/Resources/Images/Stop2.png.meta similarity index 100% rename from Assets/Textures/ModernUIPack/Icon/Media/Pause.png.meta rename to Assets/Resources/Images/Stop2.png.meta diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 47fc4c71..96573c4e 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -1558,9 +1558,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + insertIndex: -1 + addedObject: {fileID: 1555786595} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3} +--- !u!224 &396217242 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + m_PrefabInstance: {fileID: 396217241} + m_PrefabAsset: {fileID: 0} --- !u!224 &416036583 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7844719208258716390, guid: 96b73e9674fb61c489cee99ad24c044c, type: 3} @@ -2315,7 +2323,7 @@ MonoBehaviour: panel_interferedobjectlist: {fileID: 0} panel_assetproperties: {fileID: 0} panel_predefinedtype: {fileID: 0} - panel_objectinfo: {fileID: 0} + panel_dynamicobjectinfo: {fileID: 0} panel_objectalign: {fileID: 0} panel_tooltip: {fileID: 0} panel_propertyviewer: {fileID: 0} @@ -2333,7 +2341,6 @@ MonoBehaviour: panel_agv: {fileID: 0} panel_dataconnectmodal: {fileID: 0} panel_alarmconnectmodal: {fileID: 0} - panel_dynamicobjectinfo: {fileID: 0} --- !u!114 &545811783 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7805,6 +7812,147 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e770d58ca963cd42a42328ab60b8216, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1555786594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1555786595} + - component: {fileID: 1555786599} + - component: {fileID: 1555786598} + - component: {fileID: 1555786596} + - component: {fileID: 1555786600} + m_Layer: 5 + m_Name: Button_Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1555786595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555786594} + 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: 396217242} + 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: -15, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1555786596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555786594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &1555786598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555786594} + 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: 16ab77a8cc636504bada37c9dd4971ef, 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!222 &1555786599 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555786594} + m_CullTransparentMesh: 1 +--- !u!114 &1555786600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1555786594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1555786598} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &1572491609 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 070ab6ce..30ff252d 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -10,6 +10,7 @@ using System.Collections; using Studio.AssetLibraryTree; using Studio; using System.Drawing.Printing; +using System.Diagnostics.Eventing.Reader; namespace Studio.AssetTool { @@ -122,7 +123,7 @@ namespace Studio.AssetTool public GameObject CreateAsset(string name) { - AssetLibraryItem item = assetScrollView.FindItem("Palletrobot", AssetLibraryItemType.file); + AssetLibraryItem item = assetScrollView.FindItem(name, AssetLibraryItemType.file); OnAssetSelected(item); GameObject obj = selectRenderObject.gameObject; @@ -281,9 +282,17 @@ namespace Studio.AssetTool internal void OnSelectObjects(string name, List selectedObjects) { var canvas_Popup = EventConnector.instance.GetCanvas(); - canvas_Popup.panel_dynamicobjectinfo.SetObjectInfo(name, selectedObjects); - canvas_Popup.panel_dynamicobjectinfo.SetActive(true); - canvas_Popup.panel_agv.SetTarget(selectedObjects); + if (ManagerHub.instance.Get().curState == RunManager.EState.Run) + { + canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false); + canvas_Popup.panel_agv.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_objectdistance.SelectObjectFromClick(name, selectedObjects); } } diff --git a/Assets/Scripts/Studio/Connect/StudioRepoistory.cs b/Assets/Scripts/Studio/Connect/StudioRepoistory.cs index ec032dfd..af820897 100644 --- a/Assets/Scripts/Studio/Connect/StudioRepoistory.cs +++ b/Assets/Scripts/Studio/Connect/StudioRepoistory.cs @@ -3,6 +3,7 @@ using Best.MQTT.Packets.Builders; using Newtonsoft.Json.Linq; using Studio.Conifg; using Studio.Setting.Connect; +using Studio.Util; using System; using System.Collections.Generic; using System.Text; @@ -36,7 +37,7 @@ namespace Studio public void MQTTCreateConnect(string MQTTDomain,string MQTTPort) { - var conntedInfo = $"MQTT Domain : {MQTTDomain} , MQTTPORT :{MQTTPort}"; + var conntedInfo = CreateConntedInfo(MQTTDomain, MQTTPort); Debug.Log(conntedInfo); var port = int.Parse(MQTTPort); var options = new ConnectionOptionsBuilder() @@ -57,6 +58,23 @@ namespace Studio clients[conntedInfo].OnDisconnect += OnDisconnectedMQTT; clients[conntedInfo].OnError += OnErrorMQTT; } + public string CreateConntedInfo(string MQTTDomain, string MQTTPort) + { + return $"MQTT Domain : {MQTTDomain} , MQTTPORT :{MQTTPort}"; + } + public MQTTClient FindClient(string MQTTDomain, string MQTTPort) + { + string key = CreateConntedInfo(MQTTDomain, MQTTPort); + if (clients.ContainsKey(key)) + { + return clients[key]; + } + else + { + return null; + } + } + private ConnectPacketBuilder ConnectPacketBuilderCallback(MQTTClient client, ConnectPacketBuilder builder) { return builder.WithKeepAlive(60 * 60);//keep alive 1시간으로 @@ -100,7 +118,6 @@ namespace Studio } } - private void OnStateChangedMQTT(MQTTClient client, ClientStates oldState, ClientStates newState) { Debug.Log($"{oldState} => {newState}"); @@ -118,6 +135,17 @@ namespace Studio Debug.Log($"MQTT OnConnected"); } + public void DisConnectMQTT() + { + foreach (var client in clients) + { + client.Value?.CreateDisconnectPacketBuilder() + .WithReasonCode(DisconnectReasonCodes.NormalDisconnection) + .WithReasonString($"{client.Value.Options.Host} Disconnecting") + .BeginDisconnect(); + } + } + /// /// 구독 /// @@ -140,6 +168,19 @@ namespace Studio .BeginUnsubscribe(); } + public void UnSubscibeAll() + { + List mqttConnections = ConfigConnected.MQTTSettings.mqttConnections; + + foreach (var connection in mqttConnections) + { + foreach (var topic in connection.topics) + { + UnSubscibe(FindClient(connection.domain, connection.port), topic.topic); + } + } + } + private void OnTopic(MQTTClient client, SubscriptionTopic topic, string topicName, ApplicationMessage message) { string payload = Encoding.UTF8.GetString(message.Payload.Data, message.Payload.Offset, message.Payload.Count); @@ -200,5 +241,6 @@ namespace Studio } } + } } diff --git a/Assets/Scripts/Studio/Connect/StudioService.cs b/Assets/Scripts/Studio/Connect/StudioService.cs index fbbbbde3..2a088bb3 100644 --- a/Assets/Scripts/Studio/Connect/StudioService.cs +++ b/Assets/Scripts/Studio/Connect/StudioService.cs @@ -40,8 +40,8 @@ namespace Studio public class StudioService : UnitySingleton { - private Dictionary>> listenerIdMap; - private Dictionary> listenerTypeMap; + private Dictionary>> listenerIdMap =new(); + private Dictionary> listenerTypeMap = new(); private StudioRepoistory repository; private Dictionary updateTime = new(); @@ -76,24 +76,27 @@ namespace Studio private Dictionary> topicTable = new(); public Dictionary> TopciTable { get { return topicTable; } } - public void ConnectMQTT(string domain, string port, List topics) + public void Init() { this.repository = new StudioRepoistory(); - listenerIdMap = new Dictionary>>(); - listenerTypeMap = new Dictionary>(); - repository.OnTopicList += OnTopicList; - + } + public void ConnectMQTT(string domain, string port, List topics) + { var conntedInfo = $"MQTT Domain : {domain} , MQTTPORT :{port}"; if (!topicTable.ContainsKey(conntedInfo)) topicTable.Add(conntedInfo, new()); topicTable[conntedInfo] = topics; repository.MQTTCreateConnect(domain, port); - repository.MQTTConnect(conntedInfo); } + public void DisConnectMQTT() + { + repository.DisConnectMQTT(); + } + private void OnTopicList(string type, Dictionary> entities) { DateTime now = DateTime.Now; diff --git a/Assets/Scripts/Studio/Managers/ManagerHub.cs b/Assets/Scripts/Studio/Managers/ManagerHub.cs index 575647f7..40bbb205 100644 --- a/Assets/Scripts/Studio/Managers/ManagerHub.cs +++ b/Assets/Scripts/Studio/Managers/ManagerHub.cs @@ -26,6 +26,7 @@ namespace Studio.Manage Join(new AGVManager()); Join(new AssetManager()); Join(new SceneStartSettingService()); + Join(new RunManager()); foreach(var m in managers) { diff --git a/Assets/Scripts/Studio/Managers/RunManager.cs b/Assets/Scripts/Studio/Managers/RunManager.cs new file mode 100644 index 00000000..2bf47940 --- /dev/null +++ b/Assets/Scripts/Studio/Managers/RunManager.cs @@ -0,0 +1,71 @@ +using NUnit.Framework; +using Studio.Conifg; +using Studio.Manage; +using Studio.Util; +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Studio.Manage +{ + public class RunManager : Manager + { + public event Action onRun; + public event Action onStop; + + public enum EState + { + Run, + Stop, + Exit, + } + + public EState curState = EState.Stop; + + public override void Init() + { + StudioService.instance.Init(); + onRun += Dynamic.M.AGVManager.instance.OnPlayStart; + onStop += StudioService.instance.DisConnectMQTT; + } + + public void ChangeState() + { + curState = curState == EState.Stop ? EState.Run : EState.Stop; + Debug.Log("curState " + curState); + switch (curState) + { + case EState.Run: + Run(); + break; + case EState.Stop: + Stop(); + break; + + case EState.Exit: + break; + } + } + + public void Run() + { + MQTTConeect(); + onRun?.Invoke(); + } + + public void Stop() + { + onStop?.Invoke(); + } + + public void MQTTConeect() + { + var mqttsettings = ConfigConnected.MQTTSettings; + + foreach (var mqtt in mqttsettings.mqttConnections) + { + StudioService.instance.ConnectMQTT(mqtt.domain, mqtt.port, mqtt.topics); + } + } + } +} diff --git a/Assets/Scripts/Studio/Managers/RunManager.cs.meta b/Assets/Scripts/Studio/Managers/RunManager.cs.meta new file mode 100644 index 00000000..d7ce2cae --- /dev/null +++ b/Assets/Scripts/Studio/Managers/RunManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1e365cd468c835846860290f5fa3f1aa \ No newline at end of file diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs index f1582f51..62b1d916 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGV.cs @@ -23,6 +23,7 @@ namespace Studio.Dynamic.TwinObject Quaternion startRot; Quaternion endRot; + public Action> onDataUpdate; public Dictionary CurrentEntity; private bool isPlay = false; @@ -82,6 +83,7 @@ namespace Studio.Dynamic.TwinObject s += "}"; //Debug.Log(s); SetPos(); + onDataUpdate?.Invoke(CurrentEntity); } diff --git a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs index 9b058157..9a60709d 100644 --- a/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs +++ b/Assets/Scripts/Studio/TwinObject/DynamicObject/AGVManager.cs @@ -12,7 +12,7 @@ namespace Studio.Dynamic.M { public class AGVManager : UnitySingleton { - private GameObject prf_AGV; + private CustomAssetRenderObject renderobject; private HashSet agvs = new(); public float AGVMoveSpeed; public float AGVRotateSpeed; @@ -20,20 +20,19 @@ namespace Studio.Dynamic.M public void Awake() { - //이벤트 걸어둔다.. //+= OnPlayStart } public void OnPlayStart() { - var type = GetComponent().addTopic; - var assets = ConfigConnected.AssetSettings; - prf_AGV = assets[type].loadedObject; - if (prf_AGV == null) - { - //todo::팝업메시지 나주엥 설정.... - return; - } + //var type = GetComponent().addTopic; + // var assets = ConfigConnected.AssetSettings; + //prf_AGV = assets[type].loadedObject; + //var connector = ManagerHub.instance.Get(); + //ConnectedAsset searchAsset = connector.connectedAssets.FirstOrDefault(x => x.renderObject == renderobject); + //searchAsset.assetData.assetName + var type = "AGV"; + StudioService.instance.AddTypeListener(type, OnDataUpdate); StudioService.instance.AddTypeIdListener(type); } @@ -61,7 +60,7 @@ namespace Studio.Dynamic.M private AGV CreateAGV(string type, string id ,Dictionary entity) { - var agv = ManagerHub.instance.Get().CreateAsset("AGV").AddComponent(); + var agv = ManagerHub.instance.Get().CreateAsset("Palletrobot").AddComponent(); //var agv = Instantiate(prf_AGV,transform); // var agv = Instantiate(prf_AGV,transform).AddComponent(); diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs index 33b5466a..da2a8e7e 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Static.cs @@ -26,12 +26,15 @@ namespace Studio.UI var renderObjectHandler = ManagerHub.instance.Get(); var fbxFileManager = ManagerHub.instance.Get(); var projectManager = ManagerHub.instance.Get(); + var runManager = ManagerHub.instance.Get(); statusPanel.SetMode(ModePanel.ProgramMode.ObjectLayout); //panel_studiotopbar.onClickAssetLibraryWindow += fbxFileManager.LoadLocalData; panel_studiotopbar.onClickNewProject += () => CommandInvoker.instance.Invoke(new SaveProjectCommand()); panel_studiotopbar.onClickSaveProject += () => CommandInvoker.instance.Invoke(new SaveProjectCommand()); + + panel_studiotopbar.onClickPlay += runManager.ChangeState; } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs index fd09d27b..164c4d0b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AGV.cs @@ -5,6 +5,7 @@ using TMPro; using UnityEngine; using XRLib.UI; using System.Linq; +using Studio.Core; namespace Studio.UI { @@ -12,30 +13,26 @@ namespace Studio.UI { public GameObject itemPrefab; public RectTransform Content; - - private Dictionary keyToValueTextMap = new(); - private bool isInitialized = false; - + private Dictionary textDict = new(); private bool itemInit; - public Dictionary CurrentEntity; - private string targetId = string.Empty; + private AGV prevAgv; public override void AfterAwake() { itemPrefab = Resources.Load("Prefabs/UI/PRF_EntityItem"); } - internal void OnUpdateData(object sender, StudioServiceIdEventArgs e) + internal void OnUpdateData(Dictionary entity) { if (!itemInit) { - InstantiateUI(e.Entity); + InstantiateUI(entity); itemInit = true; } else { - UpdateUI(e.Entity); + UpdateUI(entity); } } @@ -44,14 +41,20 @@ namespace Studio.UI if (selectedObjects.Count == 0) return; - GameObject selectedObject = selectedObjects[0]; + GameObject selectedObject = selectedObjects[0]; + if (prevAgv != null) + { + prevAgv.onDataUpdate -= InstantiateUI; + prevAgv = null; + } if (selectedObject.TryGetComponent(out AGV agv)) { - StudioService.instance.RemoveTypeIdListener("AGV", targetId); - targetId = agv.name; - StudioService.instance.AddTypeIdListener("AGV", targetId, OnUpdateData); + var dic = agv.Info; SetActive(true); + prevAgv = agv; + OnUpdateData(dic); + agv.onDataUpdate += OnUpdateData; } else { @@ -66,7 +69,6 @@ namespace Studio.UI GameObject item = Instantiate(itemPrefab, Content); var texts = item.GetComponentsInChildren(); - if (texts.Length < 2) continue; TMP_Text keyText = texts[0]; TMP_Text valueText = texts[1]; @@ -74,7 +76,7 @@ namespace Studio.UI keyText.text = kvp.Key; valueText.text = kvp.Value; - keyToValueTextMap[kvp.Key] = valueText; + textDict[kvp.Key] = valueText; } } @@ -82,9 +84,9 @@ namespace Studio.UI { foreach (var kvp in entity) { - if (keyToValueTextMap.TryGetValue(kvp.Key, out var valueText)) + if (textDict.TryGetValue(kvp.Key, out var txt)) { - valueText.text = kvp.Value; + txt.text = kvp.Value; } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs b/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs index fbbdaca3..e51ec9c2 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_StudioTopBar.cs @@ -37,7 +37,13 @@ namespace Studio.UI /*Build*/ public Button Button_Build; public Button Button_Run; - + + public Button Button_Play; + private Image playImage; + public Sprite RunSprite; + public Sprite StopSprite; + public event Action onClickPlay; + public override void AfterAwake() { Button_NewProject.onClick.AddListener(OnClickNewProject); @@ -52,9 +58,13 @@ namespace Studio.UI Button_AssetLibraryWindow.onClick.AddListener(OnClickAssetLibraryWindow); Button_HierarchyWindow.onClick.AddListener(OnClickHierarchyWindow); - Button_Build.onClick.AddListener(OnClickBuild); Button_Run.onClick.AddListener(OnClickRun); + + Button_Play.onClick.AddListener(OnClickPlay); + playImage = Button_Play.GetComponent(); + RunSprite = Resources.Load("Images/Run"); + StopSprite = Resources.Load("Images/Stop"); } private void OnClickNewProject() @@ -118,5 +128,11 @@ namespace Studio.UI { onClickExit?.Invoke(); } + + private void OnClickPlay() + { + playImage.sprite = playImage.sprite == RunSprite ? StopSprite : RunSprite; + onClickPlay?.Invoke(); + } } } diff --git a/Assets/TMPFolder/RJHTest.cs b/Assets/TMPFolder/RJHTest.cs index 90b24250..923ae456 100644 --- a/Assets/TMPFolder/RJHTest.cs +++ b/Assets/TMPFolder/RJHTest.cs @@ -33,7 +33,7 @@ namespace Studio StudioService.instance.ConnectMQTT(mqtt.domain,mqtt.port,mqtt.topics); } //testcrane.Init("STOCKER_CRANE"); - AGVManager.instance.Init(); + //AGVManager.instance.Init(); //AGVManager.instance.Init("AGV"); } private async void Test() @@ -45,14 +45,14 @@ namespace Studio } private void Update() { - if(Input.GetKeyDown(KeyCode.V)) - { - Test(); - } - if (Input.GetKeyDown(KeyCode.I)) - { - //종료 - } + //if(Input.GetKeyDown(KeyCode.V)) + //{ + // Test(); + //} + //if (Input.GetKeyDown(KeyCode.I)) + //{ + // //종료 + //} if(Input.GetKeyDown(KeyCode.U)) { //시작 -- 2.48.1.windows.1 From f6b9cd3deed8acfb1133e6a7fea0def93de20f02 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 27 May 2025 15:12:30 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EB=B0=B1=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/AAA/Panel_MQTTTestResult.prefab | 19 +- Assets/Scenes/pre-0.24.0.unity | 320 ++++++++++++++---- .../Studio/AssetTool/CustomAssetConnector.cs | 4 +- Assets/Scripts/Studio/Managers/ManagerHub.cs | 2 +- 4 files changed, 271 insertions(+), 74 deletions(-) diff --git a/Assets/Prefabs/AAA/Panel_MQTTTestResult.prefab b/Assets/Prefabs/AAA/Panel_MQTTTestResult.prefab index 7d392355..f17a4d3a 100644 --- a/Assets/Prefabs/AAA/Panel_MQTTTestResult.prefab +++ b/Assets/Prefabs/AAA/Panel_MQTTTestResult.prefab @@ -162,7 +162,7 @@ GameObject: - component: {fileID: 3904775533281402009} - component: {fileID: 471636362390826840} - component: {fileID: 7030660330835988461} - - component: {fileID: 3954840855838796869} + - component: {fileID: -5690470109202217387} m_Layer: 5 m_Name: Panel_MQTTTestResult m_TagString: Untagged @@ -232,7 +232,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3954840855838796869 +--- !u!114 &-5690470109202217387 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -241,13 +241,14 @@ MonoBehaviour: m_GameObject: {fileID: 1329990658003581341} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10071fcfca7c256488c4fcad74083bf1, type: 3} + m_Script: {fileID: 11500000, guid: df9a6cee75f6b39419cfddfb2e07c35f, type: 3} m_Name: m_EditorClassIdentifier: - loadMQTTData: - domain: - port: - dataList: [] + Item_Domain: {fileID: 0} + Item_Port: {fileID: 0} + scrollView_TopicResults: {fileID: 0} + prf_MQTTTestResultItem: {fileID: 0} + button_Close: {fileID: 0} --- !u!1 &1699346903181681505 GameObject: m_ObjectHideFlags: 0 @@ -1748,7 +1749,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0000062029276, y: 0.000017731969} + m_AnchoredPosition: {x: -0.0000062029276, y: 0.000025868669} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} --- !u!114 &3191639708568242626 @@ -1898,7 +1899,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1430131615122052721} m_Direction: 2 m_Value: 0 - m_Size: 0.9990383 + m_Size: 0.99949294 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index 3b06ea58..ab0623ce 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -164,11 +164,157 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: sceneObjects: [] +--- !u!224 &11436643 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + m_PrefabInstance: {fileID: 396217241} + m_PrefabAsset: {fileID: 0} --- !u!224 &110380560 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1112357447546033534, guid: 86fac645f610e6c43a57c53dec3f6e48, type: 3} m_PrefabInstance: {fileID: 8788018936673242657} m_PrefabAsset: {fileID: 0} +--- !u!1 &189404504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 189404505} + - component: {fileID: 189404509} + - component: {fileID: 189404508} + - component: {fileID: 189404507} + - component: {fileID: 189404506} + m_Layer: 5 + m_Name: Button_Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &189404505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189404504} + 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: 11436643} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &189404506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189404504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &189404507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189404504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 189404508} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &189404508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189404504} + 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: 16ab77a8cc636504bada37c9dd4971ef, 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!222 &189404509 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 189404504} + m_CullTransparentMesh: 1 --- !u!1 &216528115 GameObject: m_ObjectHideFlags: 0 @@ -802,43 +948,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -27 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -215 objectReference: {fileID: 0} - target: {fileID: 643449707283617506, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -938,23 +1084,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -121 objectReference: {fileID: 0} - target: {fileID: 2641865167890791995, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -974,23 +1120,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -27 objectReference: {fileID: 0} - target: {fileID: 3407360332968577993, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1062,43 +1208,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -215 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -74 objectReference: {fileID: 0} - target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1126,23 +1272,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -27 objectReference: {fileID: 0} - target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y @@ -1318,23 +1464,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 7049248817799997631, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.y @@ -1410,43 +1556,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -121 objectReference: {fileID: 0} - target: {fileID: 8470849969505694970, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1458,23 +1604,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -74 objectReference: {fileID: 0} - target: {fileID: 8503665172779104287, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1514,27 +1660,30 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 295 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153.5 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -74 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2730612551908113454, guid: 13ace7584c1d4514cb2218354647e355, type: 3} + insertIndex: -1 + addedObject: {fileID: 189404505} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13ace7584c1d4514cb2218354647e355, type: 3} --- !u!224 &416036583 stripped @@ -2292,12 +2441,12 @@ MonoBehaviour: panel_thumbnail: {fileID: 0} panel_objectdistance: {fileID: 0} panel_apiconnectmodal: {fileID: 0} - panel_mqttconnectmodal: {fileID: 0} panel_datafiltersetting: {fileID: 0} panel_multilingualsettingmodal: {fileID: 0} panel_loggingmodal: {fileID: 0} panel_exitchecker: {fileID: 0} panel_datarepository: {fileID: 0} + panel_agv: {fileID: 0} panel_dataconnectmodal: {fileID: 0} panel_alarmconnectmodal: {fileID: 0} --- !u!114 &545811783 @@ -2363,6 +2512,52 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 +--- !u!1 &571004138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 571004139} + - component: {fileID: 571004140} + m_Layer: 0 + m_Name: AGVManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &571004139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571004138} + serializedVersion: 2 + 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: 1093055756} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &571004140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 571004138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1af5890e725b4a74397a6abcbc5c8b43, type: 3} + m_Name: + m_EditorClassIdentifier: + AGVMoveSpeed: 0.15 + AGVRotateSpeed: 0.15 --- !u!1 &574297194 GameObject: m_ObjectHideFlags: 0 @@ -3738,6 +3933,7 @@ Transform: - {fileID: 294055731} - {fileID: 349372257} - {fileID: 1155210} + - {fileID: 571004139} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1093055757 diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index d06aa7ca..ba49c1f2 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -247,7 +247,7 @@ namespace Studio.AssetTool public void OnDeselectAll() { - var canvas_Popup = EventConnector.instance.GetCanvas(); + var canvas_Popup = CanvasManager.instance.GetCanvas(); canvas_Popup.panel_agv.gameObject.SetActive(false); canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false); componentScrollView.DeselectAll(); @@ -283,7 +283,7 @@ namespace Studio.AssetTool { if (selectedObjects.Count == 0) return; - var canvas_Popup = EventConnector.instance.GetCanvas(); + var canvas_Popup = CanvasManager.instance.GetCanvas(); if (ManagerHub.instance.Get().curState == RunManager.EState.Run) { canvas_Popup.panel_dynamicobjectinfo.gameObject.SetActive(false); diff --git a/Assets/Scripts/Studio/Managers/ManagerHub.cs b/Assets/Scripts/Studio/Managers/ManagerHub.cs index cc598bc1..10e7139d 100644 --- a/Assets/Scripts/Studio/Managers/ManagerHub.cs +++ b/Assets/Scripts/Studio/Managers/ManagerHub.cs @@ -22,7 +22,7 @@ namespace Studio.Manage Join(new CursorManager()); Join(new CameraManager()); Join(new AssetManager()); - Join(new SceneStartSettingService()); + Join(new SceneStartSettingManager()); Join(new RunManager()); foreach(var m in managers) { -- 2.48.1.windows.1 From 304125a4bfe2ce960785985dc5ba0253ee1ed801 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 27 May 2025 15:17:38 +0900 Subject: [PATCH 5/7] =?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 | 296 +++++++++++++++++++++++ Assets/Prefabs/AAA/Panel_AGV.prefab.meta | 7 + 2 files changed, 303 insertions(+) create mode 100644 Assets/Prefabs/AAA/Panel_AGV.prefab create mode 100644 Assets/Prefabs/AAA/Panel_AGV.prefab.meta diff --git a/Assets/Prefabs/AAA/Panel_AGV.prefab b/Assets/Prefabs/AAA/Panel_AGV.prefab new file mode 100644 index 00000000..770f0495 --- /dev/null +++ b/Assets/Prefabs/AAA/Panel_AGV.prefab @@ -0,0 +1,296 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4653535049454866169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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 &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 + 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: 0 +--- !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: 948346715020304857} + 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_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 &9158034230855959382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8894985241641706439} + - component: {fileID: 6579675664579006244} + - component: {fileID: 8479324318254670499} + - component: {fileID: 7110797760534477117} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8894985241641706439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158034230855959382} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6579675664579006244 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158034230855959382} + m_CullTransparentMesh: 1 +--- !u!114 &8479324318254670499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158034230855959382} + 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.1254902, g: 0.10980392, b: 0.16470589, 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_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: 2.24 +--- !u!114 &7110797760534477117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9158034230855959382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 diff --git a/Assets/Prefabs/AAA/Panel_AGV.prefab.meta b/Assets/Prefabs/AAA/Panel_AGV.prefab.meta new file mode 100644 index 00000000..94897178 --- /dev/null +++ b/Assets/Prefabs/AAA/Panel_AGV.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0ffcbbc80efa4d4bab82b349252c4b1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: -- 2.48.1.windows.1 From 95a3029da57889054846487ddea660c427d00ee3 Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 27 May 2025 16:27:49 +0900 Subject: [PATCH 6/7] =?UTF-8?q?AGV=20=EB=AA=A8=EB=8B=AC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/pre-0.24.0.unity | 227 +++++++++++++----- .../TwinObject/StaticObject/StackerCrane.cs | 2 + .../UI/Elements/UI_MiniMapHeightButton.cs | 1 - .../Scripts/Studio/UI/Panel/Panel_MiniMap.cs | 12 +- 4 files changed, 173 insertions(+), 69 deletions(-) diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index ab0623ce..aaf699ca 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -948,43 +948,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 377768901763584008, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 611185898856365746, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 643449707283617506, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1084,23 +1084,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2626255031181706874, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2641865167890791995, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1120,23 +1120,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3124645978463403787, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3407360332968577993, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1208,43 +1208,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4195798947008782306, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4258805442045697811, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4551446790370479478, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1272,23 +1272,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4994189035301675261, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -27 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5056417860347883323, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y @@ -1464,23 +1464,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7047178217960279143, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7049248817799997631, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.y @@ -1556,43 +1556,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8263605668819617717, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8386508010109362723, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -121 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8470849969505694970, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1604,23 +1604,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8483169145141598472, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8503665172779104287, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x @@ -1660,23 +1660,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_SizeDelta.x - value: 295 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9131030912427371342, guid: 13ace7584c1d4514cb2218354647e355, type: 3} propertyPath: m_AnchoredPosition.y - value: -74 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2381,6 +2381,7 @@ RectTransform: - {fileID: 1439596647} - {fileID: 1085911555} - {fileID: 1712022043} + - {fileID: 740571666} - {fileID: 1195713950} - {fileID: 917198748} - {fileID: 110380560} @@ -3074,6 +3075,112 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2585355017195122876, guid: 8ca817cf0dbcb8c45a568fe8416068d1, type: 3} m_PrefabInstance: {fileID: 722122562} m_PrefabAsset: {fileID: 0} +--- !u!1001 &740571665 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 545811781} + m_Modifications: + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_SizeDelta.x + value: 318 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_SizeDelta.y + value: 972.8 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchoredPosition.x + value: -344 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_AnchoredPosition.y + value: -44 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7827388610028740651, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_Name + value: Panel_AGV + objectReference: {fileID: 0} + - target: {fileID: 7827388610028740651, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} +--- !u!224 &740571666 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 890093516518657518, guid: e0ffcbbc80efa4d4bab82b349252c4b1, type: 3} + m_PrefabInstance: {fileID: 740571665} + m_PrefabAsset: {fileID: 0} --- !u!1 &749092879 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs index c4b90d8b..55844266 100644 --- a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs +++ b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs @@ -1,4 +1,5 @@ using Studio.AssetTool; +using Studio.Manage; using Studio.VirtualFactory.Info; using System; using System.Collections; @@ -62,6 +63,7 @@ namespace Studio.Staic.STKC bodySpeed = 0.3f; liftSpeed = 0.3f; onMotionStart = StartAnim; + ManagerHub.instance.Get().onRun += OnPlayStart; //이벤트 걸어둔다.. //+= OnPlayStart } diff --git a/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs b/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs index bb86ec80..fe4c0f75 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_MiniMapHeightButton.cs @@ -1,5 +1,4 @@ using TMPro; -using UnityEditor.Localization.Plugins.XLIFF.V20; using UnityEngine; using UnityEngine.UI; using XRLib.UI; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs b/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs index 565bc6ca..15db79a2 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_MiniMap.cs @@ -1,11 +1,7 @@ -using Studio; using System.Collections; using System.Collections.Generic; -using TMPro; -using UnityEditor.Animations; using UnityEngine; using UnityEngine.UI; -using XRLib; using XRLib.UI; namespace Studio.UI @@ -26,7 +22,7 @@ namespace Studio.UI RectTransform MiniMapScreen; RectTransform Image_MiniMapIcon; RectTransform MiniMapHeightButtons; - + RectMask2D rectMask2D; Vector2 worldMin; @@ -98,7 +94,7 @@ namespace Studio.UI float yPos = Mathf.Lerp(0, HeightSelectBar.rect.height, normalizedY); float height = yPos * unit; newButton.UpdateHeight(height); - + StartCoroutine(CaptureImageAtHeight(newButton, height)); } @@ -134,7 +130,7 @@ namespace Studio.UI float maxHeight = float.MinValue; float minHeight = float.MaxValue; - foreach (var twinObject in twinObjects) + foreach (var twinObject in twinObjects) { Renderer[] renderers = twinObject.GetComponentsInChildren(); @@ -274,7 +270,7 @@ namespace Studio.UI { GameObject headerChildObject = headerChild.gameObject; - if (headerChildObject != Button_Minimize.gameObject) + if (headerChildObject != Button_Minimize.gameObject) { headerChildObject.SetActive(false); } -- 2.48.1.windows.1 From a627cbb29877749de5b2aad9b3c781bfd170a19c Mon Sep 17 00:00:00 2001 From: geondo55 <102933884+geondo55@users.noreply.github.com> Date: Tue, 27 May 2025 16:59:09 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=94=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/pre-0.24.0.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scenes/pre-0.24.0.unity b/Assets/Scenes/pre-0.24.0.unity index f5da7555..6889eedf 100644 --- a/Assets/Scenes/pre-0.24.0.unity +++ b/Assets/Scenes/pre-0.24.0.unity @@ -210,7 +210,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -60.5} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 1, y: 0.5} --- !u!114 &189404506 -- 2.48.1.windows.1