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) {