【+】

1.修改冲突代码

ModeDisplay/Assets/GameAssets/08.ModelPrefabs.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a9f491a473c3b784da2db161165147ae
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ModeDisplay/Assets/Scripts/DeviceController.cs

@@ -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
         {