설비 KPI 오류 수정 및 애니메이션 속도 조정, 라이브러리 강조 효과 변경 및 UI 수정

This commit is contained in:
정영민
2025-03-28 11:15:57 +09:00
parent 2c3d7a4149
commit 73522c6e4a
6 changed files with 1382 additions and 1292 deletions

View File

@@ -66,6 +66,7 @@ namespace CHN
var machinePos = machine.centerPos;
machine.machineKPI.transform.position = new Vector3(machinePos.x, machinePos.y + defaultNameHeight, machinePos.z);
matchingMachines.Add(machine);
machine.SetAnimationSpeed();
}
}
}
@@ -114,7 +115,7 @@ namespace CHN
}
void RangeDetection()
{
var layerMask = LayerMask.GetMask("Camera", "Floor Wall", "Floor Ground");
var layerMask = LayerMask.GetMask("Camera", "Floor Wall");
var currentFloor = FindSingle<Building>().currentFloor;
var max = cam.option.maxDistance - cam.option.minDistance;
@@ -127,12 +128,10 @@ namespace CHN
{
if (machine.GetComponentInParent<Floor>() != currentFloor)
{
machine.machineKPI.SetActive(false);
continue;
}
MachineKPIsActive(machine, layerMask);
var machineKPI = machine.machineKPI;
machineKPI.transform.localScale = originScale * distanceScale;
}
@@ -149,7 +148,7 @@ namespace CHN
}
void MachineKPIsActive(Machine machine, LayerMask layerMask)
{
var dir = cam.camera.transform.localPosition - machine.centerPos;
var dir = cam.camera.transform.position - machine.centerPos;
var hit = new RaycastHit();
if (Physics.Raycast(machine.centerPos, dir, out hit, Mathf.Infinity, layerMask))
@@ -159,9 +158,13 @@ namespace CHN
if (hitCameraLayer)
{
if (!IsScreenRange(machine))
return;
machine.machineKPI.Active();
{
machine.machineKPI.Deactive();
}
else
{
machine.machineKPI.Active();
}
}
else
{

View File

@@ -9,6 +9,7 @@ using System;
public class UI_MachineKPI : UIBase, IPointerClickHandler
{
public KPIData data;
public RectTransform DefaultKPI;
public RectTransform DetailsKPI;
@@ -26,6 +27,7 @@ public class UI_MachineKPI : UIBase, IPointerClickHandler
public void SetData(KPIData kpiData)
{
data = kpiData;
eorate = DecimalPointCalculate(kpiData.eorate);
Default_eorate.SetText(eorate.ToString());