diff --git a/Assets/Scene/MainScene_New.unity b/Assets/Scene/MainScene_New.unity
index bc37340..b31daf6 100644
Binary files a/Assets/Scene/MainScene_New.unity and b/Assets/Scene/MainScene_New.unity differ
diff --git a/Assets/Scene/MainScene_New/NavMesh-NavMeshMan.asset b/Assets/Scene/MainScene_New/NavMesh-NavMeshMan.asset
index b32b62a..19fd959 100644
Binary files a/Assets/Scene/MainScene_New/NavMesh-NavMeshMan.asset and b/Assets/Scene/MainScene_New/NavMesh-NavMeshMan.asset differ
diff --git a/Assets/Scene/MainScene_New/NavMesh-NavMeshSufaceCar.asset b/Assets/Scene/MainScene_New/NavMesh-NavMeshSufaceCar.asset
index 7339a9f..14702e2 100644
Binary files a/Assets/Scene/MainScene_New/NavMesh-NavMeshSufaceCar.asset and b/Assets/Scene/MainScene_New/NavMesh-NavMeshSufaceCar.asset differ
diff --git a/Assets/Scripts/Equip/Bag/Bag.cs b/Assets/Scripts/Equip/Bag/Bag.cs
index 2600f01..70205c5 100644
--- a/Assets/Scripts/Equip/Bag/Bag.cs
+++ b/Assets/Scripts/Equip/Bag/Bag.cs
@@ -46,6 +46,41 @@ public class Bag : MonoBehaviour
             {
                 EquipList = data.equips;
                 ChangeCloth();
+                var work = GetComponent<FireManMessage>().workType;
+
+                if (work == FireManSkills.LayWaterHose || work == FireManSkills.SprayFoam ||
+                    work == FireManSkills.SprayWater || work == FireManSkills.Decontamination)
+                {
+                    for (int i = 0; i < data.equips.Count; i++)
+                    {
+                        if (data.equips[i].Name == "消防高压水带")
+                        {
+                            drawLine.BeginLineNum += data.equips[i].Number;
+                            if (!GetComponent<NavMeshAgent>().enabled)
+                            {
+                                GetComponent<NavMeshAgent>().enabled = true;
+                                GetComponent<AgentController>().enabled = true;
+                            }
+                            if (GetComponent<XiaoFangYuanDrawLine>())
+                            {
+                                // if (GetComponent<XiaoFangYuanDrawLine>() == null)
+                                GetComponent<XiaoFangYuanDrawLine>().setLine();
+                            }
+                        }
+                    }
+
+                }
+                else if (work == FireManSkills.LayLifeSavingFlarePath)
+                {
+                    for (int i = 0; i < data.equips.Count; i++)
+                    {
+                        if (data.equips[i].Name == "救生照明线")
+                        {
+                            drawLine.BeginLiftLineNum += data.equips[i].Number;
+                        }
+                    }
+
+                }
             }
         }
     }
diff --git a/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs b/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs
index 94f571d..4f3297c 100644
--- a/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs
+++ b/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs
@@ -164,6 +164,17 @@ public class ObjSelectCtrl : MonoBehaviour
             SelectedObjs.selectedObj = null;
         }
 
+        if (FireManSkillsPanel.GetInstance.gameObject.activeInHierarchy) 
+        {
+            if (FireManSkillsPanel.GetInstance.GetSprayOn()) 
+            {
+                if (FireManSkillsPanel.GetInstance.chooseObj.GetComponentInChildren<ParticleControlOfType>() == null)
+                {
+                    FireManSkillsPanel.GetInstance.CloseSprayToggle();
+                }
+            }
+           
+        }
         for (int i = SelectedObjs.selectedCharacters.Count - 1; i >= 0; i--)
         {
             DoDisSelect(SelectedObjs.selectedCharacters[i]);
diff --git a/Assets/Scripts/Power/FiremanSkill/FireManSkillsPanel.cs b/Assets/Scripts/Power/FiremanSkill/FireManSkillsPanel.cs
index dc0e32e..36f4290 100644
--- a/Assets/Scripts/Power/FiremanSkill/FireManSkillsPanel.cs
+++ b/Assets/Scripts/Power/FiremanSkill/FireManSkillsPanel.cs
@@ -54,6 +54,14 @@ public class FireManSkillsPanel : ResourceLoadPanel<FireManSkillsPanel>
         layerwaterHose = panel.Find("LayWaterHose").GetComponent<Toggle>();
         layliftSavingFlarePath = panel.Find("LayLifeSavingFlarePath").GetComponent<Toggle>();
     }
+    public void CloseSprayToggle() 
+    {
+        sprayWater.isOn = false;
+    }
+    public bool GetSprayOn() 
+    {
+        return sprayWater.isOn;
+    }
     public void CloselayhoseToggle()
     {
         layerwaterHose.isOn = false;
diff --git a/Assets/Scripts/Power/FiremanSkill/XiaoFangYuanDrawLine.cs b/Assets/Scripts/Power/FiremanSkill/XiaoFangYuanDrawLine.cs
index 91a4c2c..cf63b94 100644
--- a/Assets/Scripts/Power/FiremanSkill/XiaoFangYuanDrawLine.cs
+++ b/Assets/Scripts/Power/FiremanSkill/XiaoFangYuanDrawLine.cs
@@ -601,6 +601,10 @@ public class XiaoFangYuanDrawLine : MonoBehaviour
         float disZhaoMingXian = 0.0f;//照明线长
 
         dis += getDrawLine();
+        if (Line == null)
+        {
+            return;
+        }
         if (Line.name.Equals(Guanxian.name))
         {
             disLine = dis;
diff --git a/Assets/Scripts/Power/Task/ControlSprayHead.cs b/Assets/Scripts/Power/Task/ControlSprayHead.cs
index 81e9acf..2bcd652 100644
--- a/Assets/Scripts/Power/Task/ControlSprayHead.cs
+++ b/Assets/Scripts/Power/Task/ControlSprayHead.cs
@@ -322,6 +322,18 @@ public class ControlSprayHead : MonoBehaviour
             if (water)
             {
                 var particletype = ((ParticleTypeCmdArgs)obj.Data);
+                if (particletype.ParticleType==ParticleEnum.None) 
+                {
+                    Debug.Log("没有设置水类型");
+                    if(SelectedObjs.selectedCharacters.Count>0)
+                    {
+                        if (FireManSkillsPanel.GetInstance.gameObject.activeInHierarchy) 
+                        {
+                            FireManSkillsPanel.GetInstance.CloseSprayToggle();
+                        }
+                    }
+                    return;
+                }
                 IsSpray = true;
                 if (particleenum != particletype.ParticleType)
                 {
diff --git a/Assets/Sky/Materials/azure[Sky].mat b/Assets/Sky/Materials/azure[Sky].mat
index 523d88a..3cdc5a9 100644
Binary files a/Assets/Sky/Materials/azure[Sky].mat and b/Assets/Sky/Materials/azure[Sky].mat differ
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 97520bf..8b5bb87 100644
Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
index e88f0f5..550c6d1 100644
Binary files a/ProjectSettings/QualitySettings.asset and b/ProjectSettings/QualitySettings.asset differ