Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo
This commit is contained in:
@@ -9,6 +9,7 @@ using UVC.Core;
|
||||
using UVC.Data;
|
||||
using UVC.Data.Core;
|
||||
using UVC.Management;
|
||||
using UVC.Studio.Manager;
|
||||
using UVC.UI.Tooltip;
|
||||
|
||||
namespace ChunilENG
|
||||
@@ -51,7 +52,9 @@ namespace ChunilENG
|
||||
thermostatInfoItemManager = await LoadManager<ThermostatInfoItemManager>();
|
||||
viewManager = await LoadManager<ViewManager>();
|
||||
mqttManager = FindAnyObjectByType<MQTT>();
|
||||
|
||||
var selectMnager = InjectorAppContext.Instance.Get<SelectionManager>();
|
||||
selectMnager.Gizmo.Dispose();
|
||||
selectMnager.Gizmo.Initialize();
|
||||
dataManager = await LoadManager<DataManager>();
|
||||
MQTTEventDisConnect();
|
||||
SetupDataSetting();
|
||||
|
||||
@@ -203,7 +203,7 @@ namespace OCTOPUS_TWIN
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public string CursceneName;
|
||||
public async UniTask SceneTransition(int index)
|
||||
{
|
||||
var sceneIndex = index == 2 ? 0 : 1;
|
||||
@@ -219,6 +219,7 @@ namespace OCTOPUS_TWIN
|
||||
private async UniTask LoadActiveProjectScene(string mainScene, SceneStatus status)
|
||||
{
|
||||
await sceneController.SceneChange(mainScene, status);
|
||||
CursceneName=mainScene;
|
||||
}
|
||||
|
||||
private void SetActiveProgjectDataObject(Transform parent, string targetName, bool isOn)
|
||||
|
||||
Reference in New Issue
Block a user