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

Merge pull request 'null 로 받고 있는 데이터 UI에서 삭제' (#36) from hsb/251216_00 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/SAMKWANG/pulls/36
This commit was merged in pull request #36.
This commit is contained in:
한수빈
2025-12-17 16:02:33 +09:00
parent 5b51cb92c1 a47d4c8d52
commit be7064e62b
15 changed files with 569 additions and 5117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
Assets/Font/Pretendard-SemiBold SDF.asset
View File

File diff suppressed because one or more lines are too long

2649
Assets/Prefabs/UI/Panel/Panel_MachineDetailDashboard.prefab
View File

File diff suppressed because it is too large Load Diff

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

@@ -136,52 +136,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &72169211303756889
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3113764169703283125}
- component: {fileID: 6029918011845254555}
m_Layer: 5
m_Name: OperationTime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3113764169703283125
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 72169211303756889}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 678828369869230781}
- {fileID: 4529363137141572111}
m_Father: {fileID: 3292952735302538050}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 85, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6029918011845254555
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 72169211303756889}
m_CullTransparentMesh: 1
--- !u!1 &509278897141433904
GameObject:
m_ObjectHideFlags: 0
@@ -473,7 +427,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -18}
m_SizeDelta: {x: 120, y: 16}
m_SizeDelta: {x: 140, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9209177672761469414
CanvasRenderer:
@@ -786,7 +740,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 110, y: 47}
m_SizeDelta: {x: 130, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7845596857802768363
CanvasRenderer:
@@ -934,142 +888,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1631667781036014395
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4407862060454686416}
- component: {fileID: 2058029754450212769}
- component: {fileID: 552679497329750}
m_Layer: 5
m_Name: Effectivenecss
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4407862060454686416
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1631667781036014395}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2814262404920120183}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -18}
m_SizeDelta: {x: 70, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2058029754450212769
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1631667781036014395}
m_CullTransparentMesh: 1
--- !u!114 &552679497329750
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1631667781036014395}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uD6A8\uC728"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294957476
m_fontColor: {r: 0.6431373, g: 0.8509804, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: -5
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1811551504783077452
GameObject:
m_ObjectHideFlags: 0
@@ -1306,142 +1124,6 @@ MonoBehaviour:
statusItemsCount: 11
changeDataTime: 5
fadeTime: 0.2
--- !u!1 &2656941527218153791
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4529363137141572111}
- component: {fileID: 5639118623292538852}
- component: {fileID: 5882681746010769696}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4529363137141572111
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2656941527218153791}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3113764169703283125}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.0000015497208, y: -33}
m_SizeDelta: {x: 90, y: 8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5639118623292538852
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2656941527218153791}
m_CullTransparentMesh: 1
--- !u!114 &5882681746010769696
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2656941527218153791}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Operation Time
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294957476
m_fontColor: {r: 0.6431373, g: 0.8509804, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 8
m_fontSizeBase: 8
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2828103745638561333
GameObject:
m_ObjectHideFlags: 0
@@ -1779,7 +1461,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 +1543,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
@@ -1886,7 +1568,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 47}
m_SizeDelta: {x: 100, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9038543073358663173
CanvasRenderer:
@@ -1907,7 +1589,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
@@ -1932,7 +1614,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 120, y: 47}
m_SizeDelta: {x: 130, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2863313588467765782
CanvasRenderer:
@@ -1978,7 +1660,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 120, y: 47}
m_SizeDelta: {x: 140, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8780692975392320821
CanvasRenderer:
@@ -2053,7 +1735,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}
@@ -2923,142 +2605,6 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6433984198618903421
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3899262166095413902}
- component: {fileID: 7001702455575683082}
- component: {fileID: 3922297112133914752}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3899262166095413902
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6433984198618903421}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2814262404920120183}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -33}
m_SizeDelta: {x: 70, y: 8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7001702455575683082
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6433984198618903421}
m_CullTransparentMesh: 1
--- !u!114 &3922297112133914752
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6433984198618903421}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Effectivenecss
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294957476
m_fontColor: {r: 0.6431373, g: 0.8509804, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 8
m_fontSizeBase: 8
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6436419777574093309
GameObject:
m_ObjectHideFlags: 0
@@ -3232,7 +2778,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 230, y: 47}
m_SizeDelta: {x: 250, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2922865833818947427
CanvasRenderer:
@@ -3491,7 +3037,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 70, y: 47}
m_SizeDelta: {x: 90, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3861460760422246874
CanvasRenderer:
@@ -3922,8 +3468,6 @@ RectTransform:
- {fileID: 33794816838780413}
- {fileID: 6709021093564094201}
- {fileID: 6143834162459599972}
- {fileID: 2814262404920120183}
- {fileID: 3113764169703283125}
m_Father: {fileID: 2562795200311218999}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
@@ -4030,7 +3574,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -18}
m_SizeDelta: {x: 310, y: 16}
m_SizeDelta: {x: 260, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4679199164739898816
CanvasRenderer:
@@ -4143,7 +3687,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
@@ -4166,7 +3710,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -18}
m_SizeDelta: {x: 120, y: 16}
m_SizeDelta: {x: 130, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6306977402866142649
CanvasRenderer:
@@ -4324,7 +3868,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 +3921,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}
@@ -4494,142 +4038,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8387639855854150906}
m_CullTransparentMesh: 1
--- !u!1 &8749367936343464993
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 678828369869230781}
- component: {fileID: 8048057853992282361}
- component: {fileID: 2002239303501798775}
m_Layer: 5
m_Name: OperationTime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &678828369869230781
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8749367936343464993}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3113764169703283125}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -18}
m_SizeDelta: {x: 90, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8048057853992282361
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8749367936343464993}
m_CullTransparentMesh: 1
--- !u!114 &2002239303501798775
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8749367936343464993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uAC00\uB3D9\uC2DC\uAC04"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_sharedMaterial: {fileID: 2250789165734441016, guid: 155cf7b89710f7e40aa64ac01771e416, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294957476
m_fontColor: {r: 0.6431373, g: 0.8509804, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: -5
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8868993979141890600
GameObject:
m_ObjectHideFlags: 0
@@ -4665,7 +4073,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -18}
m_SizeDelta: {x: 110, y: 16}
m_SizeDelta: {x: 120, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5283155337846241065
CanvasRenderer:
@@ -4902,49 +4310,3 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &9114616066394441491
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2814262404920120183}
- component: {fileID: 3753509521127528011}
m_Layer: 5
m_Name: Effectivenecss
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2814262404920120183
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9114616066394441491}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4407862060454686416}
- {fileID: 3899262166095413902}
m_Father: {fileID: 3292952735302538050}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3753509521127528011
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9114616066394441491}
m_CullTransparentMesh: 1

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}

1228
Assets/Resources/Prefabs/UI/PRF_UI_MachineStatusIcon.prefab
View File

File diff suppressed because it is too large Load Diff

4
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
@@ -2281,7 +2281,7 @@ MonoBehaviour:
status: {fileID: 0}
pjtcd: {fileID: 0}
itemdesc: {fileID: 0}
goalqty: {fileID: 0}
planqty: {fileID: 0}
workqty: {fileID: 0}
goodqty: {fileID: 0}
badqty: {fileID: 0}

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

@@ -246,7 +246,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 120, y: 37}
m_SizeDelta: {x: 130, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1755815337648850725
CanvasRenderer:
@@ -382,7 +382,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 110, y: 37}
m_SizeDelta: {x: 130, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6558250427996581224
CanvasRenderer:
@@ -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
@@ -654,7 +654,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 37}
m_SizeDelta: {x: 100, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5698208829134002718
MonoBehaviour:
@@ -717,7 +717,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 120, y: 37}
m_SizeDelta: {x: 140, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1445370953637369273
CanvasRenderer:
@@ -1042,142 +1042,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3326568069197036844
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8569324930337641216}
- component: {fileID: 5312672670270631843}
- component: {fileID: 4849451499818391944}
m_Layer: 5
m_Name: goaltime
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8569324930337641216
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326568069197036844}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6899705469649154448}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 85, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5312672670270631843
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326568069197036844}
m_CullTransparentMesh: 1
--- !u!114 &4849451499818391944
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3326568069197036844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 01:50
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, 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}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 14
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
m_lineSpacing: -25
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3642822122935409845
GameObject:
m_ObjectHideFlags: 0
@@ -1391,7 +1255,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
@@ -1414,7 +1278,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 18.5}
m_SizeDelta: {x: 80, y: 18.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4833486862650364660
CanvasRenderer:
@@ -1690,8 +1554,6 @@ RectTransform:
- {fileID: 2734190181507982053}
- {fileID: 850065132114040697}
- {fileID: 2286617920548741587}
- {fileID: 5141462275783097668}
- {fileID: 8569324930337641216}
m_Father: {fileID: 1521938680933225023}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@@ -2307,7 +2169,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 70, y: 30}
m_SizeDelta: {x: 90, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5554265807821840618
GameObject:
@@ -2545,7 +2407,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 230, y: 37}
m_SizeDelta: {x: 250, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5787912100689733774
MonoBehaviour:
@@ -2573,142 +2435,6 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &5989561291797669467
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5141462275783097668}
- component: {fileID: 6068826892855053381}
- component: {fileID: 4116099557164580231}
m_Layer: 5
m_Name: efficiency
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5141462275783097668
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5989561291797669467}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6899705469649154448}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 60, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6068826892855053381
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5989561291797669467}
m_CullTransparentMesh: 1
--- !u!114 &4116099557164580231
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5989561291797669467}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 86.7
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2}
m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, 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}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 14
m_fontSizeBase: 14
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -3
m_wordSpacing: 0
m_lineSpacing: -25
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &6155112396599775905
GameObject:
m_ObjectHideFlags: 0
@@ -2804,12 +2530,10 @@ MonoBehaviour:
itemcd: {fileID: 0}
itemdesc: {fileID: 0}
wordno: {fileID: 0}
goalqty: {fileID: 0}
planqty: {fileID: 0}
workqty: {fileID: 0}
goodqty: {fileID: 0}
badqty: {fileID: 0}
efficiency: {fileID: 0}
goaltime: {fileID: 0}
cumulative: {fileID: 0}
Text_H1: {fileID: 0}
H1WORKQTY: {fileID: 0}
@@ -2990,7 +2714,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 210, y: 37}
m_SizeDelta: {x: 230, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &938508317534142387
CanvasRenderer:

126
Assets/Scenes/BranchSelection.unity
View File

@@ -842,8 +842,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 539777662}
- {fileID: 1875439517}
- {fileID: 1645869582}
- {fileID: 1640994162}
m_Father: {fileID: 2006995685}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
@@ -5215,6 +5214,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1625976276}
m_CullTransparentMesh: 1
--- !u!1 &1640994161
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1640994162}
- component: {fileID: 1640994164}
- component: {fileID: 1640994163}
m_Layer: 5
m_Name: Branch
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1640994162
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1640994161}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1875439517}
- {fileID: 1645869582}
m_Father: {fileID: 222823912}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -27}
m_SizeDelta: {x: 485.13, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1640994163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1640994161}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &1640994164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1640994161}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 0
m_ChildScaleWidth: 1
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &1645869581
GameObject:
m_ObjectHideFlags: 0
@@ -5226,6 +5304,7 @@ GameObject:
- component: {fileID: 1645869582}
- component: {fileID: 1645869584}
- component: {fileID: 1645869583}
- component: {fileID: 1645869585}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
@@ -5245,12 +5324,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 222823912}
m_Father: {fileID: 1640994162}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 444, y: -63}
m_SizeDelta: {x: 344, y: 58}
m_AnchoredPosition: {x: 313.58002, y: -50}
m_SizeDelta: {x: 343.1, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1645869583
MonoBehaviour:
@@ -5351,6 +5430,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1645869581}
m_CullTransparentMesh: 1
--- !u!114 &1645869585
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1645869581}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &1651345755
GameObject:
m_ObjectHideFlags: 0
@@ -5578,6 +5671,7 @@ GameObject:
- component: {fileID: 1875439517}
- component: {fileID: 1875439519}
- component: {fileID: 1875439518}
- component: {fileID: 1875439520}
m_Layer: 5
m_Name: Text_Branch
m_TagString: Untagged
@@ -5597,12 +5691,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 222823912}
m_Father: {fileID: 1640994162}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 136, y: -63}
m_SizeDelta: {x: 272, y: 58}
m_AnchoredPosition: {x: 71.015, y: -50}
m_SizeDelta: {x: 142.03, y: 58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1875439518
MonoBehaviour:
@@ -5624,7 +5718,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "OO \uC0AC\uC5C5\uBD80"
m_text: "00\uC9C0\uC0AC "
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 060de5c27554e5b4aae66d9c0f6127ef, type: 2}
m_sharedMaterial: {fileID: 5044220275478796424, guid: 060de5c27554e5b4aae66d9c0f6127ef, type: 2}
@@ -5703,6 +5797,20 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1875439516}
m_CullTransparentMesh: 1
--- !u!114 &1875439520
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1875439516}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &1964699786
GameObject:
m_ObjectHideFlags: 0

152
Assets/Scenes/Korea_Branch.unity
View File

@@ -2392,7 +2392,7 @@ PrefabInstance:
- target: {fileID: 4768810582627958259, guid: 052dd0409e874c741837bf855836543a, type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 797298cc11e710b44b6530fd4fea9f71, type: 2}
objectReference: {fileID: 9100000, guid: a05c8edcde4d3ff4b9255636743f1808, type: 2}
- target: {fileID: 7053972343256429177, guid: 052dd0409e874c741837bf855836543a, type: 3}
propertyPath: m_Name
value: 7-SUMITOMO
@@ -47889,7 +47889,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 397251689274278474, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -211.5
value: -147
objectReference: {fileID: 0}
- target: {fileID: 468428462019719963, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.x
@@ -47969,7 +47969,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1849757395341855673, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -175
value: -151
objectReference: {fileID: 0}
- target: {fileID: 1861499291567522838, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -48001,7 +48001,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1865408201728795567, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -31
value: -7
objectReference: {fileID: 0}
- target: {fileID: 2195827103557866976, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.x
@@ -48041,7 +48041,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_SizeDelta.y
value: 590
value: 553.7455
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_LocalPosition.x
@@ -48077,7 +48077,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -468
value: -449.87274
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -48169,7 +48169,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4415047115269603867, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -127
value: -103
objectReference: {fileID: 0}
- target: {fileID: 4499474996380627187, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_SizeDelta.x
@@ -48189,7 +48189,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4531052548475075139, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -103
value: -79
objectReference: {fileID: 0}
- target: {fileID: 4716881664260601258, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -48221,7 +48221,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5193866933336916879, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -276
value: -147
objectReference: {fileID: 0}
- target: {fileID: 5565453735647909047, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_Name
@@ -48253,7 +48253,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5744638352650717218, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -55
value: -31
objectReference: {fileID: 0}
- target: {fileID: 5924579586856838966, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -48269,7 +48269,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5924579586856838966, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -151
value: -127
objectReference: {fileID: 0}
- target: {fileID: 5976092880323282752, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -48284,73 +48284,73 @@ PrefabInstance:
value: 130
objectReference: {fileID: 0}
- target: {fileID: 5976092880323282752, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -175
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -211.5
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -82.5
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -55
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -199
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -276
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -147
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -79
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -223
objectReference: {fileID: 0}
- target: {fileID: 8937793027430319621, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@@ -48365,7 +48365,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8937793027430319621, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -147
value: -82.5
objectReference: {fileID: 0}
- target: {fileID: 8984770804334607265, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.x

203
Assets/Scenes/Vietnam_Branch.unity
View File

@@ -10592,7 +10592,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 397251689274278474, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -211.5
value: -147
objectReference: {fileID: 0}
- target: {fileID: 468428462019719963, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.x
@@ -10672,7 +10672,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1849757395341855673, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -175
value: -151
objectReference: {fileID: 0}
- target: {fileID: 1861499291567522838, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -10704,7 +10704,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1865408201728795567, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -31
value: -7
objectReference: {fileID: 0}
- target: {fileID: 2195827103557866976, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.x
@@ -10744,7 +10744,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_SizeDelta.y
value: 590
value: 559
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_LocalPosition.x
@@ -10780,7 +10780,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -468
value: -452.5
objectReference: {fileID: 0}
- target: {fileID: 2284100289011031509, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -10872,7 +10872,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4415047115269603867, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -127
value: -103
objectReference: {fileID: 0}
- target: {fileID: 4499474996380627187, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_SizeDelta.x
value: 174.29
objectReference: {fileID: 0}
- target: {fileID: 4531052548475075139, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -10888,7 +10892,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4531052548475075139, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -103
value: -79
objectReference: {fileID: 0}
- target: {fileID: 4716881664260601258, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -10920,7 +10924,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5193866933336916879, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -276
value: -147
objectReference: {fileID: 0}
- target: {fileID: 5565453735647909047, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_Name
@@ -10952,7 +10956,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5744638352650717218, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -55
value: -31
objectReference: {fileID: 0}
- target: {fileID: 5924579586856838966, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -10968,7 +10972,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5924579586856838966, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -151
value: -127
objectReference: {fileID: 0}
- target: {fileID: 5976092880323282752, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
@@ -10983,73 +10987,73 @@ PrefabInstance:
value: 130
objectReference: {fileID: 0}
- target: {fileID: 5976092880323282752, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -175
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -211.5
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -82.5
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -55
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -199
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 6658792496569679722, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -276
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 170
objectReference: {fileID: 0}
- target: {fileID: 7273140772941556290, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -147
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 7510165820446061249, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -79
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.x
value: 130
objectReference: {fileID: 0}
- target: {fileID: 8451925725449123754, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -223
objectReference: {fileID: 0}
- target: {fileID: 8937793027430319621, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@@ -11064,7 +11068,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8937793027430319621, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchoredPosition.y
value: -147
value: -82.5
objectReference: {fileID: 0}
- target: {fileID: 8984770804334607265, guid: f1245c024d38e9f418550c6a3069d69d, type: 3}
propertyPath: m_AnchorMax.x
@@ -19382,12 +19386,32 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 136280783309400832, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 265
value: 257.5
objectReference: {fileID: 0}
- target: {fileID: 136280783309400832, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
value: -23.5
objectReference: {fileID: 0}
- target: {fileID: 213252814884477184, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 213252814884477184, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 213252814884477184, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 655
objectReference: {fileID: 0}
- target: {fileID: 213252814884477184, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
value: -23.5
objectReference: {fileID: 0}
- target: {fileID: 284324839519725659, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 55bbc1610f1b40241ae328d2bcf17345, type: 3}
- target: {fileID: 475104381486309451, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@@ -19670,7 +19694,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3141628638421528672, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 475
value: 425
objectReference: {fileID: 0}
- target: {fileID: 3141628638421528672, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -19732,6 +19756,22 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5006831651140222635, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5006831651140222635, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5006831651140222635, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 655
objectReference: {fileID: 0}
- target: {fileID: 5006831651140222635, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
value: -23.5
objectReference: {fileID: 0}
- target: {fileID: 5408444214606340462, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@@ -19822,7 +19862,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6079568207599581528, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 475
value: 425
objectReference: {fileID: 0}
- target: {fileID: 6079568207599581528, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -19886,7 +19926,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6892406837823152926, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 661.25
value: 576.25
objectReference: {fileID: 0}
- target: {fileID: 6892406837823152926, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -19902,7 +19942,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7395951253639678683, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 265
value: 257.5
objectReference: {fileID: 0}
- target: {fileID: 7395951253639678683, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -19918,7 +19958,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7416245570605287957, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.x
value: 661.25
value: 576.25
objectReference: {fileID: 0}
- target: {fileID: 7416245570605287957, guid: e2f0d001945fd394b979c7fa8d54e049, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -27945,6 +27985,7 @@ RectTransform:
- {fileID: 66526262}
- {fileID: 1653303383}
- {fileID: 1724488390}
- {fileID: 1653918633}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}

59
Assets/Scripts/Branch/UI/Panel_MachineDetailDashboard.cs
View File

@@ -25,32 +25,32 @@ namespace Samkwang
private TextMeshProUGUI cycletime;
private TextMeshProUGUI moldcd;
private TextMeshProUGUI moldseq;
private TextMeshProUGUI eorate;
//private TextMeshProUGUI eorate;
private TextMeshProUGUI workdt;
private TextMeshProUGUI planqty;
private TextMeshProUGUI goalqty;
//private TextMeshProUGUI goalqty;
private TextMeshProUGUI workqty;
private TextMeshProUGUI goodqty;
private TextMeshProUGUI badqty;
private TextMeshProUGUI badrate;
private TextMeshProUGUI efficiency;
//private TextMeshProUGUI efficiency;
private TextMeshProUGUI progressrate;
private TextMeshProUGUI porate;
//private TextMeshProUGUI porate;
private TextMeshProUGUI goodqtyrate;
#endregion
#region Slider
private Slider Slider_eorate;
private Slider Slider_pvp;
private Slider Slider_planqty;
private Slider Slider_goalqty;
//private Slider Slider_goalqty;
private Slider Slider_workqty;
private Slider Slider_goodqty;
private Slider Slider_badqty;
private Slider Slider_badrate;
private Slider Slider_efficiency;
//private Slider Slider_efficiency;
private Slider Slider_progressrate;
private Slider Slider_porate;
//private Slider Slider_porate;
private Slider Slider_goodqtyrate;
#endregion
@@ -80,29 +80,29 @@ namespace Samkwang
cycletime = textDict.GetOrNull(nameof(cycletime));
moldcd = textDict.GetOrNull(nameof(moldcd));
moldseq = textDict.GetOrNull(nameof(moldseq));
eorate = textDict.GetOrNull(nameof(eorate));
//eorate = textDict.GetOrNull(nameof(eorate));
workdt = textDict.GetOrNull(nameof(workdt));
planqty = textDict.GetOrNull(nameof(planqty));
goalqty = textDict.GetOrNull(nameof(goalqty));
//goalqty = textDict.GetOrNull(nameof(goalqty));
workqty = textDict.GetOrNull(nameof(workqty));
goodqty = textDict.GetOrNull(nameof(goodqty));
badqty = textDict.GetOrNull(nameof(badqty));
badrate = textDict.GetOrNull(nameof(badrate));
efficiency = textDict.GetOrNull(nameof(efficiency));
//efficiency = textDict.GetOrNull(nameof(efficiency));
progressrate = textDict.GetOrNull(nameof(progressrate));
porate = textDict.GetOrNull(nameof(porate));
//porate = textDict.GetOrNull(nameof(porate));
goodqtyrate = textDict.GetOrNull(nameof(goodqtyrate));
Slider_eorate = sliderDict.GetOrNull(nameof(Slider_eorate));
Slider_pvp = sliderDict.GetOrNull(nameof(Slider_pvp));
Slider_planqty = sliderDict.GetOrNull(nameof(Slider_planqty));
Slider_goalqty = sliderDict.GetOrNull(nameof(Slider_goalqty));
//Slider_goalqty = sliderDict.GetOrNull(nameof(Slider_goalqty));
Slider_workqty = sliderDict.GetOrNull(nameof(Slider_workqty));
Slider_goodqty = sliderDict.GetOrNull(nameof(Slider_goodqty));
Slider_badqty = sliderDict.GetOrNull(nameof(Slider_badqty));
Slider_badrate = sliderDict.GetOrNull(nameof(Slider_badrate));
Slider_efficiency = sliderDict.GetOrNull(nameof(Slider_efficiency));
//Slider_efficiency = sliderDict.GetOrNull(nameof(Slider_efficiency));
Slider_progressrate = sliderDict.GetOrNull(nameof(Slider_progressrate));
Slider_porate = sliderDict.GetOrNull(nameof(Slider_porate));
//Slider_porate = sliderDict.GetOrNull(nameof(Slider_porate));
Slider_goodqtyrate = sliderDict.GetOrNull(nameof(Slider_goodqtyrate));
Button_Close = buttonDict.GetOrNull(nameof(Button_Close));
@@ -135,10 +135,10 @@ namespace Samkwang
MachineName.SetText(SetNameData(data.worknm, machine.machineName));
MachineName.rectTransform.anchoredPosition = new Vector2(-MachineName.preferredWidth, MachineName.rectTransform.anchoredPosition.y);
eorate.SetText(PercentCalculate(data.eorate).ToString() + "%");
pvp.SetText(PercentCalculate(data.pvp).ToString() + "%");
wordno.SetText(SetTextData(data.wordno));
pvp.SetText(SetTextData(data.pvp));
//pvp.SetText(SetTextData(data.pvp));
workseq.SetText(SetTextData(data.workseq));
statusnm.SetText(SetTextData(data.statusnm));
workcd.SetText(SetTextData(data.workcd));
@@ -152,33 +152,33 @@ namespace Samkwang
moldseq.SetText(SetTextData(data.moldseq));
planqty.SetText(SetTextData(data.planqty));
goalqty.SetText(SetTextData(data.goalqty));
//goalqty.SetText(SetTextData(data.goalqty));
workqty.SetText(SetTextData(data.workqty));
goodqty.SetText(SetTextData(data.goodqty));
badqty.SetText(SetTextData(data.badqty));
badrate.SetText(DecimalPointPercentCalculate(data.badrate).ToString() + "%");
efficiency.SetText(DecimalPointPercentCalculate(data.efficiency).ToString() + "%");
//efficiency.SetText(DecimalPointPercentCalculate(data.efficiency).ToString() + "%");
progressrate.SetText(DecimalPointPercentCalculate(data.progressrate).ToString() + "%");
porate.SetText(PercentCalculate(data.porate).ToString() + "%");
//porate.SetText(PercentCalculate(data.porate).ToString() + "%");
goodqtyrate.SetText(DecimalPointPercentCalculate(data.goodqtyrate).ToString() + "%");
workdt.SetText(CorrectionMonthDay(data.workdt, "yyyy-MM-dd"));
}
private void SetSliderData(CompleteInfo data)
{
SetSliderValue(Slider_eorate, 100f, PercentCalculate(data.eorate));
SetSliderValue(Slider_pvp, 100f, PercentCalculate(data.pvp));
SetSliderValue(Slider_planqty, PercentCalculate(data.planqty), PercentCalculate(data.planqty));
SetSliderValue(Slider_goalqty, PercentCalculate(data.planqty), PercentCalculate(data.goalqty));
//SetSliderValue(Slider_goalqty, PercentCalculate(data.planqty), PercentCalculate(data.goalqty));
SetSliderValue(Slider_workqty, PercentCalculate(data.planqty), PercentCalculate(data.workqty));
SetSliderValue(Slider_goodqty, PercentCalculate(data.planqty), PercentCalculate(data.goodqty));
SetSliderValue(Slider_badqty, PercentCalculate(data.planqty), PercentCalculate(data.badqty));
SetSliderValue(Slider_badrate, 100f, DecimalPointPercentCalculate(data.badrate));
SetSliderValue(Slider_efficiency, 100f, DecimalPointPercentCalculate(data.efficiency));
//SetSliderValue(Slider_efficiency, 100f, DecimalPointPercentCalculate(data.efficiency));
SetSliderValue(Slider_progressrate, 100f, DecimalPointPercentCalculate(data.progressrate));
SetSliderValue(Slider_porate, 100f, PercentCalculate(data.porate));
//SetSliderValue(Slider_porate, 100f, PercentCalculate(data.porate));
SetSliderValue(Slider_goodqtyrate, 100f, DecimalPointPercentCalculate(data.goodqtyrate));
}
private string SetNameData(string value, string machineName)
@@ -191,9 +191,14 @@ namespace Samkwang
}
private string SetTextData(string value)
{
if (value == string.Empty || value == null)
if (string.IsNullOrEmpty(value))
{
return "-";
return "--";
}
if (float.TryParse(value, out var floatValue))
{
return floatValue.ToString("N0");
}
return value;
}

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

@@ -26,10 +26,10 @@ namespace Samkwang
private Image Default_Alarm;
private Image Expand_Alarm;
private TMP_Text eorate;
//private TMP_Text eorate;
private TMP_Text pvp;
private TMP_Text workcd;
private TMP_Text porate;
//private TMP_Text porate;
private TMP_Text goodqtyrate;
private TMP_Text workdt;
private TMP_Text wordno;
@@ -55,10 +55,10 @@ namespace Samkwang
Default_Alarm = imageDict.GetOrNull(nameof(Default_Alarm));
Expand_Alarm = imageDict.GetOrNull(nameof(Expand_Alarm));
eorate = textDict.GetOrNull(nameof(eorate));
//eorate = textDict.GetOrNull(nameof(eorate));
pvp = textDict.GetOrNull(nameof(pvp));
workcd = textDict.GetOrNull(nameof(workcd));
porate = textDict.GetOrNull(nameof(porate));
//porate = textDict.GetOrNull(nameof(porate));
goodqtyrate = textDict.GetOrNull(nameof(goodqtyrate));
workdt = textDict.GetOrNull(nameof(workdt));
wordno = textDict.GetOrNull(nameof(wordno));
@@ -68,11 +68,11 @@ namespace Samkwang
{
this.data = data;
eorate.SetText(PercentCalculate(data.eorate).ToString() + "%");
//eorate.SetText(PercentCalculate(data.eorate).ToString() + "%");
pvp.SetText(PercentCalculate(data.pvp).ToString() + "%");
workcd.SetText(SetTextData(data.workcd));
goodqtyrate.SetText(DecimalPointPercentCalculate(data.goodqtyrate).ToString() + "%");
porate.SetText(PercentCalculate(data.porate).ToString() + "%");
//porate.SetText(PercentCalculate(data.porate).ToString() + "%");
workdt.SetText(CorrectionTime(data.workdt, "yyyy-MM-dd"));
wordno.SetText(SetTextData(data.wordno));

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);

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

@@ -14,12 +14,12 @@ 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;
public TextMeshProUGUI efficiency;
public TextMeshProUGUI goaltime;
//public TextMeshProUGUI efficiency;
//public TextMeshProUGUI goaltime;
public TextMeshProUGUI cumulative;
public TextMeshProUGUI Text_H1;
public TextMeshProUGUI H1WORKQTY;
@@ -40,12 +40,12 @@ 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));
efficiency = textDict.GetOrNull(nameof(efficiency));
goaltime = textDict.GetOrNull(nameof(goaltime));
//efficiency = textDict.GetOrNull(nameof(efficiency));
//goaltime = textDict.GetOrNull(nameof(goaltime));
cumulative = textDict.GetOrNull(nameof(cumulative));
Text_H1 = textDict.GetOrNull(nameof(Text_H1));
@@ -77,14 +77,14 @@ namespace Samkwang
itemcd.SetText(SetTextData(completeInfo.itemcd));
itemdesc.SetText(SetTextData(completeInfo.itemdesc));
wordno.SetText(SetTextData(completeInfo.wordno));
goaltime.SetText(CalculateDate(currentTime, completeInfo.sttm));
//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));
efficiency.SetText(RoundToFloatData(completeInfo.efficiency));
//efficiency.SetText(RoundToFloatData(completeInfo.efficiency));
SetStatusImageResize();
}

48
Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -33,28 +33,28 @@ MonoBehaviour:
m_Settings:
m_SettingsList:
m_List:
- rid: 9217628533097234524
- rid: 9217628533097234525
- rid: 9217628575589204060
- rid: 9217628575589204061
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 9217628533097234526
- rid: 9217628533097234527
- rid: 9217628575589204062
- rid: 9217628575589204063
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 9217628533097234528
- rid: 9217628533097234529
- rid: 9217628533097234530
- rid: 9217628533097234531
- rid: 9217628533097234532
- rid: 9217628533097234533
- rid: 9217628575589204064
- rid: 9217628575589204065
- rid: 9217628575589204066
- rid: 9217628575589204067
- rid: 9217628575589204068
- rid: 9217628575589204069
- rid: 6852985685364965392
- rid: 9217628533097234534
- rid: 9217628575589204070
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 2598567180278956032
- rid: 9217628533097234535
- rid: 9217628575589204071
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: 9217628575589204060
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: 9217628575589204061
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: 9217628575589204062
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: 9217628575589204063
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: 9217628575589204064
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: 9217628575589204065
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: 9217628575589204066
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: 9217628575589204067
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 9217628533097234532
- rid: 9217628575589204068
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: 9217628575589204069
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: 9217628575589204070
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: 9217628575589204071
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}