From f331abd7b80e00dbe8f78c3374fb3e176d2374f8 Mon Sep 17 00:00:00 2001 From: wsh Date: Tue, 27 May 2025 10:02:37 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AD=EC=A0=9C=EC=82=AD=EC=A0=9C!!!?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=EC=9D=B4=EB=8F=99!!!!@?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Studio/Connect/ConnectedEntity.cs | 34 -------- .../Studio/Connect/ConnectedEntity.cs.meta | 2 - .../{AssetTool => Managers}/FBXFileManager.cs | 0 .../FBXFileManager.cs.meta | 0 .../UI/Panel/Panel_DynamicObjectInfo.cs | 4 - Assets/TMPFolder/RJHTest.cs | 77 ------------------- Assets/TMPFolder/RJHTest.cs.meta | 2 - 7 files changed, 119 deletions(-) delete mode 100644 Assets/Scripts/Studio/Connect/ConnectedEntity.cs delete mode 100644 Assets/Scripts/Studio/Connect/ConnectedEntity.cs.meta rename Assets/Scripts/Studio/{AssetTool => Managers}/FBXFileManager.cs (100%) rename Assets/Scripts/Studio/{AssetTool => Managers}/FBXFileManager.cs.meta (100%) delete mode 100644 Assets/TMPFolder/RJHTest.cs delete mode 100644 Assets/TMPFolder/RJHTest.cs.meta diff --git a/Assets/Scripts/Studio/Connect/ConnectedEntity.cs b/Assets/Scripts/Studio/Connect/ConnectedEntity.cs deleted file mode 100644 index 23c98dd7..00000000 --- a/Assets/Scripts/Studio/Connect/ConnectedEntity.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Newtonsoft.Json; -using NUnit.Framework; -using System.Collections.Generic; -using UnityEngine; - -namespace Studio -{ - public class ConnectedEntity - { - [JsonProperty("APIs")] - public List apiS { get; set; } - [JsonProperty("MQTTs")] - public List mqtts { get; set; } - } - - public class APIEntity - { - [JsonProperty("APIDomain")] - public string APIDomain { get; set; } - [JsonProperty("Port")] - public int APIPort { get; set; } - [JsonProperty("URL")] - public List url { get; set; } - } - public class MQTTEntity - { - [JsonProperty("MQTTDomain")] - public string MQTTDomain { get; set; } - [JsonProperty("Port")] - public int MQTTPort { get; set; } - [JsonProperty("Topics")] - public List topics { get; set; } - } -} diff --git a/Assets/Scripts/Studio/Connect/ConnectedEntity.cs.meta b/Assets/Scripts/Studio/Connect/ConnectedEntity.cs.meta deleted file mode 100644 index daa4072a..00000000 --- a/Assets/Scripts/Studio/Connect/ConnectedEntity.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: fbcc575483b274d4382f6a2b8d380d11 \ No newline at end of file diff --git a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs b/Assets/Scripts/Studio/Managers/FBXFileManager.cs similarity index 100% rename from Assets/Scripts/Studio/AssetTool/FBXFileManager.cs rename to Assets/Scripts/Studio/Managers/FBXFileManager.cs diff --git a/Assets/Scripts/Studio/AssetTool/FBXFileManager.cs.meta b/Assets/Scripts/Studio/Managers/FBXFileManager.cs.meta similarity index 100% rename from Assets/Scripts/Studio/AssetTool/FBXFileManager.cs.meta rename to Assets/Scripts/Studio/Managers/FBXFileManager.cs.meta diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs index f56f5d68..29564d0c 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_DynamicObjectInfo.cs @@ -63,10 +63,6 @@ namespace Studio.UI public Action onRetouchAlarm; public Action onDeleteAlarm; - - private SaveConnectedData connectedData; - private SaveConnectAlarmData connectedAlarmData; - private CustomAssetRenderObject singleSelectObject; private AddComponetDataScriptable componetScriptable; diff --git a/Assets/TMPFolder/RJHTest.cs b/Assets/TMPFolder/RJHTest.cs deleted file mode 100644 index a4919856..00000000 --- a/Assets/TMPFolder/RJHTest.cs +++ /dev/null @@ -1,77 +0,0 @@ -using Studio; -using Studio.Auth; -using Studio.Conifg; -using Studio.Dynamic.M; -using Studio.Staic.STKC; -using System.Threading.Tasks; -using UnityEngine; - -namespace Studio -{ - public class RJHTest : MonoBehaviour - { - // Start is called once before the first execution of Update after the MonoBehaviour is created - private int aa; - public StackerCrane testcrane; - void Awake() - { - //ConfigConnected.MQTTDomain = "220.90.135.190"; - //ConfigConnected.APIDomain = "220.90.135.190"; - //ConfigConnected.APIPort = 23000; - //ConfigConnected.MQTTPort = 8088; - } - - public void TestConeect() - { - var mqttsettings = ConfigConnected.MQTTSettings; - - foreach(var mqtt in mqttsettings.mqttConnections) - { - StudioService.instance.ConnectMQTT(mqtt.domain,mqtt.port,mqtt.topics); - } - //testcrane.Init("STOCKER_CRANE"); - //AGVManager.instance.Init("AGV"); - } - private async void Test() - { - await AuthService.Instance.Login("xr", "@dbqlTl1"); - - await StudioService.instance.LoadBaseData("/api/agv"); - Debug.Log(AuthService.Instance.Entiti.accessToken); - } - private void Update() - { - if(Input.GetKeyDown(KeyCode.V)) - { - Test(); - } - if (Input.GetKeyDown(KeyCode.I)) - { - // StudioService.instance.SubscribeMQTT("STOCKER_CRANE"); - - } - if(Input.GetKeyDown(KeyCode.U)) - { - // StudioService.instance.SubscribeMQTT("AGV"); - } - if(Input.GetKeyDown(KeyCode.T)) - { - - TestTask(); - } - } - - private async Task TestTask() - { - System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch(); - sw.Start(); - var task = Task.Run(async () => - { - var i = aa++; - await Task.Delay(3000); - sw.Stop(); - Debug.Log(sw.ElapsedMilliseconds); - }); - } - } -} diff --git a/Assets/TMPFolder/RJHTest.cs.meta b/Assets/TMPFolder/RJHTest.cs.meta deleted file mode 100644 index 198b9555..00000000 --- a/Assets/TMPFolder/RJHTest.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 86d8ea1a81790154fa1c1c2be6398b6a \ No newline at end of file