UVCXR/OCTOPUS_TWIN-Demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://220.90.135.190:3000/UVCXR/OCTOPUS_TWIN-Demo

Browse Source
This commit is contained in:
njh
2026-02-10 14:59:19 +09:00
parent 53396debac 941a96b4a7
commit a7f63c6c78
205 changed files with 10309 additions and 20246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/ChunilENG/UI/MachineDashBoard/MachineDashBoard.cs
View File

@@ -113,8 +113,8 @@ namespace ChunilENG.UI
}
public override void Open()
{
effect.ActivePanel();
gameObject.SetActive(true);
effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
}
public override void Close()

2
Assets/Scripts/ChunilENG/UI/MachineProgressPanel/AssemblyProgressPanel.cs
View File

@@ -64,8 +64,8 @@ namespace ChunilENG.UI
}
public override void Open()
{
effect.ActivePanel();
gameObject.SetActive(true);
effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
if (progressContents.Count <= 0)

2
Assets/Scripts/ChunilENG/UI/MachineProgressPanel/FinalInspectionPanel.cs
View File

@@ -64,8 +64,8 @@ namespace ChunilENG.UI
}
public override void Open()
{
effect.ActivePanel();
gameObject.SetActive(true);
effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
if (progressContents.Count <= 0)

2
Assets/Scripts/ChunilENG/UI/MachineProgressPanel/ProductionProgressPanel.cs
View File

@@ -64,8 +64,8 @@ namespace ChunilENG.UI
}
public override void Open()
{
effect.ActivePanel();
gameObject.SetActive(true);
effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
if (progressContents.Count <= 0)

2
Assets/Scripts/ChunilENG/UI/TotalProgressPanel/TotalProgressPanel.cs
View File

@@ -61,8 +61,8 @@ namespace ChunilENG.UI
}
public override void Open()
{
effect.ActivePanel();
gameObject.SetActive(true);
effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
if (statusContents.Count <= 0)

2
Assets/Scripts/ChunilENG/UI/WorkProgressPanel/WorkProgressPanel.cs
View File

@@ -59,8 +59,8 @@ namespace ChunilENG.UI
}
public override void Open()
{
effect.ActivePanel();
gameObject.SetActive(true);
effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
SelectedGrounpData(data[0]);

6
Assets/Scripts/Data/Data_KEPCO.asset
View File

@@ -19,8 +19,10 @@ MonoBehaviour:
hover: {fileID: 21300000, guid: afe44b78cbec59948ad9053bc2a686e0, type: 3}
curSceneStatus: 2
modelPrefab: {fileID: 1364758469199115521, guid: 423036aa0a8d7e54896acc2d79cf08b5, type: 3}
sceneAssets: []
volumeProfiles: []
sceneAssets:
- {fileID: 102900000, guid: 34945c1e977e7bb40ba70b8af5eac756, type: 3}
volumeProfiles:
- {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2}
staticCanvasPrefab: {fileID: 9115987721486925841, guid: df39e435fbc6b27458c0ced9b20b0bd7, type: 3}
popupCanvasPrefab: {fileID: 6944805395147841475, guid: 211ab265afe9f854bae51f1a2602c3f5, type: 3}
sceneMain: {fileID: 5850141579646257595, guid: 2b7f55830958f804aaad00ae1d4bbe6a, type: 3}

2
Assets/Scripts/KEPCO/Managements/IconManager.cs
View File

@@ -75,7 +75,7 @@ namespace KEPCO.Managements
return icon;
}
void Update()
void LateUpdate()
{
SensorActivateControl();
FacilityIconActivateControl();

15
Assets/Scripts/KEPCO/UI/FacilityAndSensorTypeTogglePanel/FacilityAndSensorTypeTogglePanel.cs
View File

@@ -62,7 +62,6 @@ namespace KEPCO.UI
private void SetSensorScrollView()
{
var typeSensors = KEPCOSceneMain.Instance.GetManager<DataManager>().sensorManager.typeToSensor;
bool isWhite = true;
var white = Color.white;
white.a = 0.04f;
@@ -81,11 +80,6 @@ namespace KEPCO.UI
{
var sensorType = t.Key;
var toggle = Instantiate(prefab_SensorToggle, ScrollView_SensorList.content);
if (isWhite)
{
toggle.SetBackgroundColor(white);
}
isWhite = !isWhite;
toggle.SetSensorType(sensorType);
toggle.ToggleEvent += (bool value) =>
{
@@ -109,10 +103,6 @@ namespace KEPCO.UI
public void SetFacilityScrollView()
{
var facilities = KEPCOSceneMain.Instance.GetManager<DataManager>().facilityManager.facilities;
bool isWhite = true;
var white = Color.white;
white.a = 0.04f;
var all = Instantiate(prefab_FaciltiyToggle, ScrollView_FacilityList.content);
all.transform.SetAsFirstSibling();
all.SetFacility(null);
@@ -127,11 +117,6 @@ namespace KEPCO.UI
foreach (var f in facilities)
{
var toggle = Instantiate(prefab_FaciltiyToggle, ScrollView_FacilityList.content);
if (isWhite)
{
toggle.SetBackgroundColor(white);
}
isWhite = !isWhite;
toggle.SetFacility(f);
toggle.ToggleEvent += (bool value) =>
{

2
Assets/Scripts/KEPCO/UI/FacilityInfoPanel/UI_NameAndState.cs
View File

@@ -21,7 +21,7 @@ namespace KEPCO.UI
Text_Name = this.transform.Find(nameof(Text_Name)).GetComponent<TextMeshProUGUI>();
Image_State = this.transform.Find(nameof(Image_State)).GetComponent<Image>();
Text_Name.text = "";
Text_Name.text = "-";
Image_State.color = Color.white;
ui_FacilityInfo = transform.parent.parent.parent.GetComponent<UI_FacilityInfo>();

11
Assets/Scripts/KEPCO/UI/FacilityInfoPanel/UI_NameAndValue.cs
View File

@@ -12,7 +12,7 @@ namespace KEPCO.UI
public void SetText(string name, string value)
{
Text_Name.text = name;
Text_Value.text = value;
Text_Value.text = ChangeDigit(value);
}
public void Awake()
@@ -20,10 +20,15 @@ namespace KEPCO.UI
Text_Name = this.transform.Find(nameof(Text_Name)).GetComponent<TextMeshProUGUI>();
Text_Value = this.transform.Find(nameof(Text_Value)).GetComponent<TextMeshProUGUI>();
Text_Name.text = "";
Text_Value.text = "";
Text_Name.text = "-";
Text_Value.text = "-";
ui_FacilityInfo = transform.parent.parent.parent.GetComponent<UI_FacilityInfo>();
}
public string ChangeDigit(string value)
{
float.TryParse(value, out var number);
return string.Format("{0:0.#}", number);
}
}
}

46
Assets/Scripts/KEPCO/UI/LeftSidePanel.cs
View File

@@ -50,13 +50,6 @@ namespace KEPCO.UI
new CameraViewModeChangedCommand(ViewMode.PerspectiveView),
"Quarter View 시점으로 변경합니다.");
toolbarModel.AddSeparator();
toolbarModel.AddStandardButton("button_reset_screen",
"Prefabs/UI/Toolbar/images/ic_menu_capture",
new ActionCommand(() => Debug.Log("화면 초기화")),
"화면을 초기화 합니다.");
// 화면 캡처
toolbarModel.AddStandardButton("button_capture_screen",
"Prefabs/UI/Toolbar/images/ic_menu_capture",
@@ -71,44 +64,23 @@ namespace KEPCO.UI
new ScreenRecordingCommand(recorder),
"화면을 녹화합니다.");
// 미니맵
toolbarModel.AddToggleButton("button_minimap", false,
"Prefabs/UI/Toolbar/images/ic_menu_minimap_on",
"Prefabs/UI/Toolbar/images/ic_menu_minimap_off",
(isSelected) => Debug.Log($"미니맵 상태: {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
new MinimapCommand(),
"미니맵을 켭니다.");
// 위치 고정
toolbarModel.AddToggleButton("button_position_fix", false,
"Prefabs/UI/Toolbar/images/ic_menu_position_fix_on",
"Prefabs/UI/Toolbar/images/ic_menu_position_fix_off",
(isSelected) => Debug.Log($"위치 고정 상태: {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
new FixPositionCommand(),
"미니맵을 켭니다.");
toolbarModel.AddSeparator();
// GIS 활성화/비활성화
toolbarModel.AddToggleButton("button_gis_control", true,
"Prefabs/UI/Toolbar/images/IMG_FloorControl_on",
"Prefabs/UI/Toolbar/images/IMG_FloorControl_off",
(isSelected) => Debug.Log($"층 조절 UI 활성화 상태 : {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
new ActiveGISCommand(),
"Prefabs/UI/Toolbar/images/IMG_WallControl_on",
"Prefabs/UI/Toolbar/images/IMG_WallControl_off",
(isSelected) =>
{
var building = KEPCOSceneMain.Instance.building;
building.SetAllFloorGISActive(isSelected);
},
new ActionCommand(() => Debug.Log("GIS 활성화 커맨드 호출")),
"GIS를 활성화 합니다.");
toolbarModel.AddToggleButton("button_ruler", false,
"Prefabs/UI/Toolbar/images/IMG_ruler_on",
"Prefabs/UI/Toolbar/images/IMG_ruler_off",
(isSelected) => Debug.Log($"자 UI 활성화 상태 : {(isSelected ? "활성화" : "비활성화")} (OnToggle 콜백)"),
new RulerCommand(),
"자 기능을 켭니다.");
// --- 툴바 모델 구성 끝 ---
toolbar.SetData(toolbarModel);
toolbar.Initialize();
sideTabBar.InitTab();
//sideTabBar.InitTab();
}
private void SetupCaptureSetting()
{

25
Assets/Scripts/KEPCO/UI/TopMenuPanel.cs
View File

@@ -7,6 +7,11 @@ using UVC.UI.Toolbar.Model;
using UVC.UI.ToolBar;
using OCTOPUS_TWIN.UI;
using KEPCO.Command;
using UVC.UI.Modal;
using System.Collections.Generic;
using System.Linq;
using OCTOPUS_TWIN.Modal;
using UVC.UI.Window.PropertyWindow;
namespace KEPCO.UI
{
@@ -44,23 +49,11 @@ namespace KEPCO.UI
// --- 툴바 모델 구성 시작 ---
// 알림 목록
toolbarModel.AddStandardButton("알림 목록",
$"{ResourceURL.uiSpriteFolderPath}TopToolBar/IMG_Alarm",
new ActionCommand(() => Debug.Log("알림 목록 활성화")),
"알랍 목록 창을 엽니다.");
//설정
toolbarModel.AddStandardButton("설정",
$"{ResourceURL.uiSpriteFolderPath}TopToolBar/IMG_Setting",
new ActionCommand(() => Debug.Log("설정 창 열기")),
"설정 창을 엽니다.");
//홈 화면 돌아가기
toolbarModel.AddStandardButton("홈 화면 돌아가기",
$"{ResourceURL.uiSpriteFolderPath}TopToolBar/IMG_Exit",
new OpenHomePanelCommand(),
"홈 화면 돌아가기 창을 엽니다.");
toolbarModel.AddStandardButton("홈 화면 돌아가기",
$"UI/Sprites/TopToolBar/IMG_Exit",
new OpenHomePanelCommand()
);
topToolBox.SetData(toolbarModel);
topToolBox.Initialize();

6
Assets/Scripts/KEPCO/UI/TotalProgressPanel/TotalProgressPanel.cs
View File

@@ -17,6 +17,8 @@ namespace KEPCO.UI
private RectTransform Content;
private Button Button_Close;
private Panel_Effect panel_effect;
public TextMeshProUGUI CurrentDate;
public TextMeshProUGUI CurrentTime;
@@ -39,6 +41,8 @@ namespace KEPCO.UI
MTRAttribute = GetElement<RectTransform>(nameof(MTRAttribute));
GISAttribute = GetElement<RectTransform>(nameof(GISAttribute));
panel_effect = FindAnyObjectByType<Panel_Effect>(FindObjectsInactive.Include);
Button_Close.onClick.AddListener(Close);
SetDate();
@@ -53,6 +57,7 @@ namespace KEPCO.UI
public override void Open()
{
gameObject.SetActive(true);
panel_effect.ActivePanel();
gameObject.transform.SetAsLastSibling();
if (facilitiesContents.Count <= 0)
@@ -65,6 +70,7 @@ namespace KEPCO.UI
public override void Close()
{
gameObject.SetActive(false);
panel_effect.DeactivePanel();
ResetStatusContentOrder();
isChangedData = false;
}