update

2025-07-17 11:41:03 +09:00
parent f4143f90d2
commit 0aac6eeb82
9 changed files with 76 additions and 58 deletions
--- a/Assets/Resources/LED/LED
+++ b/Assets/Resources/LED/LED
@@ -112,7 +112,7 @@ Transform:
  m_GameObject: {fileID: 480657557526469570}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: -1.466, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
--- a/Assets/Resources/Library/LibraryPrefab/Process_Machine.prefab
+++ b/Assets/Resources/Library/LibraryPrefab/Process_Machine.prefab
@@ -273,27 +273,27 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalScale.x
-      value: 2
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalScale.y
-      value: 2
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalScale.z
-      value: 2
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0.872
+      value: -1.22
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -0.078
+      value: -2.52
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0
+      value: -0.59
      objectReference: {fileID: 0}
    - target: {fileID: 7251042966579490404, guid: ca003488795cf364c91b29ced977ed97, type: 3}
      propertyPath: m_LocalRotation.w
--- a/Assets/Resources/UIPrefab/UILogicListItem.prefab
+++ b/Assets/Resources/UIPrefab/UILogicListItem.prefab
@@ -59,7 +59,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.28627452, g: 0.95686275, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.36973903, b: 0.28627455, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@@ -143,15 +143,15 @@ MonoBehaviour:
      m_Calls: []
  m_text: 1
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f033b96aa66acfd4b84aa16e32cfc660, type: 2}
-  m_sharedMaterial: {fileID: 6975767319296004534, guid: f033b96aa66acfd4b84aa16e32cfc660, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2}
+  m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4294964297
-  m_fontColor: {r: 0.28773582, g: 0.95810205, b: 1, a: 1}
+    rgba: 4283064319
+  m_fontColor: {r: 1, g: 0.37254903, b: 0.2901961, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -168,8 +168,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 18
-  m_fontSizeBase: 18
+  m_fontSize: 14
+  m_fontSizeBase: 14
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@@ -414,15 +414,15 @@ MonoBehaviour:
      m_Calls: []
  m_text: New Text
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f033b96aa66acfd4b84aa16e32cfc660, type: 2}
-  m_sharedMaterial: {fileID: 6975767319296004534, guid: f033b96aa66acfd4b84aa16e32cfc660, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2}
+  m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4289899432
+  m_fontColor: {r: 0.65882355, g: 0.67058825, b: 0.69803923, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -439,8 +439,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 18
-  m_fontSizeBase: 18
+  m_fontSize: 14
+  m_fontSizeBase: 14
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@@ -596,15 +596,15 @@ MonoBehaviour:
      m_Calls: []
  m_text: New Text
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f033b96aa66acfd4b84aa16e32cfc660, type: 2}
-  m_sharedMaterial: {fileID: 6975767319296004534, guid: f033b96aa66acfd4b84aa16e32cfc660, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 05bae3109f77490458ea729d51e7df78, type: 2}
+  m_sharedMaterial: {fileID: -7290017371581542385, guid: 05bae3109f77490458ea729d51e7df78, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4283124555
+  m_fontColor: {r: 0.29411766, g: 0.29411766, b: 0.29411766, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@@ -639,7 +639,7 @@ MonoBehaviour:
  m_charWidthMaxAdj: 0
  m_TextWrappingMode: 1
  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
+  m_overflowMode: 1
  m_linkedTextComponent: {fileID: 0}
  parentLinkedComponent: {fileID: 0}
  m_enableKerning: 0
--- a/Assets/Resources/translationtable.csv
+++ b/Assets/Resources/translationtable.csv
@@ -2,7 +2,9 @@ key,korean
 name,이름
 label,라벨
 type,타입
-capacity,동시 처리 용량
+capacity_source,주기 당 개수
+capacity_move,최대 운송 수
+capacity,최대 용량
 breakdown_interval,고장 발생 간격
 repair_time,고장 수리 소요 시간
 speed_factor,작업 속도 보정값
@@ -14,7 +16,11 @@ rate,제품 생성 간격(초)
 batch_size,생성 제품 수
 period,생성 주기(초)
 output,제품 출고 큐(스토어)
+output_store,제품 출고 큐(스토어)
+output_queue,제품 출고 큐(큐)
 defect,불량 출고 큐(스토어)
+defect_store,불량 출고 큐(스토어)
+defect_queue,불량 출고 큐(큐)
 defect_rate,불량률
 output_resource,리소스
 prod_priority,생성 우선순위
--- a/Assets/Scenes/Simulation_0.0.1.unity
+++ b/Assets/Scenes/Simulation_0.0.1.unity
@@ -5181,11 +5181,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: -1202.75
+      value: -1081.1
      objectReference: {fileID: 0}
    - target: {fileID: 5594411199481332861, guid: 8399fc044b9f80245be55f692ba44a15, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 824.5001
+      value: 402.65002
      objectReference: {fileID: 0}
    - target: {fileID: 5871922466397881520, guid: 8399fc044b9f80245be55f692ba44a15, type: 3}
      propertyPath: m_AnchorMax.y
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -33,28 +33,28 @@ MonoBehaviour:
  m_Settings:
    m_SettingsList:
      m_List:
-      - rid: 2193962551779786839
-      - rid: 2193962551779786840
+      - rid: 2193962551779786904
+      - rid: 2193962551779786905
      - rid: 6852985685364965378
      - rid: 6852985685364965379
      - rid: 6852985685364965380
      - rid: 6852985685364965381
-      - rid: 2193962551779786841
-      - rid: 2193962551779786842
+      - rid: 2193962551779786906
+      - rid: 2193962551779786907
      - rid: 6852985685364965384
      - rid: 6852985685364965385
-      - rid: 2193962551779786843
-      - rid: 2193962551779786844
-      - rid: 2193962551779786845
-      - rid: 2193962551779786846
-      - rid: 2193962551779786847
-      - rid: 2193962551779786848
+      - rid: 2193962551779786908
+      - rid: 2193962551779786909
+      - rid: 2193962551779786910
+      - rid: 2193962551779786911
+      - rid: 2193962551779786912
+      - rid: 2193962551779786913
      - rid: 6852985685364965392
-      - rid: 2193962551779786849
+      - rid: 2193962551779786914
      - rid: 6852985685364965394
      - rid: 8712630790384254976
      - rid: 5092397466944798720
-      - rid: 2193962551779786850
+      - rid: 2193962551779786915
    m_RuntimeSettings:
      m_List:
      - rid: 6852985685364965378
@@ -97,14 +97,14 @@ MonoBehaviour:
  references:
    version: 2
    RefIds:
-    - rid: 2193962551779786839
+    - rid: 2193962551779786904
      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: 2193962551779786840
+    - rid: 2193962551779786905
      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: 2193962551779786841
+    - rid: 2193962551779786906
      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: 2193962551779786842
+    - rid: 2193962551779786907
      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: 2193962551779786843
+    - rid: 2193962551779786908
      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: 2193962551779786844
+    - rid: 2193962551779786909
      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: 2193962551779786845
+    - rid: 2193962551779786910
      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: 2193962551779786846
+    - rid: 2193962551779786911
      type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
      data:
        m_Version: 1
        m_ProbeVolumeDisableStreamingAssets: 0
-    - rid: 2193962551779786847
+    - rid: 2193962551779786912
      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: 2193962551779786848
+    - rid: 2193962551779786913
      type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
      data:
        m_version: 0
        m_IncludeReferencedInScenes: 0
        m_IncludeAssetsByLabel: 0
        m_LabelToInclude: 
-    - rid: 2193962551779786849
+    - rid: 2193962551779786914
      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: 2193962551779786850
+    - rid: 2193962551779786915
      type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
      data:
        m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
--- a/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs
+++ b/Assets/WorkSpace/LH/LogicData/LogicUIManager.cs
@@ -26,7 +26,7 @@ namespace Octopus.Simulator
        public event Action<ILogicItem> onModelSelected;
        public event Action onLogicItemDeSelected;
        private Dictionary<string, Button> idMap = new Dictionary<string, Button>();
-        private Dictionary<string, ILogicItem> itemMap = new Dictionary<string, ILogicItem>();
+        public Dictionary<string, ILogicItem> itemMap = new Dictionary<string, ILogicItem>();
        // Start is called once before the first execution of Update after the MonoBehaviour is created
        private void Awake()
        {
--- a/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs
+++ b/Assets/WorkSpace/LH/LogicData/Panel_LogicData.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using UnityEngine.UI;
+using static UnityEngine.Rendering.DebugUI;

 namespace Octopus.Simulator
 {
@@ -71,6 +72,11 @@ namespace Octopus.Simulator
            for (int i = 0; i < fields.Length; i++)
            {
                var rawValue = fields[i].GetValue(item);
+                string rawValueData = rawValue?.ToString() ?? "";
+                if (string.IsNullOrEmpty(rawValueData))
+                {
+                    continue;
+                }
                int count = 1;
                switch (rawValue)
                {
@@ -78,7 +84,8 @@ namespace Octopus.Simulator
                        var listItem = CreateLogicListItem(fields[i].Name);
                        foreach (var queueItem in queueList)
                        {
-                            listItem.AddItem(count.ToString(),queueItem.queue_name,queueItem.required_items.ToString());
+                            var queueLabel = FindAnyObjectByType<LogicUIManager>().itemMap[queueItem.queue_name].Label;
+                            listItem.AddItem(count.ToString(), queueLabel, queueItem.required_items.ToString());
                            count++;
                        }
                        SetRectHeight(fields.Length, itemHeight);
@@ -88,6 +95,7 @@ namespace Octopus.Simulator
                        var storeLisItem = CreateLogicListItem(fields[i].Name);
                        foreach (var storeItem in storeList)
                        {
+                            var queueLabel = FindAnyObjectByType<LogicUIManager>().itemMap[storeItem.Queue].Label;
                            storeLisItem.AddItem(count.ToString(), storeItem.Queue, storeItem.RequiredItems.ToString());
                            count++;
                        }
--- a/Assets/WorkSpace/LH/LogicInfo.cs
+++ b/Assets/WorkSpace/LH/LogicInfo.cs
@@ -192,8 +192,9 @@ namespace Octopus.Simulator
    {
        public string? name;
        public string? label;
-        public int? period = 0;
-        public int? capacity = 0;
+        //public int? period = 0;
+        [JsonProperty("capacity")]
+        public int? capacity_source = 0;
        public int? batch_size = 0;
        public float defect_rate;
        public string? output_queue;
@@ -201,7 +202,7 @@ namespace Octopus.Simulator
        public string? defect_queue;
        public string? defect_store;
        public string? output_resource;
-        public int? rate = 0;
+        //public int? rate = 0;
        public int prod_priority;
        public override string Name => name;
        public override string Label => label;
@@ -231,10 +232,12 @@ namespace Octopus.Simulator
    {
        public string name;
        public string label;
+        public string time_type;
        public int? move_time = 0;
        public float? move_distance = 0f;
        public float? move_speed = 0f;
-        public int? capacity = 0;
+        [JsonProperty("capacity")]
+        public int? capacity_move = 0;
        public string input_queue;
        public string output_queue;
        public string defect_queue;
@@ -268,6 +271,7 @@ namespace Octopus.Simulator
        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 string? output_queue;