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

RF 층 버튼 변경 및 UI 드래그 오류 수정

Browse Source
This commit is contained in:
정영민
2025-04-08 12:28:18 +09:00
parent 77f7f6c102
commit 3cfc9d136a
10 changed files with 107 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Assets/Plugins/XRLib/GenericController/GenericController.cs
View File

@@ -59,51 +59,35 @@ namespace WI
return result;
}
}
//UI위에 마우스 있는경우
public bool IsOnTheUI
{
get
{
if (IsPointerOverExcludedUI())
{
return false;
}
else
{
var result = EventSystem.current.IsPointerOverGameObject();
return result;
}
}
}
bool IsPointerOverExcludedUI()
{
PointerEventData pointerData = new PointerEventData(EventSystem.current);
pointerData.position = Input.mousePosition;
List<RaycastResult> raycastResults = new List<RaycastResult>();
EventSystem.current.RaycastAll(pointerData, raycastResults);
foreach(var raycastResult in raycastResults)
{
if ((LayerMask.GetMask("Default") & (1 << raycastResult.gameObject.layer)) != 0)
{
return true;
}
}
return false;
}
bool isPressed;
protected virtual void LateUpdate()
{
if (IsPressedUI())
return;
if (IsClickUI)
return;
if (IsOnTheUI)
return;
input.GetInput();
Movement();
var limitCheck = maxRangeLimitter.MoveRangeLimit(nextPosition);
LastPositioning(limitCheck);
}
private bool IsPressedUI()
{
if (Input.GetMouseButtonDown(0))
{
if (EventSystem.current.IsPointerOverGameObject())
{
isPressed = true;
}
}
if (Input.GetMouseButtonUp(0))
{
isPressed = false;
}
return isPressed;
}
}
}

2
Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab
View File

@@ -295,7 +295,7 @@ MonoBehaviour:
m_Content: {fileID: 8100983100533929295}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135

2
Assets/Prefabs/UI/Panel/Panel_Library.prefab
View File

@@ -694,7 +694,7 @@ MonoBehaviour:
m_Content: {fileID: 1664826789211949129}
m_Horizontal: 1
m_Vertical: 0
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135

16
Assets/Prefabs/UI/Panel/Panel_Menu.prefab
View File

@@ -343,7 +343,7 @@ MonoBehaviour:
m_Content: {fileID: 8638979772171968288}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
@@ -2320,9 +2320,9 @@ RectTransform:
- {fileID: 3587059684787867451}
m_Father: {fileID: 1904382343685541487}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 215.255, y: -347.375}
m_SizeDelta: {x: 340.51, y: 151.97}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1617684694942205957
@@ -11292,7 +11292,7 @@ MonoBehaviour:
m_Content: {fileID: 1904382343685541487}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
@@ -15279,9 +15279,9 @@ RectTransform:
- {fileID: 1581751372906333712}
m_Father: {fileID: 1904382343685541487}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 215.25002, y: -120.69499}
m_SizeDelta: {x: 340.50003, y: 241.38998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8103516073146861605

4
Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab
View File

@@ -592,7 +592,7 @@ MonoBehaviour:
m_Content: {fileID: 3065632315239046984}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
@@ -1410,7 +1410,7 @@ MonoBehaviour:
m_Content: {fileID: 3522885334464503914}
m_Horizontal: 0
m_Vertical: 1
m_MovementType: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135

2
Assets/Scenes/Main.unity
View File

@@ -435731,7 +435731,7 @@ PrefabInstance:
- target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 10.3
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430,
type: 3}

10
Assets/Scripts/UI/UI_FloorButton.cs
View File

@@ -23,7 +23,15 @@ public class UI_FloorButton : UIBase
button = GetComponent<Button>();
var buttonText = GetComponentInChildren<TMP_Text>();
buttonText.SetText($"{value + 1}F");
if (value + 1 >= 6)
{
buttonText.SetText("RF");
}
else
{
buttonText.SetText($"{value + 1}F");
}
button.onClick.AddListener(OnClickButton);
originColor = button.image.color;

1
Assets/WorkSpace/Personal/JYM/Panel_ToolBar.cs
View File

@@ -72,6 +72,7 @@ public class Panel_ToolBar : PanelBase
if (!string.IsNullOrEmpty(destFilePath))
{
File.Delete(destFilePath);
File.Move(sourcePath, destFilePath);
}
else

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

@@ -66,6 +66,8 @@ namespace CHN
var isActive = protocol.isSuccess;
Image_State.gameObject.SetActive(isActive);
var color = protocol.isSuccess ? new Color(0, 245, 0) : new Color(245, 0, 0);
ErrorMessage.color = color;
ErrorMessage.text = protocol.errorMessage;
}
}

122
CompleteTimeAlarmInfo.json
View File

@@ -30,7 +30,7 @@
"sttm": "0803",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 20:07:16",
"ptotm": "2025-04-08 19:42:33",
"psttm": "2025-04-03 08:03:05"
},
"isCheck": false
@@ -65,7 +65,7 @@
"sttm": "0803",
"totm": "",
"goaltime": "718",
"ptotm": "2025-04-07 20:06:25",
"ptotm": "2025-04-08 19:41:37",
"psttm": "2025-04-03 08:03:13"
},
"isCheck": false
@@ -100,7 +100,7 @@
"sttm": "0803",
"totm": "",
"goaltime": "718",
"ptotm": "2025-04-07 20:06:32",
"ptotm": "2025-04-08 19:41:41",
"psttm": "2025-04-03 08:03:19"
},
"isCheck": false
@@ -135,10 +135,10 @@
"sttm": "0803",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 20:07:40",
"ptotm": "2025-04-08 19:42:44",
"psttm": "2025-04-03 08:03:26"
},
"isCheck": false
"isCheck": true
},
{
"completeInfo": {
@@ -170,7 +170,7 @@
"sttm": "0818",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:07:48",
"ptotm": "2025-04-09 07:42:48",
"psttm": "2025-04-03 08:18:18"
},
"isCheck": false
@@ -205,10 +205,10 @@
"sttm": "0803",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 20:07:59",
"ptotm": "2025-04-08 19:42:51",
"psttm": "2025-04-03 08:03:34"
},
"isCheck": true
"isCheck": false
},
{
"completeInfo": {
@@ -240,7 +240,7 @@
"sttm": "0818",
"totm": "",
"goaltime": "718",
"ptotm": "2025-04-07 20:07:08",
"ptotm": "2025-04-08 19:41:55",
"psttm": "2025-04-03 08:18:32"
},
"isCheck": false
@@ -275,7 +275,7 @@
"sttm": "0818",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 20:08:16",
"ptotm": "2025-04-08 19:42:58",
"psttm": "2025-04-03 08:18:40"
},
"isCheck": false
@@ -310,7 +310,7 @@
"sttm": "0818",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:08:39",
"ptotm": "2025-04-09 07:43:02",
"psttm": "2025-04-03 08:18:46"
},
"isCheck": false
@@ -345,7 +345,7 @@
"sttm": "0813",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 20:08:48",
"ptotm": "2025-04-08 19:43:06",
"psttm": "2025-04-03 08:13:52"
},
"isCheck": false
@@ -380,10 +380,10 @@
"sttm": "0800",
"totm": "",
"goaltime": "1440",
"ptotm": "2025-04-08 08:09:55",
"ptotm": "2025-04-09 07:44:10",
"psttm": "2025-04-03 08:00:35"
},
"isCheck": true
"isCheck": false
},
{
"completeInfo": {
@@ -415,10 +415,10 @@
"sttm": "0758",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:09:08",
"ptotm": "2025-04-09 07:43:14",
"psttm": "2025-04-03 07:58:14"
},
"isCheck": true
"isCheck": false
},
{
"completeInfo": {
@@ -450,7 +450,7 @@
"sttm": "0819",
"totm": "",
"goaltime": "2879",
"ptotm": "2025-04-09 08:20:56",
"ptotm": "2025-04-10 07:43:18",
"psttm": "2025-04-03 08:19:03"
},
"isCheck": false
@@ -485,7 +485,7 @@
"sttm": "0819",
"totm": "",
"goaltime": "1440",
"ptotm": "2025-04-08 08:01:45",
"ptotm": "2025-04-09 07:43:22",
"psttm": "2025-04-03 08:19:09"
},
"isCheck": false
@@ -520,7 +520,7 @@
"sttm": "0804",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:16:52",
"ptotm": "2025-04-09 07:43:26",
"psttm": "2025-04-03 08:04:14"
},
"isCheck": false
@@ -555,7 +555,7 @@
"sttm": "0757",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:05:16",
"ptotm": "2025-04-09 07:43:30",
"psttm": "2025-04-03 07:57:39"
},
"isCheck": false
@@ -590,7 +590,7 @@
"sttm": "0755",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 07:59:46",
"ptotm": "2025-04-09 07:43:34",
"psttm": "2025-04-03 07:55:21"
},
"isCheck": false
@@ -625,7 +625,7 @@
"sttm": "0853",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 19:45:42",
"ptotm": "2025-04-08 19:44:37",
"psttm": "2025-04-03 08:53:42"
},
"isCheck": false
@@ -660,7 +660,7 @@
"sttm": "0819",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:04:13",
"ptotm": "2025-04-09 07:43:41",
"psttm": "2025-04-03 08:19:31"
},
"isCheck": false
@@ -695,7 +695,7 @@
"sttm": "0809",
"totm": "",
"goaltime": "2879",
"ptotm": "2025-04-08 08:10:20",
"ptotm": "2025-04-09 07:43:45",
"psttm": "2025-04-03 08:09:08"
},
"isCheck": false
@@ -730,7 +730,7 @@
"sttm": "0803",
"totm": "",
"goaltime": "720",
"ptotm": "2025-04-07 20:18:19",
"ptotm": "2025-04-08 19:43:49",
"psttm": "2025-04-03 08:03:29"
},
"isCheck": false
@@ -765,7 +765,7 @@
"sttm": "0800",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 08:14:05",
"ptotm": "2025-04-09 07:43:52",
"psttm": "2025-04-03 08:00:00"
},
"isCheck": false
@@ -800,7 +800,7 @@
"sttm": "0819",
"totm": "",
"goaltime": "2879",
"ptotm": "2025-04-09 07:54:02",
"ptotm": "2025-04-10 07:43:55",
"psttm": "2025-04-03 08:19:46"
},
"isCheck": false
@@ -835,7 +835,7 @@
"sttm": "0806",
"totm": "",
"goaltime": "719",
"ptotm": "2025-04-07 22:30:53",
"ptotm": "2025-04-08 20:07:55",
"psttm": "2025-04-03 08:06:39"
},
"isCheck": false
@@ -870,7 +870,7 @@
"sttm": "0819",
"totm": "",
"goaltime": "1439",
"ptotm": "2025-04-08 04:52:11",
"ptotm": "2025-04-09 07:44:04",
"psttm": "2025-04-03 08:19:54"
},
"isCheck": false
@@ -887,7 +887,7 @@
"worknm": "X76 GORE CAP",
"workseq": "1",
"status": "1",
"statusnm": "비가동",
"statusnm": "계획정지",
"itemcd": "24050078-GMA",
"itemdesc": "CAP ASM - TRANS FLUID FIL (W/VENT)",
"pjtcd": "X76",
@@ -905,7 +905,7 @@
"sttm": "0746",
"totm": "",
"goaltime": "529",
"ptotm": "2025-04-08 04:26:33",
"ptotm": "2025-04-08 08:02:24",
"psttm": "2025-04-03 07:46:19"
},
"isCheck": false
@@ -940,7 +940,7 @@
"sttm": "0759",
"totm": "",
"goaltime": "691",
"ptotm": "2025-04-07 19:28:31",
"ptotm": "2025-04-08 19:30:43",
"psttm": "2025-04-03 07:59:36"
},
"isCheck": false
@@ -975,7 +975,7 @@
"sttm": "0758",
"totm": "",
"goaltime": "691",
"ptotm": "2025-04-07 19:27:27",
"ptotm": "2025-04-08 19:31:03",
"psttm": "2025-04-03 07:58:23"
},
"isCheck": false
@@ -992,7 +992,7 @@
"worknm": "CVT C/VB LINE",
"workseq": "1",
"status": "1",
"statusnm": "비가동",
"statusnm": "가동중",
"itemcd": "24052991",
"itemdesc": "COVER ASM-C/VLV BODY",
"pjtcd": "CVT",
@@ -1010,7 +1010,7 @@
"sttm": "0820",
"totm": "",
"goaltime": "329",
"ptotm": "2025-04-07 13:29:39",
"ptotm": "2025-04-08 13:29:18",
"psttm": "2025-04-03 08:20:17"
},
"isCheck": false
@@ -1045,7 +1045,7 @@
"sttm": "0752",
"totm": "",
"goaltime": "0",
"ptotm": "2025-04-07 07:49:07",
"ptotm": "2025-04-08 07:55:38",
"psttm": "2025-04-03 07:52:26"
},
"isCheck": false
@@ -1062,7 +1062,7 @@
"worknm": "SGE W/O LINE",
"workseq": "1",
"status": "1",
"statusnm": "비가동",
"statusnm": "가동중",
"itemcd": "12707589-GMA",
"itemdesc": "OUTLET ASM – WATER",
"pjtcd": "SGE",
@@ -1080,7 +1080,7 @@
"sttm": "0758",
"totm": "",
"goaltime": "362",
"ptotm": "2025-04-07 13:59:44",
"ptotm": "2025-04-08 14:01:39",
"psttm": "2025-04-03 07:58:05"
},
"isCheck": false
@@ -1097,7 +1097,7 @@
"worknm": "CSS W/O LINE",
"workseq": "1",
"status": "1",
"statusnm": "비가동",
"statusnm": "가동중",
"itemcd": "55513502",
"itemdesc": "OUTLET ASM-WAT",
"pjtcd": "CSS PRIME",
@@ -1115,7 +1115,7 @@
"sttm": "0759",
"totm": "",
"goaltime": "380",
"ptotm": "2025-04-07 14:19:08",
"ptotm": "2025-04-08 14:27:44",
"psttm": "2025-04-03 07:59:09"
},
"isCheck": false
@@ -1132,7 +1132,7 @@
"worknm": "U/SONIC WELD-1",
"workseq": "1",
"status": "1",
"statusnm": "비가동",
"statusnm": "가동중",
"itemcd": "24051088-KOR",
"itemdesc": "SCOOP ASM-DRV LINK LUB",
"pjtcd": "GF6",
@@ -1150,10 +1150,10 @@
"sttm": "0758",
"totm": "",
"goaltime": "534",
"ptotm": "2025-04-07 16:53:05",
"ptotm": "2025-04-08 16:54:49",
"psttm": "2025-04-03 07:58:53"
},
"isCheck": false
"isCheck": true
},
{
"completeInfo": {
@@ -1185,7 +1185,7 @@
"sttm": "0758",
"totm": "",
"goaltime": "686",
"ptotm": "2025-04-07 16:49:13",
"ptotm": "2025-04-08 11:53:36",
"psttm": "2025-04-03 07:58:46"
},
"isCheck": false
@@ -1220,7 +1220,7 @@
"sttm": "0746",
"totm": "",
"goaltime": "307",
"ptotm": "2025-04-07 12:53:05",
"ptotm": "2025-04-08 13:03:16",
"psttm": "2025-04-03 07:46:25"
},
"isCheck": false
@@ -1255,7 +1255,7 @@
"sttm": "0759",
"totm": "",
"goaltime": "538",
"ptotm": "2025-04-07 16:57:43",
"ptotm": "2025-04-08 16:57:39",
"psttm": "2025-04-03 07:59:44"
},
"isCheck": false
@@ -1272,7 +1272,7 @@
"worknm": "INSULATOR-ENG FFRT CVR",
"workseq": "1",
"status": "4",
"statusnm": "계획정지",
"statusnm": "가동중",
"itemcd": "00000000",
"itemdesc": "None",
"pjtcd": "None",
@@ -1290,7 +1290,7 @@
"sttm": "0859",
"totm": "",
"goaltime": "0",
"ptotm": "2025-04-07 07:49:23",
"ptotm": "2025-04-08 17:05:30",
"psttm": "2025-04-03 08:59:06"
},
"isCheck": false
@@ -1325,7 +1325,7 @@
"sttm": "0800",
"totm": "",
"goaltime": "500",
"ptotm": "2025-04-07 07:48:30",
"ptotm": "2025-04-08 07:48:53",
"psttm": "2025-04-03 08:00:31"
},
"isCheck": false
@@ -1360,7 +1360,7 @@
"sttm": "0752",
"totm": "",
"goaltime": "0",
"ptotm": "2025-04-07 17:54:48",
"ptotm": "2025-04-08 17:55:05",
"psttm": "2025-04-03 07:52:41"
},
"isCheck": false
@@ -1395,7 +1395,7 @@
"sttm": "0756",
"totm": "",
"goaltime": "560",
"ptotm": "2025-04-07 17:06:04",
"ptotm": "2025-04-08 12:22:40",
"psttm": "2025-04-03 07:56:05"
},
"isCheck": false
@@ -1430,7 +1430,7 @@
"sttm": "0826",
"totm": "",
"goaltime": "214",
"ptotm": "2025-04-07 14:27:49",
"ptotm": "2025-04-08 13:50:38",
"psttm": "2025-04-03 08:26:00"
},
"isCheck": false
@@ -1465,7 +1465,7 @@
"sttm": "1043",
"totm": "",
"goaltime": "299",
"ptotm": "2025-04-07 20:10:43",
"ptotm": "2025-04-08 11:19:37",
"psttm": "2025-04-03 10:43:18"
},
"isCheck": false
@@ -1500,7 +1500,7 @@
"sttm": "1039",
"totm": "",
"goaltime": "213",
"ptotm": "2025-04-07 15:01:42",
"ptotm": "2025-04-08 10:46:41",
"psttm": "2025-04-03 10:39:06"
},
"isCheck": false
@@ -1535,10 +1535,10 @@
"sttm": "0858",
"totm": "",
"goaltime": "468",
"ptotm": "2025-04-07 15:11:09",
"ptotm": "2025-04-08 15:26:10",
"psttm": "2025-04-03 08:58:56"
},
"isCheck": false
"isCheck": true
},
{
"completeInfo": {
@@ -1570,7 +1570,7 @@
"sttm": "0909",
"totm": "",
"goaltime": "426",
"ptotm": "2025-04-07 15:16:30",
"ptotm": "2025-04-08 15:17:14",
"psttm": "2025-04-03 09:09:03"
},
"isCheck": false
@@ -1605,7 +1605,7 @@
"sttm": "0800",
"totm": "",
"goaltime": "468",
"ptotm": "2025-04-07 17:39:36",
"ptotm": "2025-04-08 15:26:10",
"psttm": "2025-04-03 08:00:12"
},
"isCheck": false
@@ -1640,7 +1640,7 @@
"sttm": "0755",
"totm": "",
"goaltime": "0",
"ptotm": "2025-04-07 09:02:07",
"ptotm": "2025-04-08 11:27:59",
"psttm": "2025-04-04 07:55:27"
},
"isCheck": false
@@ -1675,7 +1675,7 @@
"sttm": "0905",
"totm": "",
"goaltime": "111",
"ptotm": "2025-04-07 18:55:02",
"ptotm": "2025-04-08 12:11:44",
"psttm": "2025-04-07 09:05:21"
},
"isCheck": false
@@ -1710,7 +1710,7 @@
"sttm": "1022",
"totm": "",
"goaltime": "329",
"ptotm": "2025-04-07 15:51:51",
"ptotm": "2025-04-08 15:24:11",
"psttm": "2025-04-07 10:22:51"
},
"isCheck": false