From 85e8be0a54462de0408592ebd65e11aad838e585 Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Thu, 5 Jun 2025 17:18:27 +0900 Subject: [PATCH] asdf --- ...tStatus_ver2.prefab => LogicStatus.prefab} | 15 +- ...r2.prefab.meta => LogicStatus.prefab.meta} | 0 Assets/Resources/UIPrefab.meta | 8 + .../UIPrefab/LinePrefab.prefab} | 2 +- .../UIPrefab/LinePrefab.prefab.meta} | 0 .../UIPrefab}/LogicPrefab.prefab | 0 .../UIPrefab}/LogicPrefab.prefab.meta | 0 Assets/Scenes/Simulation_0.0.1.unity | 4 + .../SimulationModels/SimulationModel.cs | 1 - .../SimulationModelConveyor.cs | 2 - .../LH/LogicData/LogicDataManager.cs | 44 +++--- .../WorkSpace/LH/LogicData/LogicUIManager.cs | 139 ++++++++++++++++++ .../LH/LogicData/LogicUIManager.cs.meta | 2 + .../LH/LogicData/Panel_ConnectedObject.cs | 5 +- .../WorkSpace/LH/LogicData/Panel_LogicData.cs | 3 +- .../LH/LogicData/Panel_LogicStatus.cs | 31 ++++ .../LH/LogicData/Panel_LogicStatus.cs.meta | 2 + Assets/WorkSpace/LH/LogicInfo.cs | 2 - Assets/WorkSpace/LH/MQTTManager.cs | 15 -- Assets/WorkSpace/LH/Manager.prefab | 5 +- 20 files changed, 230 insertions(+), 50 deletions(-) rename Assets/Prefabs/UIRIghtItem/{ObjectStatus_ver2.prefab => LogicStatus.prefab} (99%) rename Assets/Prefabs/UIRIghtItem/{ObjectStatus_ver2.prefab.meta => LogicStatus.prefab.meta} (100%) create mode 100644 Assets/Resources/UIPrefab.meta rename Assets/{Prefabs/tempLine.prefab => Resources/UIPrefab/LinePrefab.prefab} (99%) rename Assets/{Prefabs/tempLine.prefab.meta => Resources/UIPrefab/LinePrefab.prefab.meta} (100%) rename Assets/{Prefabs => Resources/UIPrefab}/LogicPrefab.prefab (100%) rename Assets/{Prefabs => Resources/UIPrefab}/LogicPrefab.prefab.meta (100%) create mode 100644 Assets/WorkSpace/LH/LogicData/LogicUIManager.cs create mode 100644 Assets/WorkSpace/LH/LogicData/LogicUIManager.cs.meta create mode 100644 Assets/WorkSpace/LH/LogicData/Panel_LogicStatus.cs create mode 100644 Assets/WorkSpace/LH/LogicData/Panel_LogicStatus.cs.meta diff --git a/Assets/Prefabs/UIRIghtItem/ObjectStatus_ver2.prefab b/Assets/Prefabs/UIRIghtItem/LogicStatus.prefab similarity index 99% rename from Assets/Prefabs/UIRIghtItem/ObjectStatus_ver2.prefab rename to Assets/Prefabs/UIRIghtItem/LogicStatus.prefab index ed7bf870..9a808bdb 100644 --- a/Assets/Prefabs/UIRIghtItem/ObjectStatus_ver2.prefab +++ b/Assets/Prefabs/UIRIghtItem/LogicStatus.prefab @@ -1605,8 +1605,9 @@ GameObject: - component: {fileID: 7689735791302738399} - component: {fileID: 4299482688657830113} - component: {fileID: 1652035178445399494} + - component: {fileID: 76809263259767838} m_Layer: 5 - m_Name: ObjectStatus_ver2 + m_Name: LogicStatus m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1712,6 +1713,18 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 0 +--- !u!114 &76809263259767838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8289542207162785557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 120c8c53e28b7564283c799440ca702c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8696336914309413595 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UIRIghtItem/ObjectStatus_ver2.prefab.meta b/Assets/Prefabs/UIRIghtItem/LogicStatus.prefab.meta similarity index 100% rename from Assets/Prefabs/UIRIghtItem/ObjectStatus_ver2.prefab.meta rename to Assets/Prefabs/UIRIghtItem/LogicStatus.prefab.meta diff --git a/Assets/Resources/UIPrefab.meta b/Assets/Resources/UIPrefab.meta new file mode 100644 index 00000000..16d9fa0d --- /dev/null +++ b/Assets/Resources/UIPrefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4b1b8f1f39c6924fb742f1dbf5c9979 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/tempLine.prefab b/Assets/Resources/UIPrefab/LinePrefab.prefab similarity index 99% rename from Assets/Prefabs/tempLine.prefab rename to Assets/Resources/UIPrefab/LinePrefab.prefab index ac180437..0d4d6585 100644 --- a/Assets/Prefabs/tempLine.prefab +++ b/Assets/Resources/UIPrefab/LinePrefab.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 3560517003531544791} - component: {fileID: 6254276411767355245} m_Layer: 5 - m_Name: tempLine + m_Name: LinePrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/tempLine.prefab.meta b/Assets/Resources/UIPrefab/LinePrefab.prefab.meta similarity index 100% rename from Assets/Prefabs/tempLine.prefab.meta rename to Assets/Resources/UIPrefab/LinePrefab.prefab.meta diff --git a/Assets/Prefabs/LogicPrefab.prefab b/Assets/Resources/UIPrefab/LogicPrefab.prefab similarity index 100% rename from Assets/Prefabs/LogicPrefab.prefab rename to Assets/Resources/UIPrefab/LogicPrefab.prefab diff --git a/Assets/Prefabs/LogicPrefab.prefab.meta b/Assets/Resources/UIPrefab/LogicPrefab.prefab.meta similarity index 100% rename from Assets/Prefabs/LogicPrefab.prefab.meta rename to Assets/Resources/UIPrefab/LogicPrefab.prefab.meta diff --git a/Assets/Scenes/Simulation_0.0.1.unity b/Assets/Scenes/Simulation_0.0.1.unity index 66eff59a..841ecb84 100644 --- a/Assets/Scenes/Simulation_0.0.1.unity +++ b/Assets/Scenes/Simulation_0.0.1.unity @@ -6015,6 +6015,10 @@ PrefabInstance: 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 diff --git a/Assets/Scripts/SimulationModels/SimulationModel.cs b/Assets/Scripts/SimulationModels/SimulationModel.cs index 6949e1ad..d537807e 100644 --- a/Assets/Scripts/SimulationModels/SimulationModel.cs +++ b/Assets/Scripts/SimulationModels/SimulationModel.cs @@ -22,7 +22,6 @@ public class SimulationModel : MonoBehaviour, IClickable private void OnEnable() { - Debug.Log(this.name); DataManager.I.AddModel(this); StartCoroutine(RunSimulationCoroutine()); } diff --git a/Assets/Scripts/SimulationModels/SimulationModelConveyor.cs b/Assets/Scripts/SimulationModels/SimulationModelConveyor.cs index 1dad8f09..a4215457 100644 --- a/Assets/Scripts/SimulationModels/SimulationModelConveyor.cs +++ b/Assets/Scripts/SimulationModels/SimulationModelConveyor.cs @@ -51,8 +51,6 @@ public class SimulationModelConveyor : SimulationModel protected override IEnumerator RunSimulationCoroutine() { - Debug.Log("Start"); - yield return new WaitUntil(() => !string.IsNullOrEmpty(nodeID)); while (dataQueue == null) { diff --git a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs index bb194054..6ead1124 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs @@ -14,23 +14,27 @@ namespace Octopus.Simulator public LogicData currentData; public LogicWebConfig config; [SerializeField] - Button logicPrefab; + string UIPrefabPath = "UIPrefab"; + Button LogicPrefab; + Image LinePrefab; [SerializeField] RectTransform LogicWindow; [SerializeField] RectTransform LogicContent; [SerializeField] - Image linePrefab; - [SerializeField] Button backGround; public Dictionary logicButtonDict = new Dictionary(); - public Dictionary dataMap = new Dictionary(); public Dictionary idMap = new Dictionary(); public event Action onLogicButtonClicked; public event Action onLogicDeSelected; + private void Awake() + { + LogicPrefab = Resources.Load