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); } }