From 3704b2a7f10f53a99ea81f06b3f0e339a9bdab81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A4=80=ED=95=99=20=EB=85=B8?= Date: Wed, 16 Jul 2025 14:57:57 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=9C=84=EC=B9=98=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/UI/Alert.meta | 8 ++++ .../R => Scripts/UI/Alert}/AlertManager.cs | 3 ++ .../UI/Alert}/AlertManager.cs.meta | 0 .../R => Scripts/UI/Alert}/UIAlert.cs | 0 .../R => Scripts/UI/Alert}/UIAlert.cs.meta | 0 .../UI/Alert}/UIPopupButtonCancel.cs | 0 .../UI/Alert}/UIPopupButtonCancel.cs.meta | 0 .../R => Scripts/UI/Alert}/UIPopupButtonOk.cs | 0 .../UI/Alert}/UIPopupButtonOk.cs.meta | 0 .../R => Scripts/UI/Alert}/UIPopupMessage.cs | 0 .../UI/Alert}/UIPopupMessage.cs.meta | 0 .../R => Scripts/UI/Alert}/UIPopupTitle.cs | 0 .../UI/Alert}/UIPopupTitle.cs.meta | 0 ...niversalRenderPipelineGlobalSettings.asset | 48 +++++++++---------- Assets/WorkSpace/LH/Panel_SimulationUI.cs | 7 ++- 15 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 Assets/Scripts/UI/Alert.meta rename Assets/{WorkSpace/R => Scripts/UI/Alert}/AlertManager.cs (96%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/AlertManager.cs.meta (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIAlert.cs (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIAlert.cs.meta (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupButtonCancel.cs (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupButtonCancel.cs.meta (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupButtonOk.cs (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupButtonOk.cs.meta (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupMessage.cs (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupMessage.cs.meta (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupTitle.cs (100%) rename Assets/{WorkSpace/R => Scripts/UI/Alert}/UIPopupTitle.cs.meta (100%) diff --git a/Assets/Scripts/UI/Alert.meta b/Assets/Scripts/UI/Alert.meta new file mode 100644 index 00000000..6d3f3b39 --- /dev/null +++ b/Assets/Scripts/UI/Alert.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60b9a2c0e9c85f248a4d6625345f409d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WorkSpace/R/AlertManager.cs b/Assets/Scripts/UI/Alert/AlertManager.cs similarity index 96% rename from Assets/WorkSpace/R/AlertManager.cs rename to Assets/Scripts/UI/Alert/AlertManager.cs index 010722ca..664d16bc 100644 --- a/Assets/WorkSpace/R/AlertManager.cs +++ b/Assets/Scripts/UI/Alert/AlertManager.cs @@ -39,6 +39,9 @@ public class AlertManager : UnitySingleton public async UniTask ShowConfirm(string title, string message, string okButtonTitle = "OK", string cancelButtonTitle = "CANCEL") { + if (alert == null) + return false; + Create(); bool isClosed = false; diff --git a/Assets/WorkSpace/R/AlertManager.cs.meta b/Assets/Scripts/UI/Alert/AlertManager.cs.meta similarity index 100% rename from Assets/WorkSpace/R/AlertManager.cs.meta rename to Assets/Scripts/UI/Alert/AlertManager.cs.meta diff --git a/Assets/WorkSpace/R/UIAlert.cs b/Assets/Scripts/UI/Alert/UIAlert.cs similarity index 100% rename from Assets/WorkSpace/R/UIAlert.cs rename to Assets/Scripts/UI/Alert/UIAlert.cs diff --git a/Assets/WorkSpace/R/UIAlert.cs.meta b/Assets/Scripts/UI/Alert/UIAlert.cs.meta similarity index 100% rename from Assets/WorkSpace/R/UIAlert.cs.meta rename to Assets/Scripts/UI/Alert/UIAlert.cs.meta diff --git a/Assets/WorkSpace/R/UIPopupButtonCancel.cs b/Assets/Scripts/UI/Alert/UIPopupButtonCancel.cs similarity index 100% rename from Assets/WorkSpace/R/UIPopupButtonCancel.cs rename to Assets/Scripts/UI/Alert/UIPopupButtonCancel.cs diff --git a/Assets/WorkSpace/R/UIPopupButtonCancel.cs.meta b/Assets/Scripts/UI/Alert/UIPopupButtonCancel.cs.meta similarity index 100% rename from Assets/WorkSpace/R/UIPopupButtonCancel.cs.meta rename to Assets/Scripts/UI/Alert/UIPopupButtonCancel.cs.meta diff --git a/Assets/WorkSpace/R/UIPopupButtonOk.cs b/Assets/Scripts/UI/Alert/UIPopupButtonOk.cs similarity index 100% rename from Assets/WorkSpace/R/UIPopupButtonOk.cs rename to Assets/Scripts/UI/Alert/UIPopupButtonOk.cs diff --git a/Assets/WorkSpace/R/UIPopupButtonOk.cs.meta b/Assets/Scripts/UI/Alert/UIPopupButtonOk.cs.meta similarity index 100% rename from Assets/WorkSpace/R/UIPopupButtonOk.cs.meta rename to Assets/Scripts/UI/Alert/UIPopupButtonOk.cs.meta diff --git a/Assets/WorkSpace/R/UIPopupMessage.cs b/Assets/Scripts/UI/Alert/UIPopupMessage.cs similarity index 100% rename from Assets/WorkSpace/R/UIPopupMessage.cs rename to Assets/Scripts/UI/Alert/UIPopupMessage.cs diff --git a/Assets/WorkSpace/R/UIPopupMessage.cs.meta b/Assets/Scripts/UI/Alert/UIPopupMessage.cs.meta similarity index 100% rename from Assets/WorkSpace/R/UIPopupMessage.cs.meta rename to Assets/Scripts/UI/Alert/UIPopupMessage.cs.meta diff --git a/Assets/WorkSpace/R/UIPopupTitle.cs b/Assets/Scripts/UI/Alert/UIPopupTitle.cs similarity index 100% rename from Assets/WorkSpace/R/UIPopupTitle.cs rename to Assets/Scripts/UI/Alert/UIPopupTitle.cs diff --git a/Assets/WorkSpace/R/UIPopupTitle.cs.meta b/Assets/Scripts/UI/Alert/UIPopupTitle.cs.meta similarity index 100% rename from Assets/WorkSpace/R/UIPopupTitle.cs.meta rename to Assets/Scripts/UI/Alert/UIPopupTitle.cs.meta diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 8e974f5b..2042d6c9 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 7810220666763346044 - - rid: 7810220666763346045 + - rid: 7810220666763346068 + - rid: 7810220666763346069 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 7810220666763346046 - - rid: 7810220666763346047 + - rid: 7810220666763346070 + - rid: 7810220666763346071 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 7810220666763346048 - - rid: 7810220666763346049 - - rid: 7810220666763346050 - - rid: 7810220666763346051 - - rid: 7810220666763346052 - - rid: 7810220666763346053 + - rid: 7810220666763346072 + - rid: 7810220666763346073 + - rid: 7810220666763346074 + - rid: 7810220666763346075 + - rid: 7810220666763346076 + - rid: 7810220666763346077 - rid: 6852985685364965392 - - rid: 7810220666763346054 + - rid: 7810220666763346078 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 7810220666763346055 + - rid: 7810220666763346079 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -156,14 +156,14 @@ MonoBehaviour: m_version: 0 m_EnableCompilationCaching: 1 m_EnableValidityChecks: 1 - - rid: 7810220666763346044 + - rid: 7810220666763346068 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 7810220666763346045 + - rid: 7810220666763346069 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -175,7 +175,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 7810220666763346046 + - rid: 7810220666763346070 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -190,7 +190,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 7810220666763346047 + - rid: 7810220666763346071 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -199,7 +199,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 7810220666763346048 + - rid: 7810220666763346072 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -212,13 +212,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 7810220666763346049 + - rid: 7810220666763346073 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 7810220666763346050 + - rid: 7810220666763346074 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -231,12 +231,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 7810220666763346051 + - rid: 7810220666763346075 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 7810220666763346052 + - rid: 7810220666763346076 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -246,21 +246,21 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 7810220666763346053 + - rid: 7810220666763346077 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 7810220666763346054 + - rid: 7810220666763346078 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 7810220666763346055 + - rid: 7810220666763346079 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} diff --git a/Assets/WorkSpace/LH/Panel_SimulationUI.cs b/Assets/WorkSpace/LH/Panel_SimulationUI.cs index 05e8435d..9840e6a3 100644 --- a/Assets/WorkSpace/LH/Panel_SimulationUI.cs +++ b/Assets/WorkSpace/LH/Panel_SimulationUI.cs @@ -215,14 +215,13 @@ namespace Octopus.Simulator //MQTT 재연결 private void ReConnect(MQTTClient client) { + if (string.IsNullOrEmpty(WebParameters.code)) + return; + if (isplaying) SetMqttConnect(); else - { - if (string.IsNullOrEmpty(WebParameters.code)) - return; MQTTManager.mqttManager.SubscribeTopic($"simulation/{WebParameters.code}/#"); - } } public void OnClickReset()