UVCXR/ChunilENG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

설정값 오류 수정 #14

Merged
jym merged 1 commits from dev/jym/250311_01 into main 2025-03-11 11:45:46 +09:00
Conversation 0 Commits 1 Files Changed 5 +941 -1011
5 changed files with 941 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Plugins/XRLib/Core/OptionManager.cs
View File

@@ -25,11 +25,7 @@ namespace WI
public void LoadOption() public void LoadOption()
{ {
#if UNITY_EDITOR filePath = "./Option.ini";
filePath = "../ChunilENG/Option.ini";
#else
filePath = "../ChunilENG_Build/Option.ini";
#endif
var allBehaviours = Core.singleTable.Values; var allBehaviours = Core.singleTable.Values;
var optionables = allBehaviours.Where(mo=>mo is IOptionable).ToList(); var optionables = allBehaviours.Where(mo=>mo is IOptionable).ToList();

2
Assets/Scripts/UI/Panel_ProtocolSetting.cs
View File

@@ -16,7 +16,7 @@ namespace CHN
[OptionSection] [OptionSection]
string defaultInfo; string defaultInfo;
[OptionKey] [OptionKey]
string machineInfoPath = "../ChunilENG/MachineStandardInfo.csv"; string machineInfoPath = "./MachineStandardInfo.csv";
public UI_InputOrFind UI_StandardInfoFile; public UI_InputOrFind UI_StandardInfoFile;
public List<StandardInfo> standardInfos = new(); public List<StandardInfo> standardInfos = new();

2
Assets/WorkSpace/Personal/JYM/CompleteTimeAlarmManager.cs
View File

@@ -24,7 +24,7 @@ namespace CHN
} }
public class CompleteTimeAlarmManager : MonoBehaviour, ISingle public class CompleteTimeAlarmManager : MonoBehaviour, ISingle
{ {
public static string filePath = "../ChunilENG/CompleteTimeAlarmInfo.json"; public static string filePath = "./CompleteTimeAlarmInfo.json";
public List<CompleteTimeAlarmData> currentData = new List<CompleteTimeAlarmData>(); public List<CompleteTimeAlarmData> currentData = new List<CompleteTimeAlarmData>();

1924
CompleteTimeAlarmInfo.json
View File

File diff suppressed because it is too large Load Diff

18
Option.ini
View File

@@ -1,13 +1,8 @@
[defaultInfo]
machineInfoPath=../ChunilENG/MachineStandardInfo.csv
[mqttClientSetting] [mqttClientSetting]
host=106.247.236.204 host=106.247.236.204
topics=MES/PDV/BOARD1,MES/PDV/BOARD2
port=8901 port=8901
[httpSetting] topics=MES/PDV/BOARD1,MES/PDV/BOARD2
apiKey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MiwiZW1haWwiOiJjaHVuaWxlbmdAdXZjLmNvLmtyIiwiZ3JvdXBJZCI6MiwiZ3JvdXBDb2RlIjoiY2h1bmlsZW5nIiwicm9sZSI6IlRlbmFudEFkbWluIiwibmFtZSI6IuyynOydvOyXlOyngOuLiOyWtOungSIsImxpY2Vuc2UiOiJidXNpbmVzcyIsInBob25lIjoiMDEwMDAwMDAwMDAiLCJpYXQiOjE3MTgxNjI2MjksImV4cCI6MjAzMzUyMjYyOX0.zdlNswh_88M44oxs1HuaoA-rFdUoS50tHQ1-xNqWzIc
httpServer=http://106.247.236.204:8863
kpiAPI=/api/usp_ppmr020/list/facilityKpi
[controllerOption] [controllerOption]
MoveSpeed=2 MoveSpeed=2
ZoomSpeed=30 ZoomSpeed=30
@@ -18,3 +13,12 @@ LEFT=A
RIGHT=D RIGHT=D
RUN=LeftShift RUN=LeftShift
TargetVisualization=LeftControl TargetVisualization=LeftControl
[defaultInfo]
machineInfoPath=./MachineStandardInfo.csv
[httpSetting]
apiKey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MiwiZW1haWwiOiJjaHVuaWxlbmdAdXZjLmNvLmtyIiwiZ3JvdXBJZCI6MiwiZ3JvdXBDb2RlIjoiY2h1bmlsZW5nIiwicm9sZSI6IlRlbmFudEFkbWluIiwibmFtZSI6IuyynOydvOyXlOyngOuLiOyWtOungSIsImxpY2Vuc2UiOiJidXNpbmVzcyIsInBob25lIjoiMDEwMDAwMDAwMDAiLCJpYXQiOjE3MTgxNjI2MjksImV4cCI6MjAzMzUyMjYyOX0.zdlNswh_88M44oxs1HuaoA-rFdUoS50tHQ1-xNqWzIc
httpServer=http://106.247.236.204:8863
kpiAPI=/api/usp_ppmr020/list/facilityKpi