UVCXR/SAMKWANG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

null 로 받고 있는 데이터 UI에서 삭제 #36

Merged
hansb102318 merged 3 commits from hsb/251216_00 into main 2025-12-17 16:02:36 +09:00
Conversation 0 Commits 3 Files Changed 15 +49 -49
7 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e60f6076dc - Show all commits

14
Assets/Prefabs/UI/Panel/Panel_ProductionProgress.prefab
View File

@@ -1779,7 +1779,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Target
m_text: Plan
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
@@ -1861,7 +1861,7 @@ GameObject:
- component: {fileID: 4798597673257361100}
- component: {fileID: 9038543073358663173}
m_Layer: 5
m_Name: Target
m_Name: Plan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1907,7 +1907,7 @@ GameObject:
- component: {fileID: 4827654606818398736}
- component: {fileID: 2863313588467765782}
m_Layer: 5
m_Name: Plan
m_Name: WordNo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2053,7 +2053,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Plan
m_text: WordNo
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
@@ -4143,7 +4143,7 @@ GameObject:
- component: {fileID: 6306977402866142649}
- component: {fileID: 5613715498690130958}
m_Layer: 5
m_Name: Plan
m_Name: WordNo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -4324,7 +4324,7 @@ GameObject:
- component: {fileID: 2389382741393836529}
- component: {fileID: 2558879078169890810}
m_Layer: 5
m_Name: Target
m_Name: Plan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -4377,7 +4377,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uBAA9\uD45C"
m_text: "\uACC4\uD68D"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}

16
Assets/Prefabs/UI/Panel/Panel_TotalProgress.prefab
View File

@@ -2798,7 +2798,7 @@ GameObject:
- component: {fileID: 6296392023615793905}
- component: {fileID: 6565161931667421718}
m_Layer: 5
m_Name: Target
m_Name: Plan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2851,7 +2851,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uBAA9\uD45C"
m_text: "\uACC4\uD68D"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
@@ -3023,7 +3023,7 @@ GameObject:
- component: {fileID: 6892406837823152926}
- component: {fileID: 5790508574095187326}
m_Layer: 5
m_Name: Target
m_Name: Plan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3341,7 +3341,7 @@ GameObject:
- component: {fileID: 7416245570605287957}
- component: {fileID: 2682327008078239197}
m_Layer: 5
m_Name: Target
m_Name: Plan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -9089,7 +9089,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Target
m_text: Plan
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
@@ -9438,7 +9438,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Target
m_text: Plan
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
@@ -12447,7 +12447,7 @@ GameObject:
- component: {fileID: 8468688121404814342}
- component: {fileID: 1659974690427970943}
m_Layer: 5
m_Name: Target
m_Name: Plan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -12500,7 +12500,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uBAA9\uD45C"
m_text: "\uACC4\uD68D"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}

2
Assets/Resources/Prefabs/UI/PRF_UI_MachineStatusItem.prefab
View File

@@ -495,7 +495,7 @@ GameObject:
- component: {fileID: 3692155740666317648}
- component: {fileID: 1160799895540555253}
m_Layer: 5
m_Name: goalqty
m_Name: planqty
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

4
Assets/Resources/Prefabs/UI/UI_StatusItem.prefab
View File

@@ -630,7 +630,7 @@ GameObject:
- component: {fileID: 3915310468147686133}
- component: {fileID: 5698208829134002718}
m_Layer: 0
m_Name: Goalqty
m_Name: Planqty
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1391,7 +1391,7 @@ GameObject:
- component: {fileID: 4833486862650364660}
- component: {fileID: 2382519952783294358}
m_Layer: 5
m_Name: goalqty
m_Name: planqty
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

8
Assets/Scripts/Branch/UI/UI_MachineStatusItem.cs
View File

@@ -20,7 +20,7 @@ namespace Samkwang
public TextMeshProUGUI status;
public TextMeshProUGUI pjtcd;
public TextMeshProUGUI itemdesc;
public TextMeshProUGUI goalqty;
public TextMeshProUGUI planqty;
public TextMeshProUGUI workqty;
public TextMeshProUGUI goodqty;
public TextMeshProUGUI badqty;
@@ -57,7 +57,7 @@ namespace Samkwang
status = textDict.GetOrNull(nameof(status));
pjtcd = textDict.GetOrNull(nameof(pjtcd));
itemdesc = textDict.GetOrNull(nameof(itemdesc));
goalqty = textDict.GetOrNull(nameof(goalqty));
planqty = textDict.GetOrNull(nameof(planqty));
workqty = textDict.GetOrNull(nameof(workqty));
goodqty = textDict.GetOrNull(nameof(goodqty));
badqty = textDict.GetOrNull(nameof(badqty));
@@ -127,7 +127,7 @@ namespace Samkwang
{
UpdateAndHighlight(pjtcd, SetTextData(completeInfo.pjtcd), "pjtcd");
UpdateAndHighlight(itemdesc, SetTextData(completeInfo.itemdesc), "itemdesc");
UpdateAndHighlight(goalqty, RoundToIntData(completeInfo.goalqty), "goalqty");
UpdateAndHighlight(planqty, RoundToIntData(completeInfo.planqty), "planqty");
UpdateAndHighlight(workqty, RoundToIntData(completeInfo.workqty), "workqty");
UpdateAndHighlight(goodqty, RoundToIntData(completeInfo.goodqty), "goodqty");
UpdateAndHighlight(badqty, RoundToIntData(completeInfo.badqty), "badqty");
@@ -162,7 +162,7 @@ namespace Samkwang
SetTextColor(worknm, completeInfo.worknm, newColor);
SetTextColor(pjtcd, SetTextData(completeInfo.pjtcd), newColor);
SetTextColor(itemdesc, SetTextData(completeInfo.itemdesc), newColor);
SetTextColor(goalqty, RoundToIntData(completeInfo.goalqty), newColor);
SetTextColor(planqty, RoundToIntData(completeInfo.planqty), newColor);
SetTextColor(workqty, RoundToIntData(completeInfo.workqty), newColor);
SetTextColor(goodqty, RoundToIntData(completeInfo.goodqty), newColor);
SetTextColor(badqty, RoundToIntData(completeInfo.badqty), newColor);

6
Assets/Scripts/Branch/UI/UI_StatusItem.cs
View File

@@ -14,7 +14,7 @@ namespace Samkwang
public TextMeshProUGUI itemcd;
public TextMeshProUGUI itemdesc;
public TextMeshProUGUI wordno;
public TextMeshProUGUI goalqty;
public TextMeshProUGUI planqty;
public TextMeshProUGUI workqty;
public TextMeshProUGUI goodqty;
public TextMeshProUGUI badqty;
@@ -40,7 +40,7 @@ namespace Samkwang
itemcd = textDict.GetOrNull(nameof(itemcd));
itemdesc = textDict.GetOrNull(nameof(itemdesc));
wordno = textDict.GetOrNull(nameof(wordno));
goalqty = textDict.GetOrNull(nameof(goalqty));
planqty = textDict.GetOrNull(nameof(planqty));
workqty = textDict.GetOrNull(nameof(workqty));
goodqty = textDict.GetOrNull(nameof(goodqty));
badqty = textDict.GetOrNull(nameof(badqty));
@@ -79,7 +79,7 @@ namespace Samkwang
wordno.SetText(SetTextData(completeInfo.wordno));
goaltime.SetText(CalculateDate(currentTime, completeInfo.sttm));
goalqty.SetText(RoundToIntData(completeInfo.goalqty));
planqty.SetText(RoundToIntData(completeInfo.planqty));
workqty.SetText(RoundToIntData(completeInfo.workqty));
goodqty.SetText(RoundToIntData(completeInfo.goodqty));
badqty.SetText(RoundToIntData(completeInfo.badqty));

48
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 9217628533097234524
- rid: 9217628533097234525
- rid: 9217628557039894620
- rid: 9217628557039894621
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 9217628533097234526
- rid: 9217628533097234527
- rid: 9217628557039894622
- rid: 9217628557039894623
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 9217628533097234528
- rid: 9217628533097234529
- rid: 9217628533097234530
- rid: 9217628533097234531
- rid: 9217628533097234532
- rid: 9217628533097234533
- rid: 9217628557039894624
- rid: 9217628557039894625
- rid: 9217628557039894626
- rid: 9217628557039894627
- rid: 9217628557039894628
- rid: 9217628557039894629
- rid: 6852985685364965392
- rid: 9217628533097234534
- rid: 9217628557039894630
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 2598567180278956032
- rid: 9217628533097234535
- rid: 9217628557039894631
m_RuntimeSettings:
m_List:
- rid: 6852985685364965378
@@ -161,14 +161,14 @@ MonoBehaviour:
data:
m_Version: 0
m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
- rid: 9217628533097234524
- rid: 9217628557039894620
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: 9217628533097234525
- rid: 9217628557039894621
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
@@ -180,7 +180,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: 9217628533097234526
- rid: 9217628557039894622
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
@@ -195,7 +195,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: 9217628533097234527
- rid: 9217628557039894623
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
@@ -204,7 +204,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: 9217628533097234528
- rid: 9217628557039894624
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
@@ -217,13 +217,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: 9217628533097234529
- rid: 9217628557039894625
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: 9217628533097234530
- rid: 9217628557039894626
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -236,12 +236,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 9217628533097234531
- rid: 9217628557039894627
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 9217628533097234532
- rid: 9217628557039894628
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
@@ -251,21 +251,21 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 9217628533097234533
- rid: 9217628557039894629
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 9217628533097234534
- rid: 9217628557039894630
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: 9217628533097234535
- rid: 9217628557039894631
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}