From 5bc7fef1f1bfc3bb1dc27ec562a183efb03c3f04 Mon Sep 17 00:00:00 2001
From: "DESKTOP-KFV16CV\\cyt" <2268162076@qq.com>
Date: Tue, 2 Feb 2021 09:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E9=80=89=E6=97=B6=E7=82=B9=E5=BC=80?=
 =?UTF-8?q?=E5=87=BA=E6=B0=B4=E6=8C=89=E9=92=AE=E4=BD=86=E6=98=AF=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E9=80=89=E6=8B=A9=E5=87=BA=E6=B0=B4=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scripts/GameObjectSelect/ObjSelectCtrl.cs | 50 ++++++++++++++-----
 .../Power/FiremanSkill/FireManSkillsPanel.cs  | 17 +++++--
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs b/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs
index 4f3297c..22db58d 100644
--- a/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs
+++ b/Assets/Scripts/GameObjectSelect/ObjSelectCtrl.cs
@@ -65,6 +65,25 @@ public class ObjSelectCtrl : MonoBehaviour
 
         if (hitObj == gameObject)
         {
+            if (SelectedObjs.selectedCharacters.Count>0) 
+            {
+                if (gameObject != SelectedObjs.selectedCharacters[0])
+                {
+                    if(FireManSkillsPanel.GetInstance.gameObject.activeInHierarchy)
+                    {//目前是单选消防员状态
+                        if (SelectedObjs.selectedCharacters[0].GetComponent<FireManMessage>().workType == FireManSkills.SprayWater)
+                        {
+                            if (!SelectedObjs.selectedCharacters[0].GetComponentInChildren<ParticleControlOfType>())
+                            {//单选的是消防员但是没有出水
+                                //点击出水按钮但是没有选择出水类型导致
+                                SelectedObjs.selectedCharacters[0].GetComponent<FireManMessage>().workType = FireManSkills.None;
+                            }
+                        }
+                    }
+                   
+                }
+            }
+           
             clearSelection();
 
             if (hitObj.tag != "Player")
@@ -87,8 +106,25 @@ public class ObjSelectCtrl : MonoBehaviour
 
     private void EscCancelSelected(IMessage obj)
     {
-        if (SelectedObjs.selectedObj == gameObject || SelectedObjs.selectedCharacters.Contains(gameObject))
+        if (SelectedObjs.selectedObj == gameObject || SelectedObjs.selectedCharacters.Contains(gameObject)) 
+        {
+            if (SelectedObjs.selectedCharacters.Count > 0)
+            {//目前是单选消防员状态
+                //if (FireManSkillsPanel.GetInstance.gameObject.activeInHierarchy) 
+                {
+                    if (SelectedObjs.selectedCharacters[0].GetComponent<FireManMessage>().workType == FireManSkills.SprayWater)
+                    {//当前是出水技能但是没有水粒子
+                        if (!SelectedObjs.selectedCharacters[0].GetComponentInChildren<ParticleControlOfType>())
+                        {
+                            SelectedObjs.selectedCharacters[0].GetComponent<FireManMessage>().workType = FireManSkills.None;
+                        }
+                    }
+
+                }
+            }
             clearSelection();
+        }
+            
     }
 
     private void CancelObjSelected(IMessage obj)
@@ -163,18 +199,6 @@ public class ObjSelectCtrl : MonoBehaviour
             DoDisSelect(SelectedObjs.selectedObj);
             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 36f4290..007da89 100644
--- a/Assets/Scripts/Power/FiremanSkill/FireManSkillsPanel.cs
+++ b/Assets/Scripts/Power/FiremanSkill/FireManSkillsPanel.cs
@@ -54,11 +54,19 @@ public class FireManSkillsPanel : ResourceLoadPanel<FireManSkillsPanel>
         layerwaterHose = panel.Find("LayWaterHose").GetComponent<Toggle>();
         layliftSavingFlarePath = panel.Find("LayLifeSavingFlarePath").GetComponent<Toggle>();
     }
-    public void CloseSprayToggle() 
-    {
+    public void CloseSprayToggle()
+    {
+        //if (!chooseObj.GetComponentInChildren<ParticleControlOfType>())
+        //{
+        //    if (chooseObj.GetComponent<FireManMessage>().workType == FireManSkills.SprayWater)
+        //    {
+        //        chooseObj.GetComponent<FireManMessage>().workType = FireManSkills.None;
+        //    }
+        //}
         sprayWater.isOn = false;
+
     }
-    public bool GetSprayOn() 
+    public bool GetSprayOn()
     {
         return sprayWater.isOn;
     }
@@ -256,7 +264,7 @@ public class FireManSkillsPanel : ResourceLoadPanel<FireManSkillsPanel>
     /// </summary>
     void SetToggle()
     {
-        if (this==null)
+        if (this == null)
         {
             return;
         }
@@ -288,6 +296,7 @@ public class FireManSkillsPanel : ResourceLoadPanel<FireManSkillsPanel>
         }
 
     }
+  
     void SetHasWater(GameObject gameObject)
     {
         if (this==null)