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

null인 데이터는 -- 표시로 변경

Browse Source
This commit is contained in:
SOOBEEN HAN
2025-12-15 19:21:34 +09:00
parent a2b658a382
commit 58912f3268
8 changed files with 137 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Assets/Font/NanumGothicBold SDF.asset
View File

File diff suppressed because one or more lines are too long

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

@@ -1487,7 +1487,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 10000
m_text: --
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
@@ -1940,7 +1940,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 55555
m_text: --
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
@@ -2854,7 +2854,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 67891
m_text: --
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}

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

@@ -140,7 +140,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 55555
m_text: --
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
@@ -2439,7 +2439,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 10000
m_text: --
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
@@ -2884,7 +2884,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 67891
m_text: --
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}

12
Assets/Scenes/Korea_Branch.unity
View File

@@ -13237,6 +13237,10 @@ PrefabInstance:
propertyPath: m_Name
value: 27-SUMITOMO
objectReference: {fileID: 0}
- target: {fileID: 2736168657399069965, guid: 63395f09da351384c888ccd035e1c6d1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3365035860195305399, guid: 63395f09da351384c888ccd035e1c6d1, type: 3}
propertyPath: m_RootOrder
value: -1
@@ -21714,6 +21718,10 @@ PrefabInstance:
propertyPath: m_Name
value: 19-SODICK
objectReference: {fileID: 0}
- target: {fileID: 4958641476129815833, guid: a3d058ca565686f498a2fee1d56f9a05, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5736304487745464227, guid: a3d058ca565686f498a2fee1d56f9a05, type: 3}
propertyPath: m_LocalScale.x
value: 0.95
@@ -37182,6 +37190,10 @@ PrefabInstance:
propertyPath: m_Name
value: 1-SUMITOMO
objectReference: {fileID: 0}
- target: {fileID: 7053972343256429177, guid: 052dd0409e874c741837bf855836543a, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7687484947460450499, guid: 052dd0409e874c741837bf855836543a, type: 3}
propertyPath: m_LocalScale.x
value: 0.113

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

@@ -141,6 +141,14 @@ namespace Samkwang
}
public void SetStatusData(OneHourInfo oneHourInfo)
{
// wordno가 없는 경우 체크
if (oneHourInfo == null)
{
H1WORKQTY.SetText("--");
Text_good.SetText("--");
H1BADQTY.SetText("--");
return;
}
var caculateData = CalculateGoodData(oneHourInfo.workqty, oneHourInfo.badqty);
H1WORKQTY.SetText(SetTextData(oneHourInfo.workqty));
@@ -187,6 +195,10 @@ namespace Samkwang
}
public string RoundToIntData(string data)
{
// 데이터가 null이거나 빈 문자열이면 "--" 반환
if (string.IsNullOrEmpty(data))
return "--";
float.TryParse(data, out var floatData);
var intData = Mathf.RoundToInt(floatData);
@@ -194,6 +206,10 @@ namespace Samkwang
}
public string RoundToFloatData(string data)
{
// 데이터가 null이거나 빈 문자열이면 "--" 반환
if (string.IsNullOrEmpty(data))
return "--";
float.TryParse(data, out var floatData);
var truncateData = Math.Truncate(floatData * 10) / 10;
@@ -201,6 +217,10 @@ namespace Samkwang
}
public string CalculateGoodData(string data_work, string data_bad)
{
// 데이터가 null이거나 빈 문자열이면 "--" 반환
if (string.IsNullOrEmpty(data_work) || string.IsNullOrEmpty(data_bad))
return "--";
float.TryParse(data_work, out var floatData_work);
float.TryParse(data_bad, out var floatData_bad);
var intdata_work = Mathf.RoundToInt(floatData_work);

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

@@ -122,6 +122,10 @@ namespace Samkwang
}
public string RoundToIntData(string data)
{
// 데이터가 null이거나 빈 문자열이면 "--" 반환
if (string.IsNullOrEmpty(data))
return "--";
float.TryParse(data, out var floatData);
var intData = Mathf.RoundToInt(floatData);
@@ -129,6 +133,10 @@ namespace Samkwang
}
public string RoundToFloatData(string data)
{
// 데이터가 null이거나 빈 문자열이면 "--" 반환
if (string.IsNullOrEmpty(data))
return "--";
float.TryParse(data, out var floatData);
var truncateData = Math.Truncate(floatData * 10) / 10;
@@ -136,6 +144,10 @@ namespace Samkwang
}
public string CalculateGoodData(string data_work, string data_bad)
{
// 데이터가 null이거나 빈 문자열이면 "--" 반환
if (string.IsNullOrEmpty(data_work) || string.IsNullOrEmpty(data_bad))
return "--";
float.TryParse(data_work, out var floatData_work);
float.TryParse(data_bad, out var floatData_bad);
var intdata_work = Mathf.RoundToInt(floatData_work);

48
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 9217628528705798332
- rid: 9217628528705798333
- rid: 9217628533097234524
- rid: 9217628533097234525
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 9217628528705798334
- rid: 9217628528705798335
- rid: 9217628533097234526
- rid: 9217628533097234527
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 9217628528705798336
- rid: 9217628528705798337
- rid: 9217628528705798338
- rid: 9217628528705798339
- rid: 9217628528705798340
- rid: 9217628528705798341
- rid: 9217628533097234528
- rid: 9217628533097234529
- rid: 9217628533097234530
- rid: 9217628533097234531
- rid: 9217628533097234532
- rid: 9217628533097234533
- rid: 6852985685364965392
- rid: 9217628528705798342
- rid: 9217628533097234534
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 2598567180278956032
- rid: 9217628528705798343
- rid: 9217628533097234535
m_RuntimeSettings:
m_List:
- rid: 6852985685364965378
@@ -161,14 +161,14 @@ MonoBehaviour:
data:
m_Version: 0
m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
- rid: 9217628528705798332
- rid: 9217628533097234524
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: 9217628528705798333
- rid: 9217628533097234525
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: 9217628528705798334
- rid: 9217628533097234526
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: 9217628528705798335
- rid: 9217628533097234527
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: 9217628528705798336
- rid: 9217628533097234528
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: 9217628528705798337
- rid: 9217628533097234529
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: 9217628528705798338
- rid: 9217628533097234530
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: 9217628528705798339
- rid: 9217628533097234531
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 9217628528705798340
- rid: 9217628533097234532
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: 9217628528705798341
- rid: 9217628533097234533
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 9217628528705798342
- rid: 9217628533097234534
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: 9217628528705798343
- rid: 9217628533097234535
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}

5
ProjectSettings/ProjectSettings.asset
View File

@@ -106,7 +106,7 @@ PlayerSettings:
xboxEnableFitness: 0
visibleInBackground: 1
allowFullscreenSwitch: 1
fullscreenMode: 3
fullscreenMode: 1
xboxSpeechDB: 0
xboxEnableHeadOrientation: 0
xboxEnableGuest: 0
@@ -141,7 +141,8 @@ PlayerSettings:
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.1.0
preloadedAssets: []
preloadedAssets:
- {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1