未提交更改

Assets/Sprite/Disassemble/DismantalPanel.cs

@@ -49,6 +49,10 @@ public class DismantalPanel : MonoBehaviour {
         if (obj.Data!=null)
         {
             TankPartsInfo info = (TankPartsInfo)obj.Data;
+            if (info.gameObject.GetComponentInParent<TankType>().OilTankType!=SightPlantController.Instace.TankType)
+            {
+                return;
+            }
             InfoShowText.text = info.Info;
         }
         

Assets/Sprite/Disassemble/TankCanvasFollow.cs

@@ -59,6 +59,10 @@ public class TankCanvasFollow : MonoBehaviour {
             // transform.position = cube.transform.position;
             if (InfoShowNow != null)
             {
+                if (InfoShowNow.GetComponentInParent<TankType>().OilTankType!=SightPlantController.Instace.TankType) 
+                {
+                    return;
+                }
                 glplant.SetPointList(new List<Vector3>() { GLLinkPoint.position, InfoShowNow.transform.position });
 
             }

Assets/Sprite/Disassemble/TankPartsInfo.cs

@@ -48,6 +48,10 @@ public class TankPartsInfo : MonoBehaviour {
     {
         if (obj.Data!=null)
         {
+            if (((TankPartsInfo)obj.Data).gameObject.GetComponentInParent<TankType>().OilTankType!=SightPlantController.Instace.TankType) 
+            {
+                return;
+            }
            // if (IsDisassem)
             {
                 if ((TankPartsInfo)obj.Data == this)

Assets/Sprite/Move/MoveController.cs

@@ -18,11 +18,15 @@ public class MoveController : MonoBehaviour
     public float MoveSpeed;
     public bool CanMove = true;
     private bool IsInteratUI;
-   // public float MaxMoveSpeed=7f;
-   
+    private Transform SettingPanel;
+    private Transform BG;
+    // public float MaxMoveSpeed=7f;
+
     // Use this for initialization
     void Start()
     {
+        SettingPanel = GameObject.Find("MenuCanvas").transform.Find("SettingPanel");
+        BG = GameObject.Find("SightseeingPlant").transform.Find("TankCanvas/BG");
         steam_VRcamera = GetComponentInChildren<SteamVR_Camera>();
         cc = GetComponent<CharacterController>();
         //m_capsule = transform.Find("Capsule").GetComponent<CapsuleCollider>();
@@ -91,6 +95,10 @@ public class MoveController : MonoBehaviour
             {
                 if (CanMove)
                 {
+                    if (BG.gameObject.activeInHierarchy||SettingPanel.gameObject.activeInHierarchy) 
+                    {
+                        return;
+                    }
                     cc.Move(GetMoveForward() * Time.deltaTime * MoveSpeed);
                 }
 

Assets/Sprite/TankShow/UIShow.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using AX.MessageSystem;
 using System;
-
+using UnityEngine.UI;
 public class UIShow : MonoBehaviour {
 
     public GameObject BG;
@@ -43,6 +43,7 @@ public class UIShow : MonoBehaviour {
                     SightPlantController.Instace.SetPlantAndCanvasPos();
                     MessageDispatcher.SendMessage("InteractUI", true);
                     BG.gameObject.SetActive(true);
+                    BG.transform.Find("DismantalPanel/InfoShowPanel/Text").GetComponent<Text>().text = "";
                     StartCoroutine(waitfornext());
                 }
             }
@@ -66,6 +67,7 @@ public class UIShow : MonoBehaviour {
     {
         MessageDispatcher.SendMessage("InteractUI", true);
         BG.gameObject.SetActive(true);
+        BG.transform.Find("DismantalPanel/InfoShowPanel/Text").GetComponent<Text>().text = "";
         StartCoroutine(waitfornext());
     }
 }

Assets/Sprite/TestSprite/HandController.cs

@@ -18,8 +18,9 @@ public class HandController : MonoBehaviour
     public Transform Plant;
     public float PlantMoveSpeed = 2;
     float timer;
-    private Transform SettingPanel;
     private Transform OriPlantPos;
+    private Transform SettingPanel;
+    private Transform BG;
     /// <summary>
     /// 当前交互物体,交互该物体时不可移动,比如水炮
     /// </summary>
@@ -33,6 +34,7 @@ public class HandController : MonoBehaviour
 
         MenuCanvas = GameObject.Find("MenuCanvas").transform;
         SettingPanel = MenuCanvas.transform.Find("SettingPanel");
+        BG = GameObject.Find("SightseeingPlant").transform.Find("TankCanvas/BG");
         cte.TriggerHairlineStart += Cte_TriggerHairlineStart;
         cte.TriggerHairlineEnd += Cte_TriggerHairlineEnd;
         cte.TriggerClicked += Cte_TriggerClick;