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

천장 오브젝트 복원 및 설비 시간 알람 로딩 바 추가

Browse Source
This commit is contained in:
정영민
2025-03-25 16:07:18 +09:00
parent 6c89a57518
commit 7db641199a
16 changed files with 33731 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scripts/Building.cs
View File

@@ -101,9 +101,6 @@ namespace CHN
{
SetAllFloorExternalState();
if (!controller.option.isFirstPersonView)
return;
currentFloor.SetInternalState();
}

6
Assets/Scripts/EventConnecter.cs
View File

@@ -87,6 +87,7 @@ namespace CHN
datamanager.onSimpleInfo += popupCanvas.SimpleView;
datamanager.onCompleteInfo += popupCanvas.DetailView;
mqttManager.onNotloadData += popupCanvas.panel_completealramhistory.ActiveLoadingImage;
mqttManager.onMachineData += datamanager.MachineMatching;
mqttManager.onMachineData += completeTimeManager.SetCurrentData;
mqttManager.onMachineData += productionStatusManager.SetFloorProductionStatus;
@@ -121,11 +122,6 @@ namespace CHN
optionManager.LoadOption();
}
public override void AfterStart()
{
controller.onCameraMove += building.UnderCeilingControl;
}
private void ExitProgram()
{
var mqtt = FindSingle<MQTT>();

15
Assets/Scripts/Floor.cs
View File

@@ -15,7 +15,7 @@ namespace CHN
public GameObject Outer;
public GameObject TopSurfaces;
public GameObject FloorGroundCollider;
//public GameObject Ceiling;
public GameObject Ceiling;
public GameObject VisualizationAreas;
Transform CeilingQuad;
@@ -33,9 +33,9 @@ namespace CHN
case nameof(FloorGroundCollider):
FloorGroundCollider = transform.GetChild(i).gameObject;
break;
//case nameof(Ceiling):
// Ceiling = transform.GetChild(i).gameObject;
// break;
case nameof(Ceiling):
Ceiling = transform.GetChild(i).gameObject;
break;
case nameof(VisualizationAreas):
VisualizationAreas = transform.GetChild(i).gameObject;
break;
@@ -62,14 +62,14 @@ namespace CHN
public void SetInternalState()
{
//Ceiling.SetActive(true);
Ceiling.SetActive(true);
TopSurfaces.SetActive(false);
}
public void SetExternalState()
{
TopSurfaces.SetActive(false);
//Ceiling.SetActive(false);
Ceiling.SetActive(false);
}
public void UnderCeilingControl(Vector3 pos)
@@ -77,9 +77,10 @@ namespace CHN
//if (Ceiling == null)
// return;
//float height = CeilingQuad.transform.position.y - ceilingActiveRange;
//float height = Ceiling.transform.position.y - ceilingActiveRange;
//bool isUnder = pos.y < height;
//Debug.Log(isUnder);
//Ceiling.SetActive(isUnder);
}
}

5
Assets/Scripts/MQTT.cs
View File

@@ -24,8 +24,13 @@ public class MQTT : Protocol, ISingle, IOptionable
private int portData;
private string[] subscriptionTopics;
public event Action<bool> onNotloadData;
public event Action<List<CompleteInfo>> onMachineData;
public event Action<List<WorkShopInfo>> onWorkshopData;
public void Awake()
{
onNotloadData?.Invoke(true);
}
public void Start()
{
MQTTConnect();

8
Assets/Scripts/UI/Panel_CompleteAlramHistory.cs
View File

@@ -13,6 +13,7 @@ namespace CHN
public UI_CompleteTimeAlarmInfo prefab_completeTimeAlarmInfo;
public ScrollRect ScrollView_CompleteAlramHistory;
public Button Button_Close;
public Image Image_Loading;
public Dictionary<string, UI_CompleteTimeAlarmInfo> completeInfoList = new();
public List<UI_CompleteTimeAlarmInfo> notCheckAlramList = new();
@@ -45,8 +46,15 @@ namespace CHN
{
onDashobardClose?.Invoke("완료 시간 알람");
}
public void ActiveLoadingImage(bool isActive)
{
var active = isActive ? false : true;
Image_Loading.gameObject.SetActive(active);
}
public void SetAlarmInfoItems(List<CompleteTimeAlarmData> infos)
{
ActiveLoadingImage(true);
for (int i = 0; i < infos.Count; i++)
{
if (completeInfoList.ContainsKey(infos[i].completeInfo.worknm))