save
This commit is contained in:
@@ -93,6 +93,7 @@ namespace ChunilENG.Management
|
||||
}
|
||||
void MachineIconsActive(Machine machine)
|
||||
{
|
||||
if(machine == null) return;
|
||||
var currentFloor = ChunilENGSceneMain.Instance.building.GetCurFloor();
|
||||
var machineInFloor = machine.GetComponentInParent<Floor>();
|
||||
|
||||
|
||||
@@ -159,10 +159,8 @@ namespace OCTOPUS_TWIN
|
||||
}
|
||||
}
|
||||
|
||||
// 실제 모델을 교체하는 함수
|
||||
private async UniTask SwitchModel(ProjectData data)
|
||||
private void CanvasReset()
|
||||
{
|
||||
// 기존에 켜져 있던 모델들 모두 끄기 (초기화)
|
||||
if (currentProjectData != null)
|
||||
{
|
||||
//SetActiveProgjectDataObject(modelRoot, currentProjectData.modelPrefab.name, false);
|
||||
@@ -171,6 +169,13 @@ namespace OCTOPUS_TWIN
|
||||
SetActiveProgjectDataObject(sceneMainRoot, currentProjectData.sceneMain.name, false);
|
||||
SetActiveProgjectDataObject(labelCanvasRoot, currentProjectData.labelCanvas.name, false);
|
||||
}
|
||||
}
|
||||
|
||||
// 실제 모델을 교체하는 함수
|
||||
private async UniTask SwitchModel(ProjectData data)
|
||||
{
|
||||
// 기존에 켜져 있던 모델들 모두 끄기 (초기화)
|
||||
|
||||
await LoadActiveProjectScene(data);
|
||||
currentProjectData = data;
|
||||
|
||||
@@ -271,6 +276,7 @@ namespace OCTOPUS_TWIN
|
||||
|
||||
public void ReturnHome()
|
||||
{
|
||||
CanvasReset();
|
||||
if (prevSceneAssets.Count > 0)
|
||||
{
|
||||
foreach (var scene in prevSceneAssets)
|
||||
|
||||
8
Assets/_Recovery.meta
Normal file
8
Assets/_Recovery.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d1b633744230d254bb331d04cb12c7d8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
5090
Assets/_Recovery/0.unity
Normal file
5090
Assets/_Recovery/0.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/_Recovery/0.unity.meta
Normal file
7
Assets/_Recovery/0.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 82e992c50bd1229409637944effb8893
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
54875
Assets/_Recovery/1.unity
Normal file
54875
Assets/_Recovery/1.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/_Recovery/1.unity.meta
Normal file
7
Assets/_Recovery/1.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d3414df2b6e2b3c46912c64a66f56490
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user