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

Merge pull request '설정값 오류 수정' (#14) from dev/jym/250311_01 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/ChunilENG/pulls/14
This commit was merged in pull request #14.
This commit is contained in:
jym
2025-03-11 11:45:43 +09:00
parent 8e3a551833 7c1d243ed0
commit a9bc8aff8b
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()
{
#if UNITY_EDITOR
filePath = "../ChunilENG/Option.ini";
#else
filePath = "../ChunilENG_Build/Option.ini";
#endif
filePath = "./Option.ini";
var allBehaviours = Core.singleTable.Values;
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]
string defaultInfo;
[OptionKey]
string machineInfoPath = "../ChunilENG/MachineStandardInfo.csv";
string machineInfoPath = "./MachineStandardInfo.csv";
public UI_InputOrFind UI_StandardInfoFile;
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 static string filePath = "../ChunilENG/CompleteTimeAlarmInfo.json";
public static string filePath = "./CompleteTimeAlarmInfo.json";
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]
host=106.247.236.204
topics=MES/PDV/BOARD1,MES/PDV/BOARD2
port=8901
[httpSetting]
apiKey=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MiwiZW1haWwiOiJjaHVuaWxlbmdAdXZjLmNvLmtyIiwiZ3JvdXBJZCI6MiwiZ3JvdXBDb2RlIjoiY2h1bmlsZW5nIiwicm9sZSI6IlRlbmFudEFkbWluIiwibmFtZSI6IuyynOydvOyXlOyngOuLiOyWtOungSIsImxpY2Vuc2UiOiJidXNpbmVzcyIsInBob25lIjoiMDEwMDAwMDAwMDAiLCJpYXQiOjE3MTgxNjI2MjksImV4cCI6MjAzMzUyMjYyOX0.zdlNswh_88M44oxs1HuaoA-rFdUoS50tHQ1-xNqWzIc
httpServer=http://106.247.236.204:8863
kpiAPI=/api/usp_ppmr020/list/facilityKpi
topics=MES/PDV/BOARD1,MES/PDV/BOARD2
[controllerOption]
MoveSpeed=2
ZoomSpeed=30
@@ -18,3 +13,12 @@ LEFT=A
RIGHT=D
RUN=LeftShift
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