diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Chunil_1F_Scene.unity b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Chunil_1F_Scene.unity index e695e2df..78694a03 100644 --- a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Chunil_1F_Scene.unity +++ b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Chunil_1F_Scene.unity @@ -40463,6 +40463,7 @@ GameObject: m_Component: - component: {fileID: 1621765805} - component: {fileID: 1621765806} + - component: {fileID: 1621765807} m_Layer: 0 m_Name: Root m_TagString: Untagged @@ -40508,6 +40509,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7ce9c81509504349ae7b675005a7e5e, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::ChunilENG.Building +--- !u!114 &1621765807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1621765804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3364ac7fbd47c0049b73d3079868c38b, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ChunilENG.Floor + index: 2 + startPoint: {fileID: 0} + Ceiling: {fileID: 0} --- !u!114 &1630380045 MonoBehaviour: m_ObjectHideFlags: 2 @@ -45278,6 +45294,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1812807480} + - component: {fileID: 1812807481} m_Layer: 0 m_Name: HideObject m_TagString: Untagged @@ -45304,6 +45321,18 @@ Transform: - {fileID: 777099223} m_Father: {fileID: 1621765805} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1812807481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812807479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35300cdb046010d49b2e2c44e000c969, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::SceneRoot --- !u!1001 &1815195918 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SystemScene.unity b/Assets/Scenes/SystemScene.unity index f6c8cd1b..6c4e3bbb 100644 --- a/Assets/Scenes/SystemScene.unity +++ b/Assets/Scenes/SystemScene.unity @@ -2553,7 +2553,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2487313445638238029, guid: 53dc99c47ad0b9b47a70382721cd50ac, type: 3} propertyPath: maxScale - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2487313445638238029, guid: 53dc99c47ad0b9b47a70382721cd50ac, type: 3} propertyPath: minScale diff --git a/Assets/Scripts/Camera/OrbitalController.cs b/Assets/Scripts/Camera/OrbitalController.cs index fef09782..6c25b19f 100644 --- a/Assets/Scripts/Camera/OrbitalController.cs +++ b/Assets/Scripts/Camera/OrbitalController.cs @@ -33,6 +33,8 @@ namespace OCTOPUS_TWIN private new Camera camera; + public Camera Camera { get { return camera; } } + public float moveSpeed; public float rotateSpeed; public float zoomSpeed; diff --git a/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs b/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs index 24839fa8..f6395c02 100644 --- a/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs +++ b/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs @@ -73,31 +73,31 @@ namespace ChunilENG private void SetSceneTableSetting() { - var findallRoots = FindObjectsByType(FindObjectsSortMode.None); - foreach (var item in findallRoots) - { - switch(item.floorType) - { - case FloorType.All: - sceneRootTable.Add("All", item.gameObject); - break; - case FloorType.FirstFloor: - sceneRootTable.Add("1F", item.gameObject); - break; - case FloorType.SecondFloor: - sceneRootTable.Add("2F", item.gameObject); - break; - } - } + //var findallRoots = FindObjectsByType(FindObjectsSortMode.None); + //foreach (var item in findallRoots) + //{ + // switch(item.floorType) + // { + // case FloorType.All: + // sceneRootTable.Add("All", item.gameObject); + // break; + // case FloorType.FirstFloor: + // sceneRootTable.Add("1F", item.gameObject); + // break; + // case FloorType.SecondFloor: + // sceneRootTable.Add("2F", item.gameObject); + // break; + // } + //} - foreach(var scene in sceneRootTable) - { - if(!scene.Key.Equals("1F")) - { - var root = scene.Value; - root.gameObject.SetActive(false); - } - } + //foreach(var scene in sceneRootTable) + //{ + // if(!scene.Key.Equals("1F")) + // { + // var root = scene.Value; + // root.gameObject.SetActive(false); + // } + //} } private readonly Dictionary managers = new(); diff --git a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs index 4389e070..b7cb1d97 100644 --- a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs +++ b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs @@ -38,7 +38,7 @@ namespace ChunilENG.Management cam = OctopusTwinAppMain.Instance.cameraController; // ��������: Start���� �� ���� ȣ���Ͽ� ij�� machineInfoItem = Resources.Load($"{ResourceURL.chunilENGUIPrefabFolderPath}{nameof(MachineInfoItem)}"); - // machines = ChunilENGSceneMain.Instance.building.GetMachines(); + machines = ChunilENGSceneMain.Instance.building.GetMachines(); if(machines !=null) { foreach (var machine in machines) @@ -93,27 +93,27 @@ namespace ChunilENG.Management } void MachineIconsActive(Machine machine) { - //var currentFloor = ChunilENGSceneMain.Instance.building.GetCurFloor(); - //var machineInFloor = machine.GetComponentInParent(); + var currentFloor = ChunilENGSceneMain.Instance.building.GetCurFloor(); + var machineInFloor = machine.GetComponentInParent(); - //if (machineInFloor != currentFloor) - //{ - // machine.machineKPI.Deactive(); - // return; - //} - //else - //{ - // if (IsScreenRange(machine)) - // { - // machine.machineKPI.Active(); - // return; - // } - // else - // { - // machine.machineKPI.Deactive(); - // return; - // } - //} + if (machineInFloor != currentFloor) + { + machine.machineKPI.Deactive(); + return; + } + else + { + if (IsScreenRange(machine)) + { + machine.machineKPI.Active(); + return; + } + else + { + machine.machineKPI.Deactive(); + return; + } + } } public void SetMachineKPI(List machineData) diff --git a/Assets/Scripts/ChunilENG/Objects/Building.cs b/Assets/Scripts/ChunilENG/Objects/Building.cs index f0b6c32f..fd2b56d1 100644 --- a/Assets/Scripts/ChunilENG/Objects/Building.cs +++ b/Assets/Scripts/ChunilENG/Objects/Building.cs @@ -19,7 +19,7 @@ namespace ChunilENG public Floor GetCurFloor() { return floorList[curFloorIndex]; } private List floorList = new List(); private int curFloorIndex; - + private HideObject hideObject; public async UniTask Init() { machineList.Clear(); @@ -46,6 +46,8 @@ namespace ChunilENG await floor[i].Init(); floorList.Add(floor[i]); } + + hideObject = GetComponentInChildren(); var topFloorIndex = floorList.Count - 1; //curFloorIndex = topFloorIndex; //curFloorIndex = 1; @@ -85,6 +87,17 @@ namespace ChunilENG floor.SetCeilingActive(isActive); } } + + private void Update() + { + if (OctopusTwinAppMain.Instance.cameraController == null) + return; + + var cam = OctopusTwinAppMain.Instance.cameraController.Camera; + //if(>) + var isActive = cam.transform.position.y<8f ? true : false; + hideObject.gameObject.SetActive(isActive); + } } } diff --git a/Assets/Scripts/HideObject.cs b/Assets/Scripts/HideObject.cs new file mode 100644 index 00000000..c7b3a8e5 --- /dev/null +++ b/Assets/Scripts/HideObject.cs @@ -0,0 +1,15 @@ +using ChunilENG; +using UnityEngine; + +//public enum FloorType +//{ +// None, +// All, +// FirstFloor, +// SecondFloor, +//} +public class HideObject : MonoBehaviour +{ + + //public FloorType floorType; +} diff --git a/Assets/Scripts/SceneRoot.cs.meta b/Assets/Scripts/HideObject.cs.meta similarity index 100% rename from Assets/Scripts/SceneRoot.cs.meta rename to Assets/Scripts/HideObject.cs.meta diff --git a/Assets/Scripts/SceneRoot.cs b/Assets/Scripts/SceneRoot.cs deleted file mode 100644 index 6dd3f4ef..00000000 --- a/Assets/Scripts/SceneRoot.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChunilENG; -using UnityEngine; - -public enum FloorType -{ - None, - All, - FirstFloor, - SecondFloor, -} -public class SceneRoot : MonoBehaviour -{ - public FloorType floorType; -}