|
|
@@ -39,23 +39,10 @@ public class DeviceController : MonoBehaviour
|
|
|
PartMark partMark = GetParentPartMarkWithPartMark(hit.collider.transform);
|
|
|
|
|
|
// 处理射线击中的对象
|
|
|
-<<<<<<< HEAD
|
|
|
if (partMark != null)
|
|
|
{
|
|
|
UIKit.OpenPanel<PartLabelPanel>(UILevel.PopUI, new PartLabelPanelData() { partName = partMark.name });
|
|
|
}
|
|
|
-=======
|
|
|
- //if (hit.collider.GetComponent<PartMark>() != null)
|
|
|
- //{
|
|
|
- PartMark tmpMark = hit.collider.GetComponentInParent<PartMark>();
|
|
|
-
|
|
|
- if (tmpMark != null)
|
|
|
- {
|
|
|
- Debug.Log(tmpMark.name);
|
|
|
- UIKit.OpenPanel<PartLabelPanel>(UILevel.PopUI,new PartLabelPanelData() { partName = tmpMark.name });
|
|
|
- }
|
|
|
- //}
|
|
|
->>>>>>> feature/jinxin
|
|
|
}
|
|
|
else
|
|
|
{
|
