diff --git a/Assets/Plugins/XRLib/GenericController/Orbital/OrbitalController.cs b/Assets/Plugins/XRLib/GenericController/Orbital/OrbitalController.cs index a2dca5c4..db640fce 100644 --- a/Assets/Plugins/XRLib/GenericController/Orbital/OrbitalController.cs +++ b/Assets/Plugins/XRLib/GenericController/Orbital/OrbitalController.cs @@ -392,10 +392,11 @@ namespace WI public void CameraTopView() { var saveData = saveTargetPositions[ViewMode.TopView]; - option.maxDistance = 35f; + option.maxDistance = 50f; if (saveData == null) { + nextPosition = new Vector3(4f, 21.9f, 1f); option.currentElevation = 90f; option.currentDistance = 35f; option.currentAzimuth = 0f; @@ -432,6 +433,7 @@ namespace WI if (saveData == null) { + nextPosition = option.originTargetPos; option.currentDistance = option.originDistance; option.currentAzimuth = option.originAzimuth; option.currentElevation = option.originElevation; @@ -494,7 +496,6 @@ namespace WI var cameraData = saveTargetPositions[currentViewMode]; nextPosition = new Vector3(cameraData.x, cameraData.y, cameraData.z); - Debug.Log(nextPosition); option.currentDistance = cameraData.distance; option.currentAzimuth = cameraData.azimuth; option.currentElevation = cameraData.elevation; diff --git a/Assets/Scripts/EventConnecter.cs b/Assets/Scripts/EventConnecter.cs index 1418e488..700fa418 100644 --- a/Assets/Scripts/EventConnecter.cs +++ b/Assets/Scripts/EventConnecter.cs @@ -160,6 +160,14 @@ namespace CHN building.SetCurrentFloorInternalState(); + var raycaster = FindSingle(); + + if (raycaster.hitFloorIndex != building.currentFloor.floorIndex) + { + var slider = FindSingle().panel_floorcontrol; + slider.ChangeValueFromOutside(raycaster.hitFloorIndex); + } + var pos = controller.option.target.position; if (building.currentFloor.FloorContainsPoint(pos)) diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index 2996a0eb..137e0e85 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -1360,7 +1360,7 @@ "sttm": "0814", "totm": "", "goaltime": "500", - "ptotm": "2025-03-20 17:14:35", + "ptotm": "2025-03-20 18:27:04", "psttm": "2025-03-17 08:14:33" }, "isCheck": false @@ -1622,7 +1622,7 @@ "worknm": "Injector No.16", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24298739", "itemdesc": "BAFFLE ASM-FRT DIFF CARR", "pjtcd": "GF9", @@ -1727,7 +1727,7 @@ "worknm": "가공반-1", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "계획정지", "itemcd": "55354247", "itemdesc": "COVER ASM-TMG BELT RR", "pjtcd": "GEN3",