diff --git a/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab index 06e0b1ed..2069e134 100644 --- a/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab +++ b/Assets/Resources/Library/LibraryPrefab/Queue_pallet.prefab @@ -26,7 +26,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029504295} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.8145752, y: 3.058124, z: 3.058124} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5794419422893656345} diff --git a/Assets/Resources/translationtable.csv b/Assets/Resources/translationtable.csv index 4d87ee96..cefa36eb 100644 --- a/Assets/Resources/translationtable.csv +++ b/Assets/Resources/translationtable.csv @@ -17,10 +17,10 @@ batch_size,생성 제품 수 period,생성 주기(초) output,제품 출고 큐(스토어) output_store,제품 출고 큐(스토어) -output_queue,제품 출고 큐(큐) +output_queue,제품 출고 큐(스토어) defect,불량 출고 큐(스토어) defect_store,불량 출고 큐(스토어) -defect_queue,불량 출고 큐(큐) +defect_queue,불량 출고 큐(스토어) defect_rate,불량률 output_resource,리소스 prod_priority,생성 우선순위 diff --git a/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Camera/RTFocusCamera.cs b/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Camera/RTFocusCamera.cs index b37dccba..6efa7829 100644 --- a/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Camera/RTFocusCamera.cs +++ b/Assets/Runtime Transform Gizmos/Scripts/Runtime Package Common/Camera/RTFocusCamera.cs @@ -163,8 +163,6 @@ namespace RTG { if(string.IsNullOrWhiteSpace(json)) { - _targetCamera.transform.position = Vector3.zero; - _targetCamera.transform.transform.eulerAngles = Vector3.zero; return; } var cam = JsonUtility.FromJson(json); diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 5e79b6a9..cebd5be8 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 2193962551779786904 - - rid: 2193962551779786905 + - rid: 2193962551779786968 + - rid: 2193962551779786969 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 2193962551779786906 - - rid: 2193962551779786907 + - rid: 2193962551779786970 + - rid: 2193962551779786971 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 2193962551779786908 - - rid: 2193962551779786909 - - rid: 2193962551779786910 - - rid: 2193962551779786911 - - rid: 2193962551779786912 - - rid: 2193962551779786913 + - rid: 2193962551779786972 + - rid: 2193962551779786973 + - rid: 2193962551779786974 + - rid: 2193962551779786975 + - rid: 2193962551779786976 + - rid: 2193962551779786977 - rid: 6852985685364965392 - - rid: 2193962551779786914 + - rid: 2193962551779786978 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 2193962551779786915 + - rid: 2193962551779786979 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 2193962551779786904 + - rid: 2193962551779786968 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: 2193962551779786905 + - rid: 2193962551779786969 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -116,7 +116,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: 2193962551779786906 + - rid: 2193962551779786970 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -131,7 +131,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: 2193962551779786907 + - rid: 2193962551779786971 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -140,7 +140,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: 2193962551779786908 + - rid: 2193962551779786972 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -153,13 +153,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: 2193962551779786909 + - rid: 2193962551779786973 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: 2193962551779786910 + - rid: 2193962551779786974 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -172,12 +172,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 2193962551779786911 + - rid: 2193962551779786975 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 2193962551779786912 + - rid: 2193962551779786976 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,21 +187,21 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 2193962551779786913 + - rid: 2193962551779786977 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 2193962551779786914 + - rid: 2193962551779786978 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: 2193962551779786915 + - rid: 2193962551779786979 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/LogicData/BubbleUI.cs b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs index 6d213a7a..0e0f8a2c 100644 --- a/Assets/WorkSpace/LH/LogicData/BubbleUI.cs +++ b/Assets/WorkSpace/LH/LogicData/BubbleUI.cs @@ -44,5 +44,7 @@ public class BubbleUI : MonoBehaviour public void SetMessage(string msg) { messageText.text = msg; + Vector3 screenPos = mainCam.WorldToScreenPoint(target.position + worldOffset); + rt.position = screenPos; } } \ No newline at end of file diff --git a/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs b/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs index 162f4136..cc5e3335 100644 --- a/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs +++ b/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs @@ -19,6 +19,7 @@ namespace Octopus.Simulator float contentSpacing = 5f; float padding = 25f; public event Action onPanelUpdated; + LogicUIManager logicUIManager; // Start is called once before the first execution of Update after the MonoBehaviour is created private void Awake() { @@ -27,7 +28,7 @@ namespace Octopus.Simulator private void Start() { - var logicUIManager = FindAnyObjectByType(); + logicUIManager = FindAnyObjectByType(); logicUIManager.onLogicItemSelected += SetLogicDataItem; logicUIManager.onModelSelected += SetLogicDataItem; logicUIManager.onLogicItemDeSelected += UnsetLogicDataItem; @@ -84,7 +85,7 @@ namespace Octopus.Simulator var listItem = CreateLogicListItem(fields[i].Name); foreach (var queueItem in queueList) { - var queueLabel = FindAnyObjectByType().itemMap[queueItem.queue_name].Label; + var queueLabel = logicUIManager.itemMap[queueItem.queue_name].Label; listItem.AddItem(count.ToString(), queueLabel, queueItem.required_items.ToString()); count++; } @@ -95,13 +96,17 @@ namespace Octopus.Simulator var storeLisItem = CreateLogicListItem(fields[i].Name); foreach (var storeItem in storeList) { - var queueLabel = FindAnyObjectByType().itemMap[storeItem.Queue].Label; - storeLisItem.AddItem(count.ToString(), storeItem.Queue, storeItem.RequiredItems.ToString()); + var queueLabel = logicUIManager.itemMap[storeItem.Queue].Label; + storeLisItem.AddItem(count.ToString(), queueLabel, storeItem.RequiredItems.ToString()); count++; } SetRectHeight(fields.Length, itemHeight); break; default: + if (fields[i].Name.Equals("output_store")|| fields[i].Name.Equals("output_queue") || fields[i].Name.Equals("defect_store") || fields[i].Name.Equals("defect_queue") || fields[i].Name.Equals("required_resource") || fields[i].Name.Equals("output_resource")) + { + rawValue = logicUIManager.itemMap[rawValue.ToString()].Label; + } CreateLogicItem(fields[i].Name, rawValue, itemHeight, i); SetRectHeight(fields.Length, itemHeight); break; diff --git a/Assets/WorkSpace/LH/LogicInfo.cs b/Assets/WorkSpace/LH/LogicInfo.cs index 817871e7..9a1aa14f 100644 --- a/Assets/WorkSpace/LH/LogicInfo.cs +++ b/Assets/WorkSpace/LH/LogicInfo.cs @@ -143,7 +143,7 @@ namespace Octopus.Simulator public string? name = ""; public string? label; public int capacity = 0; - public int quantity; + //public int quantity; public int priority_order; public string? queue_type; public string? Name => name; @@ -171,7 +171,7 @@ namespace Octopus.Simulator public string? name; public string? label; public int capacity; - public int quantity; + //public int quantity; public int priority_order; public string? Name => name; public string? Label => label; @@ -217,11 +217,14 @@ namespace Octopus.Simulator public int processing_time; public int? batch_size = 0; public List? input_queues; + public List? input_stores; public string? output_queue; - public string? defect_queue; + public string? output_store; public string? required_resource; public int process_amount; public float defect_rate; + public string? defect_queue; + public string? defect_store; public override string? Name => name; public override string? Label => label; public override ComponentType Type => ComponentType.Processor; @@ -234,16 +237,17 @@ namespace Octopus.Simulator public string label; public string time_type; public int? move_time = 0; + public float return_time; public float? move_distance = 0f; public float? move_speed = 0f; [JsonProperty("capacity")] public int? capacity_move = 0; - public string input_queue; + public List? input_queues; + public List? input_stores; public string output_queue; - public string defect_queue; + public string output_store; public string required_resource; - public string move_type; - public float return_time; + public string mover_type; public int min_batch_size; public override string Name => name; public override string Label => label; @@ -256,8 +260,9 @@ namespace Octopus.Simulator public string? name; public string? label; public int? sinking_interval = 0; - public int? sinking_amount = 0; + //public int? sinking_amount = 0; public List? input_queues; + public List? input_stores; public override string? Name => name; public override string? Label => label; @@ -270,12 +275,16 @@ namespace Octopus.Simulator public string name; public string label; public int? move_time=0; - public float? belt_speed=0; public float? belt_length = 0; - public int? capacity = 0; - public string? input_queue; + public float? belt_speed=0; + [JsonProperty("capacity")] + public int? capacity_move = 0; + public List? input_queues; + public List? input_stores; public string? output_queue; + public string? output_store; public string? defect_queue; + public string? defect_store; public string? required_resource; public override string? Name => name; public override string? Label => label; diff --git a/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs b/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs index 908a28ca..66d3a8f9 100644 --- a/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs +++ b/Assets/WorkSpace/LH/Simulation/SimulationModelConveyor.cs @@ -20,8 +20,10 @@ public class SimulationModelConveyor : SimulationModel string inputQueueID; string inputStoreID; // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() + + protected override void init() { + base.init(); startPosition = this.transform.Find(nameof(startPosition)).transform.position; endPosition = this.transform.Find(nameof(endPosition)).transform.position; } diff --git a/Assets/WorkSpace/LH/Web/WebReceiver.cs b/Assets/WorkSpace/LH/Web/WebReceiver.cs index 71839530..bc218491 100644 --- a/Assets/WorkSpace/LH/Web/WebReceiver.cs +++ b/Assets/WorkSpace/LH/Web/WebReceiver.cs @@ -20,9 +20,9 @@ namespace Octopus.Simulator.Networks onParameterRecived += FindAnyObjectByType().RequestInfo; onParameterRecived += FindAnyObjectByType().RequestInfo; #if UNITY_EDITOR - config.projectId = "37"; + config.projectId = "45"; //config.simulationId = "15"; - config.logicId = "42"; + config.logicId = "50"; WebParameters.config = config; onParameterRecived?.Invoke(); #else