diff --git a/GQ_TongXin/Assets/Adam/Scripts/DragController.cs b/GQ_TongXin/Assets/Adam/Scripts/DragController.cs index 300b8a44b..b3c1449c6 100644 --- a/GQ_TongXin/Assets/Adam/Scripts/DragController.cs +++ b/GQ_TongXin/Assets/Adam/Scripts/DragController.cs @@ -185,9 +185,9 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, /// public void SetUPosHighLight(bool isOnUPos) { + Debug.Log(isOnUPos + "++++++isOnUPos"); if (isOnUPos) { - int index = uPosManger.CountUPos(targetObject.volume, currentUPosItem.ID); uPosManger.SetUPosInstruct(index, targetObject.volume, isOnUPos); } @@ -216,8 +216,8 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, if (!currentUPosItem.isOccupied) { target.transform.position = hitInfo.point; - } + } else { diff --git a/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs b/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs index 393eac2fe..da1669ba2 100644 --- a/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs +++ b/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs @@ -104,25 +104,18 @@ public class UPosManger : MonoBehaviour /// public void SetUPosInstruct(int startIndex, int count, bool isOnUPos) { + for (int i = 0; i < uPosItems.Length; i++) { if (!uPosItems[i].isOccupied) uPosItems[i].SetInstructColor(Color.green); } - + if (startIndex == -1) return; if (isOnUPos) { for (int i = startIndex; i < startIndex + count; i++) { - try - { - uPosItems[i].SetInstructColor(Color.yellow); - } - catch - { - - } - + uPosItems[i].SetInstructColor(Color.yellow); } } diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index aa38cf1f3..1775d56e6 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -116749,6 +116749,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -195017,7 +195018,7 @@ MonoBehaviour: xlz_sc: xllx_sc: arguments: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ4NTAyODksInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.j0JKoTpsQ3upAbreBLVTMZEsYMfN5WtEI810C7TCjLg + token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2OTQ4Nzg2NTUsInVzZXJuYW1lIjoiMTgzMTIzNDU2NzgifQ.zwIb__dy-Twp7UM9simdt2stqMLtl303EruHFTS5uq8 ' heatThresholdValueMax: heatThresholdValueMin: humidityThresholdValueMax: diff --git a/GQ_TongXin/Assets/StreamingAssets/dz.txt b/GQ_TongXin/Assets/StreamingAssets/dz.txt index 679ba4f3c..0044da23f 100644 --- a/GQ_TongXin/Assets/StreamingAssets/dz.txt +++ b/GQ_TongXin/Assets/StreamingAssets/dz.txt @@ -1 +1 @@ -https://37g271144o.imdo.co/ \ No newline at end of file +https://y1770r6292.goho.co/ \ No newline at end of file