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

작업 시간 분석, 조건 분석 UI 기능 개선

Browse Source
This commit is contained in:
정영민
2025-03-20 18:43:00 +09:00
parent b1f531d314
commit e5eaa72d7d
7 changed files with 240 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Assets/Font/NanumGothicBold SDF.asset
View File

File diff suppressed because one or more lines are too long

216
Assets/Scenes/Main.unity
View File

@@ -66920,7 +66920,7 @@ RectTransform:
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: 39.7, y: -444.3}
m_AnchoredPosition: {x: 34.1, y: -449}
m_SizeDelta: {x: 87.5, y: 87.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &138246215
@@ -110304,108 +110304,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 304741596}
m_CullTransparentMesh: 1
--- !u!1 &304754004
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 304754005}
- component: {fileID: 304754008}
- component: {fileID: 304754007}
- component: {fileID: 304754006}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &304754005
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 304754004}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1583486217}
m_Father: {fileID: 8993453308749756956}
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: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &304754006
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 304754004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &304754007
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 304754004}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &304754008
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 304754004}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!4 &304933094 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5833450743008650472, guid: 8a492aeaab6f6dc4d88a122eccfa8695,
@@ -124862,6 +124760,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
barChart: {fileID: 0}
fadeTime: 1
--- !u!4 &362914614 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d9135b3281363c74f9622b60dfe9d67f,
@@ -210763,7 +210662,7 @@ RectTransform:
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: 39.7, y: -444.3}
m_AnchoredPosition: {x: 34.1, y: -449}
m_SizeDelta: {x: 87.5, y: 87.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &697897250
@@ -439989,81 +439888,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b6fb23e8e8140a74ea7cd160312cd108, type: 3}
--- !u!1 &1583486216
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1583486217}
- component: {fileID: 1583486219}
- component: {fileID: 1583486218}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1583486217
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583486216}
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: 304754005}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1583486218
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583486216}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: ca0f452f21b53014e8c8b98dde9b2a6c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1583486219
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1583486216}
m_CullTransparentMesh: 1
--- !u!4 &1583524713 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d9135b3281363c74f9622b60dfe9d67f,
@@ -566718,6 +566542,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d294a0bafad3fd84a8f70306778167ec, type: 3}
m_Name:
m_EditorClassIdentifier:
activeCount: 0
--- !u!114 &2077985448
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -586567,6 +586392,31 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 883006602906283311}
m_Modifications:
- target: {fileID: 2824991248714906716, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2824991248714906716, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5445336235382705009, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5445336235382705009, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5445336235382705009, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8012176388321684954, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_Pivot.x
@@ -586672,6 +586522,11 @@ PrefabInstance:
propertyPath: m_Name
value: Panel_InjectionProduction
objectReference: {fileID: 0}
- target: {fileID: 8587743779671195833, guid: 58b52bb498791ed40bfa7aff20e1f0e4,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -587418,6 +587273,8 @@ MonoBehaviour:
count:
rows: []
remark:
effect: {fileID: 0}
fadeTime: 1
--- !u!222 &3328429613808264986
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -592258,7 +592115,6 @@ Transform:
- {fileID: 883006602906283311}
- {fileID: 2814303991191466808}
- {fileID: 4777910217330488538}
- {fileID: 304754005}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9077544614072761896

37
Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs
View File

@@ -41,13 +41,16 @@ namespace CHN
public WorkConditionsData data;
public Action<string> onClose;
public Panel_Effect effect;
public float fadeTime;
public override void AfterAwake()
{
ui_Calendar = transform.GetComponentInChildren<UI_Calendar>(true);
mainChart = transform.GetComponentInChildren<UI_GraphChart>();
subCharts = SubCharts.GetComponentsInChildren<UI_GraphChart>();
Button_Close.onClick.AddListener(Close);
Button_Close.onClick.AddListener(OnClickCloseButton);
Button_StartDay.onClick.AddListener(OnClickStartDayBtn);
Button_EndDay.onClick.AddListener(OnClickEndDayBtn);
Button_Search.onClick.AddListener(OnClickSearchBtn);
@@ -58,9 +61,24 @@ namespace CHN
Text_EndDay.text = DateTime.Now.ToString("yyyy-MM-dd");
ChartDatas.gameObject.SetActive(false);
SetActive(false);
gameObject.transform.localScale = Vector3.zero;
}
public void Open()
{
effect.ActivePanel(gameObject);
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
StopAllCoroutines();
StartCoroutine(ScaleUp());
}
public void Close()
{
effect.DeactivePanel(gameObject);
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;
}
public void OnClickCloseButton()
{
onClose?.Invoke("작업 조건 분석");
}
@@ -177,6 +195,21 @@ namespace CHN
var optionName = Dropdown_DataColumn.options[arg0].text;
onChangedDropdownValue?.Invoke(optionName);
}
IEnumerator ScaleUp()
{
float timer = 0f;
float percent = 0f;
while (percent < 1)
{
timer += Time.deltaTime;
percent = timer / fadeTime;
transform.localScale = Vector3.Lerp(transform.localScale, Vector3.one, percent);
yield return null;
}
}
}
}

39
Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs
View File

@@ -23,15 +23,18 @@ namespace CHN
private UI_Calendar ui_Calendar;
private RectTransform ChartData;
public UI_BarChart barChart;
private Panel_Effect effect;
public Action<string, string, string, string> onSearchData;
public Action<string> onClose;
public float fadeTime;
public override void AfterAwake()
{
ui_Calendar = transform.GetComponentInChildren<UI_Calendar>(true);
barChart = transform.GetComponentInChildren<UI_BarChart>();
Button_Close.onClick.AddListener(Close);
Button_Close.onClick.AddListener(OnClickCloseButton);
Button_StartDay.onClick.AddListener(OnClickStartDayBtn);
Button_EndDay.onClick.AddListener(OnClickEndDayBtn);
Button_Search.onClick.AddListener(OnClickSearchBtn);
@@ -42,9 +45,25 @@ namespace CHN
Text_EndDay.text = DateTime.Now.ToString("yyyy-MM-dd");
ChartData.gameObject.SetActive(false);
SetActive(false);
gameObject.transform.localScale = Vector3.zero;
}
public void Open()
{
effect.ActivePanel(gameObject);
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
StopAllCoroutines();
StartCoroutine(ScaleUp());
}
public void Close()
{
effect.DeactivePanel(gameObject);
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;
}
public void OnClickCloseButton()
{
onClose?.Invoke("ÀÛ¾÷ ½Ã°£ ºÐ¼®");
}
@@ -97,6 +116,22 @@ namespace CHN
barChart.SetChartData(barChartData);
}
IEnumerator ScaleUp()
{
float timer = 0f;
float percent = 0f;
while (percent < 1)
{
timer += Time.deltaTime;
percent = timer / fadeTime;
transform.localScale = Vector3.Lerp(transform.localScale, Vector3.one, percent);
yield return null;
}
}
}
}

1
Assets/WorkSpace/Personal/JYM/UI_DashboardCheckListBox.cs
View File

@@ -39,7 +39,6 @@ namespace CHN
public void OnOpenDashboardItem(string dashboardKey)
{
Debug.Log("ÄÑÁü");
dashboardItemList[dashboardKey].ToggleOnItem();
}
public void OnCloseDashbordItem(string dashboardKey)

44
Assets/WorkSpace/Personal/JYM/UI_DashboardCheckListItem.cs
View File

@@ -67,24 +67,58 @@ namespace CHN
PlayerPrefs.SetInt(type, isOn ? 1 : 0);
PlayerPrefs.Save();
if (type != "isLibrary")
if (type == "isCompleteAlramHistory")
{
dashboardItem.gameObject.SetActive(isOn);
}
else
{
var library = dashboardItem.gameObject.GetComponent<Panel_Library>();
if (isOn)
{
library.Open();
OpenDashBoardItem(type);
}
else
{
library.Close();
CloseDashBoardItem(type);
}
}
}
private void OpenDashBoardItem(string type)
{
switch (type)
{
case "isLibrary":
var library = dashboardItem.GetComponent<Panel_Library>();
library.Open();
break;
case "isWorkConditionAnalysis":
var workConditionAnalysis = dashboardItem.GetComponent<Panel_WorkConditionAnalysis>();
workConditionAnalysis.Open();
break;
case "isWorkTimeAnalysis":
var workTimeAnalysis = dashboardItem.GetComponent<Panel_WorkTimeAnalysis>();
workTimeAnalysis.Open();
break;
}
}
private void CloseDashBoardItem(string type)
{
switch (type)
{
case "isLibrary":
var library = dashboardItem.GetComponent<Panel_Library>();
library.Close();
break;
case "isWorkConditionAnalysis":
var workConditionAnalysis = dashboardItem.GetComponent<Panel_WorkConditionAnalysis>();
workConditionAnalysis.Close();
break;
case "isWorkTimeAnalysis":
var workTimeAnalysis = dashboardItem.GetComponent<Panel_WorkTimeAnalysis>();
workTimeAnalysis.Close();
break;
}
}
private string Type()
{