건물, 카메라 오류 수정 및 작업 조건 분석 상세 정보 패널 단위 추가
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@@ -168,6 +168,10 @@ namespace CHN
|
|||||||
switch (mode)
|
switch (mode)
|
||||||
{
|
{
|
||||||
case ViewMode.PerspectiveView:
|
case ViewMode.PerspectiveView:
|
||||||
|
var perspectivePos = controller.option.target.position;
|
||||||
|
var floorStartPos = building.currentFloor.StartPoint.position;
|
||||||
|
controller.nextPosition = new Vector3(perspectivePos.x, floorStartPos.y, perspectivePos.z);
|
||||||
|
|
||||||
building.SetAllFloorExternalState();
|
building.SetAllFloorExternalState();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@@ -88,6 +88,9 @@ public class UI_GraphChart : UIBase, IPointerClickHandler
|
|||||||
|
|
||||||
AveValue.SetText(DecimalPointCalculate(ave));
|
AveValue.SetText(DecimalPointCalculate(ave));
|
||||||
|
|
||||||
|
graphChartData.Clear();
|
||||||
|
graphDateTimeData.Clear();
|
||||||
|
|
||||||
if (isMainChart)
|
if (isMainChart)
|
||||||
{
|
{
|
||||||
MinValue.SetText(DecimalPointCalculate(min));
|
MinValue.SetText(DecimalPointCalculate(min));
|
||||||
|
|||||||
@@ -27,7 +27,29 @@ public class UI_GraphChartData : UIBase, ISingle
|
|||||||
DateTime.SetText(dateTime);
|
DateTime.SetText(dateTime);
|
||||||
|
|
||||||
float truncatedFloat = Mathf.Floor(dataValue * 10f) / 10f;
|
float truncatedFloat = Mathf.Floor(dataValue * 10f) / 10f;
|
||||||
DataValue.SetText(truncatedFloat.ToString());
|
DataValue.SetText(SetUnit(dataName, truncatedFloat));
|
||||||
|
}
|
||||||
|
private string SetUnit(string dataName, float dataValue)
|
||||||
|
{
|
||||||
|
var value = "";
|
||||||
|
float truncatedFloat = Mathf.Floor(dataValue * 10f) / 10f;
|
||||||
|
|
||||||
|
switch (dataName)
|
||||||
|
{
|
||||||
|
case "보압 (Peak)":
|
||||||
|
value = truncatedFloat + " bar";
|
||||||
|
break;
|
||||||
|
case "주변 습도":
|
||||||
|
value = truncatedFloat + " %";
|
||||||
|
break;
|
||||||
|
case "주변 온도":
|
||||||
|
value = truncatedFloat + " °C";
|
||||||
|
break;
|
||||||
|
case "싸이클 타임":
|
||||||
|
value = truncatedFloat + " 초";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -38,9 +60,12 @@ public class UI_GraphChartData : UIBase, ISingle
|
|||||||
var parentSize = parentRectTransform.rect.size;
|
var parentSize = parentRectTransform.rect.size;
|
||||||
var uiSize = rectTransform.rect.size;
|
var uiSize = rectTransform.rect.size;
|
||||||
|
|
||||||
|
Vector2 localPoint;
|
||||||
|
RectTransformUtility.ScreenPointToLocalPointInRectangle(parentRectTransform, Input.mousePosition, null, out localPoint);
|
||||||
|
|
||||||
float clampedX = Mathf.Clamp(topPosition.x + offset.x, -parentSize.x / 2 + uiSize.x / 2, parentSize.x / 2 - uiSize.x / 2);
|
float clampedX = Mathf.Clamp(topPosition.x + offset.x, -parentSize.x / 2 + uiSize.x / 2, parentSize.x / 2 - uiSize.x / 2);
|
||||||
|
|
||||||
rectTransform.localPosition = new Vector2(clampedX, offset.y);
|
rectTransform.localPosition = new Vector2(clampedX, localPoint.y + offset.y);
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -467,7 +467,7 @@
|
|||||||
"worknm": "Injector No.14",
|
"worknm": "Injector No.14",
|
||||||
"workseq": "1",
|
"workseq": "1",
|
||||||
"status": "1",
|
"status": "1",
|
||||||
"statusnm": "가동중",
|
"statusnm": "비가동",
|
||||||
"itemcd": "24298738",
|
"itemcd": "24298738",
|
||||||
"itemdesc": "BAFFLE ASM-FRT DIFF CARR",
|
"itemdesc": "BAFFLE ASM-FRT DIFF CARR",
|
||||||
"pjtcd": "GF9",
|
"pjtcd": "GF9",
|
||||||
@@ -1465,7 +1465,7 @@
|
|||||||
"sttm": "1043",
|
"sttm": "1043",
|
||||||
"totm": "",
|
"totm": "",
|
||||||
"goaltime": "299",
|
"goaltime": "299",
|
||||||
"ptotm": "2025-04-07 13:51:27",
|
"ptotm": "2025-04-07 20:10:43",
|
||||||
"psttm": "2025-04-03 10:43:18"
|
"psttm": "2025-04-03 10:43:18"
|
||||||
},
|
},
|
||||||
"isCheck": false
|
"isCheck": false
|
||||||
@@ -1675,7 +1675,7 @@
|
|||||||
"sttm": "0905",
|
"sttm": "0905",
|
||||||
"totm": "",
|
"totm": "",
|
||||||
"goaltime": "111",
|
"goaltime": "111",
|
||||||
"ptotm": "2025-04-07 10:56:21",
|
"ptotm": "2025-04-07 18:55:02",
|
||||||
"psttm": "2025-04-07 09:05:21"
|
"psttm": "2025-04-07 09:05:21"
|
||||||
},
|
},
|
||||||
"isCheck": false
|
"isCheck": false
|
||||||
|
|||||||
Reference in New Issue
Block a user