diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index 841ecb84..64ded625 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -119,11 +119,34 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &58003261 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2222743492580726404, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} + m_PrefabInstance: {fileID: 6579092525594939345} + m_PrefabAsset: {fileID: 0} --- !u!224 &80690333 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3202402725712308353, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} m_PrefabInstance: {fileID: 6579092525594939345} m_PrefabAsset: {fileID: 0} +--- !u!114 &80690334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58003261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db23f43a626977e499745e70cceaae33, type: 3} + m_Name: + m_EditorClassIdentifier: + UIPrefabPath: UIPrefab + logicWindow: {fileID: 58003261} + LogicPrefab: {fileID: 2210399282865539074, guid: 72314043a41090846a8c16ad04f3c028, type: 3} + LinePrefab: {fileID: 6254276411767355245, guid: c899c98324602eb4fbe900753508f64d, type: 3} + logicContent: {fileID: 384003842} + backGround: {fileID: 1351749705} --- !u!1001 &113814761 PrefabInstance: m_ObjectHideFlags: 0 @@ -5024,17 +5047,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216065597} m_CullTransparentMesh: 1 ---- !u!114 &1237304820 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4739726380097546759, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - m_PrefabInstance: {fileID: 594906197750746389} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 766d9cdfba5257c4b9beedbfbc5f5d4a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1251266449 GameObject: m_ObjectHideFlags: 0 @@ -5947,18 +5959,10 @@ PrefabInstance: propertyPath: menuPanel value: objectReference: {fileID: 518271856} - - target: {fileID: 3408166986665272114, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - propertyPath: webReceiver - value: - objectReference: {fileID: 1237304820} - target: {fileID: 3408166986665272114, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} propertyPath: projectMenuButton value: objectReference: {fileID: 205755441} - - target: {fileID: 4739726380097546759, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5366961481726599031, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} propertyPath: m_LocalPosition.x value: -1.2462957 @@ -6007,26 +6011,10 @@ PrefabInstance: propertyPath: LogicWindow value: objectReference: {fileID: 80690333} - - target: {fileID: 6191105916327120908, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - propertyPath: webReceiver - value: - objectReference: {fileID: 1237304820} - target: {fileID: 6191105916327120908, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} propertyPath: LogicContent value: objectReference: {fileID: 384003842} - - target: {fileID: 6191105916327120908, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - propertyPath: UIPrefabPath - value: UIPrefab - objectReference: {fileID: 0} - - target: {fileID: 8164125700257988699, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - propertyPath: _apiConfigResourcePath - value: APIEndPointsConfig - objectReference: {fileID: 0} - - target: {fileID: 8164125700257988699, guid: 6c1ed824d30fe8848957d865919227a0, type: 3} - propertyPath: _webConfigResourcePath - value: WebConfig - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6620,7 +6608,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2222743492580726404, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} + insertIndex: -1 + addedObject: {fileID: 80690334} m_SourcePrefab: {fileID: 100100000, guid: ea4abd0239cb35e47914f9614cf08d69, type: 3} --- !u!1001 &6890256579638460283 PrefabInstance: @@ -6896,7 +6887,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8289542207162785557, guid: 461675fb4e57d014f90cc1f743049f29, type: 3} propertyPath: m_Name - value: ObjectStatus_ver2 + value: LogicStatus objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs index 6ead1124..4c3fddc4 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs @@ -13,61 +13,24 @@ namespace Octopus.Simulator { public LogicData currentData; public LogicWebConfig config; - [SerializeField] - string UIPrefabPath = "UIPrefab"; - Button LogicPrefab; - Image LinePrefab; - [SerializeField] - RectTransform LogicWindow; - [SerializeField] - RectTransform LogicContent; - [SerializeField] - Button backGround; - public Dictionary logicButtonDict = new Dictionary(); - public Dictionary idMap = new Dictionary(); + public event Action onLogicUpdated; - public event Action onLogicButtonClicked; - public event Action onLogicDeSelected; - - private void Awake() - { - LogicPrefab = Resources.Load