Merge pull request '[정영민] 층 조절 기능 추가 및 아이콘 오류 수정' (#9) from jym/260318_00 into main

Reviewed-on: http://xr.flexing.ai:3000/UVCXR/AZTECH_WB/pulls/9
2026-03-20 12:47:36 +09:00
parent a616d03af6 81ba9de085
commit 54df887265
20 changed files with 201343 additions and 21144 deletions
--- a/AZTECH_WB.slnx
+++ b/AZTECH_WB.slnx
@@ -1,6 +1,6 @@
 <Solution>
-  <Project Path="Assembly-CSharp.csproj" />
  <Project Path="com.Tivadar.Best.HTTP.csproj" />
+  <Project Path="Assembly-CSharp.csproj" />
  <Project Path="RenderHeads.AVProMovieCapture.Demos.csproj" />
  <Project Path="com.Tivadar.Best.MQTT.csproj" />
  <Project Path="RenderHeads.AVProMovieCapture.Runtime.csproj" />
--- a/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_active.png
+++ b/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_active.png
--- a/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_auto_off.png
+++ b/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_auto_off.png
--- a/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_auto_off.png.meta
+++ b/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_auto_off.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9074fab59981e24ea177f1361c7dd5f
+guid: 47452ffd3407fe84e85c351bb0562dd0
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_auto_on.png
+++ b/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_auto_on.png
--- a/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_deactive.png.meta
+++ b/Assets/DownloadAssets/XRLib/Resources/Prefabs/UI/Toolbar/images/ic_floor_deactive.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9458e5537061e7945a771b442a1d3413
+guid: 11b6b022a11e1f64e878ad708ab2309f
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/Scenes/아즈텍_Main.unity
+++ b/Assets/Scenes/아즈텍_Main.unity
--- a/Assets/Scripts/Camera/OrbitalController.cs
+++ b/Assets/Scripts/Camera/OrbitalController.cs
@@ -122,9 +122,9 @@ namespace AZTECHWB
            perspectiveState.pivotRotation = originRotation;

            orthoState.elevation = 90f;
-            orthoState.distance = originValue.y;
-            orthoState.azimuth = 0f;
-            orthoState.pivotPosition = Vector3.zero;
+            orthoState.distance = 55f;
+            orthoState.azimuth = 180f;
+            orthoState.pivotPosition = new Vector3(-37.5f, cameraPivot.transform.position.y, 32f);
            orthoState.pivotRotation = originRotation;
            SetViewMode(ViewMode.PerspectiveView);
        }
@@ -164,7 +164,10 @@ namespace AZTECHWB
            if (boundery == null)
                return true;

-            return boundery.bounds.Contains(camera.transform.position);
+            var checkingBounds = boundery.bounds;
+            checkingBounds.size = checkingBounds.size + new Vector3(10,10,10);
+            
+            return checkingBounds.Contains(camera.transform.position);
        }

        private void Move()
@@ -303,10 +306,10 @@ namespace AZTECHWB
                    break;

                case ViewMode.TopView:
-                    orthoState.elevation = 90f; // 90 or <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                    orthoState.distance = 60f;
-                    orthoState.azimuth = 0f;
-                    orthoState.pivotPosition = Vector3.zero;
+                    orthoState.elevation = 90f;
+                    orthoState.distance = 55f;
+                    orthoState.azimuth = 180f;
+                    orthoState.pivotPosition = new Vector3(-37.5f, cameraPivot.transform.position.y, 32f);
                    break;
            }
        }
--- a/Assets/Scripts/Command/ScreenHistoryCommand/ScreenResetCommand.cs
+++ b/Assets/Scripts/Command/ScreenHistoryCommand/ScreenResetCommand.cs
@@ -15,8 +15,8 @@ namespace AZTECHWB.Command
            var raycaster = AZTECHSceneMain.Instance.GetManager<Raycaster>();
            raycaster.SetInteractable(false);

-            //var building = AZTECHSceneMain.Instance.building;
-            //building.ActiveRoof(true);
+            var building = AZTECHSceneMain.Instance.building;
+            building.SetActiveEmptyFloor(true);

            var machineStatusItemManager = AZTECHSceneMain.Instance.GetManager<MachineStatusItemManager>();
            machineStatusItemManager.SetActiveIcons(false);
--- a/Assets/Scripts/Manager/MachineStatusItemManager.cs
+++ b/Assets/Scripts/Manager/MachineStatusItemManager.cs
@@ -4,7 +4,6 @@ using AZTECHWB.Core;
 using AZTECHWB.Extensions;
 using Cysharp.Threading.Tasks;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;

 namespace AZTECHWB.Management
@@ -68,7 +67,7 @@ namespace AZTECHWB.Management

            foreach (var machineIcon in machineIcons.Values)
            {
-                machineIcon.gameObject.SetActive(isActive);
+                machineIcon.Deactive();
            }
        }

@@ -94,7 +93,7 @@ namespace AZTECHWB.Management
                machineIcon.onClickIcon += OnClickMachineKPI;

                machineIcons.Add(data.worknm, machineIcon);
-                machineIcon.gameObject.SetActive(false);
+                machineIcon.Deactive();

                machine.machineStatusItem = machineIcon;
                iconToMachines.Add(machineIcon, machine);
@@ -175,25 +174,25 @@ namespace AZTECHWB.Management
                Vector3 screenPos = controller.Camera.WorldToScreenPoint(label.targetTransform.position + worldOffset);
                if (screenPos.z < 0)
                {
-                    label.gameObject.SetActive(false);
+                    label.Deactive();
                    continue;
                }

                // 화면 이탈 체크
                if (!IsOnScreen(label.screenPosition))
                {
-                    label.gameObject.SetActive(false);
+                    label.Deactive();
                    continue;
                }

                // 특정 레이어에 가려짐 체크
                if (IsOccluded(label.targetTransform.position))
                {
-                    label.gameObject.SetActive(false);
+                    label.Deactive();
                    continue;
                }

-                label.gameObject.SetActive(true);
+                label.Active();
            }
        }

--- a/Assets/Scripts/Object/Building.cs
+++ b/Assets/Scripts/Object/Building.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using AZTECHWB.Core;
+using Unity.Collections;
 using UnityEngine;

 namespace AZTECHWB
@@ -9,12 +10,10 @@ namespace AZTECHWB
    {
        public List<Floor> floorList = new List<Floor>();
        public List<Machine> machineList = new List<Machine>();
-        public Roof roof;
        public bool isOnlyMachineFloorsEnabled;
+        public bool isAutoActiveFloor;
        public void Init()
        {
-            roof = transform.GetComponentInChildren<Roof>(true);
-
            machineList.Clear();
            floorList.Clear();

@@ -30,26 +29,39 @@ namespace AZTECHWB
            {
                floorList.Add(floor[i]);
            }
+
+            isAutoActiveFloor=  true;
        }

-        private void LateUpdate()
+        private void Update()
        {
+            if (!isAutoActiveFloor)
+                return;
+
            if (AZTECHAppMain.Instance.cameraController == null)
                return;

            var cam = AZTECHAppMain.Instance.cameraController;
-            isOnlyMachineFloorsEnabled = cam.IsCameraInsideBoundary() && cam.Camera.transform.localPosition.y < 20f ? true : false;
+            isOnlyMachineFloorsEnabled = cam.IsCameraInsideBoundary();

-            foreach(var floor in floorList)
+            var equipmentInFloor = floorList.FirstOrDefault(f => !f.isEmptyFloor);
+            equipmentInFloor.gameObject.SetActive(isOnlyMachineFloorsEnabled);
+
+            var emptyFloor = floorList.FirstOrDefault(f => f.isEmptyFloor);
+            emptyFloor.gameObject.SetActive(!isOnlyMachineFloorsEnabled);
+        }
+        public void SetActiveEmptyFloor(bool isOn)
+        {
+            isAutoActiveFloor = isOn;
+
+            if (!isAutoActiveFloor)
            {
-                if (floor.isEmptyFloor)
-                {
-                    floor.gameObject.SetActive(!isOnlyMachineFloorsEnabled);
-                }
-                else
-                {
-                    floor.gameObject.SetActive(isOnlyMachineFloorsEnabled);
-                }
+                var equipmentInFloor = floorList.FirstOrDefault(f => !f.isEmptyFloor);
+                equipmentInFloor.gameObject.SetActive(true);
+                isOnlyMachineFloorsEnabled = true;
+
+                var emptyFloor = floorList.FirstOrDefault(f => f.isEmptyFloor);
+                emptyFloor.gameObject.SetActive(false);
            }
        }
    }
--- a/Assets/Scripts/Object/Machine.cs
+++ b/Assets/Scripts/Object/Machine.cs
@@ -6,12 +6,10 @@ namespace AZTECHWB
 {
    public class Machine : MonoBehaviour
    {
-        private Dictionary<Component, MeshRenderer[]> meshGroupCache = new();
-
        public MachineStatusItem machineStatusItem;
        public string machineName;

-        private bool isAlarmActive;
+        //private bool isAlarmActive;

        public string[] typeOptions;
        public Sprite previewImage;
@@ -25,10 +23,10 @@ namespace AZTECHWB
        {
            centerPos = transform.GetMeshCenter();
        }
-        public void SetAlarm(string state)
-        {
-            isAlarmActive = state == "SET" ? true : false;
-        }
+        // public void SetAlarm(string state)
+        // {
+        //     isAlarmActive = state == "SET" ? true : false;
+        // }
    }
 }

--- a/Assets/Scripts/Object/Roof.cs
+++ b/Assets/Scripts/Object/Roof.cs
@@ -1,6 +0,0 @@
-using UnityEngine;
-
-public class Roof : MonoBehaviour
-{
-
-}
--- a/Assets/Scripts/Object/Roof.cs.meta
+++ b/Assets/Scripts/Object/Roof.cs.meta
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 6e093f998e1d5444794dfffc794ae664
--- a/Assets/Scripts/Object/WarningLight.cs
+++ b/Assets/Scripts/Object/WarningLight.cs
@@ -1,39 +0,0 @@
-using UnityEngine;
-
-public class WarningLight : MonoBehaviour
-{
-    public Transform currentLight;
-
-    public Transform RedLight;
-    public Transform YellowLight;
-    public Transform GreenLight;
-    
-
-    private void Awake()
-    {
-        RedLight = transform.Find("WarningLightRed").GetChild(0);
-        YellowLight = transform.Find("WarningLightYellow").GetChild(0);
-        GreenLight = transform.Find("WarningLightGreen").GetChild(0);
-    }
-    public void SetCurrentLight(Transform light)
-    {
-        if (currentLight != light && currentLight != null)
-        {
-            currentLight.gameObject.SetActive(false);
-        }
-        currentLight = light;
-        currentLight.gameObject.SetActive(true);
-    }
-    public void SetYellowLightActive()
-    {
-        SetCurrentLight(YellowLight);
-    }
-    public void SetGreenLightActvie()
-    {
-        SetCurrentLight(GreenLight);
-    }
-    public void SetRedLightActvie()
-    {
-        SetCurrentLight(RedLight);
-    }
-}
--- a/Assets/Scripts/Object/WarningLight.cs.meta
+++ b/Assets/Scripts/Object/WarningLight.cs.meta
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 032807d483d94f44fae2eca28705557f
--- a/Assets/Scripts/UI/LeftSidePanel/LeftSidePanel.cs
+++ b/Assets/Scripts/UI/LeftSidePanel/LeftSidePanel.cs
@@ -101,14 +101,14 @@ namespace AZTECHWB.UI
                "설비 요약 정보 UI를 활성화/비활성화 합니다.");

            toolbarModel.AddToggleButton("button_floor_control", true,
-                "Prefabs/UI/Toolbar/images/ic_floor_active",
-                "Prefabs/UI/Toolbar/images/ic_floor_deactive",
+                "Prefabs/UI/Toolbar/images/ic_floor_auto_on",
+                "Prefabs/UI/Toolbar/images/ic_floor_auto_off",
                (isSelected) =>
                {
-                    //AZTECHSceneMain.Instance.building.ActiveRoof(isSelected);
+                    AZTECHSceneMain.Instance.building.SetActiveEmptyFloor(isSelected);
                },
                null,
-                "설비가 있는 층을 제외한 층을 활성화/비활성화 합니다.");
+                "층 자동 전환 기능 및 설비가 있는 층을 제외한 층을 활성화/비활성화 합니다.");

            // --- 툴바 모델 구성 끝 ---
            toolbar.SetData(toolbarModel);
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset
@@ -63,7 +63,21 @@ MonoBehaviour:
      - rid: 8987682325826371591
      - rid: 8987682325826371592
    m_RuntimeSettings:
-      m_List: []
+      m_List:
+      - rid: 6852985685364965378
+      - rid: 6852985685364965379
+      - rid: 6852985685364965380
+      - rid: 6852985685364965381
+      - rid: 6852985685364965384
+      - rid: 6852985685364965385
+      - rid: 6852985685364965392
+      - rid: 6852985685364965394
+      - rid: 8712630790384254976
+      - rid: 8987682325826371585
+      - rid: 8987682325826371587
+      - rid: 8987682325826371588
+      - rid: 8987682325826371591
+      - rid: 8987682325826371592
  m_AssetVersion: 8
  m_ObsoleteDefaultVolumeProfile: {fileID: 0}
  m_RenderingLayerNames:
--- a/Option.ini
+++ b/Option.ini
@@ -2,13 +2,13 @@
 Resolution=1920x1080
 ScreenMode=0
 Texture=0
-Shadow=1
+Shadow=3
 AA=2
 VSync=1
 AF=0

 [Control]
-MoveSpeed=5
+MoveSpeed=10
 RotateSpeed=30
 ZoomSpeed=50

--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,8 +6,8 @@ EditorBuildSettings:
  serializedVersion: 2
  m_Scenes:
  - enabled: 1
-    path: "Assets/Scenes/\uC544\uC988\uD14D.unity"
-    guid: adf7868fe2293284783fb7f2a85d7258
+    path: "Assets/Scenes/\uC544\uC988\uD14D_Main.unity"
+    guid: d1c01efad02c2d04ab6b0ea993da6fb8
  m_configObjects:
    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
  m_UseUCBPForAssetBundles: 0