同步思杨木业修改

Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab

@@ -1116,6 +1116,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114375882877918588}
   height: 150
   skill: 1
@@ -1842,6 +1843,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 105
+  ForcibleType: 0
 --- !u!1 &1031274471155176
 GameObject:
   m_ObjectHideFlags: 0
@@ -2681,6 +2683,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114390850043709164}
   height: 200
   skill: 1
@@ -4285,6 +4288,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114868186995817286}
   height: 300
   skill: 1
@@ -6563,6 +6567,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 108
+  ForcibleType: 0
 --- !u!1 &1097073814601886
 GameObject:
   m_ObjectHideFlags: 0
@@ -7527,7 +7532,7 @@ MonoBehaviour:
   TagSearchRoom: {fileID: 114630079822114610}
   PictureTransmission: {fileID: 114768713922863360}
   Usher: {fileID: 114554446976223180}
-  ForcibleEntry: {fileID: 0}
+  ForcibleEntry: {fileID: 8465623657799836276}
   SafetyOfficer: {fileID: 114837120814766230}
   GuardAgainst: {fileID: 114796290626694038}
   WaterGuiding: {fileID: 114514816904528126}
@@ -8842,6 +8847,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114415203964270868}
   height: 300
   skill: 1
@@ -9821,6 +9827,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114813218805397308}
   height: 200
   skill: 0
@@ -10922,6 +10929,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 107
+  ForcibleType: 0
 --- !u!1 &1168760203940398
 GameObject:
   m_ObjectHideFlags: 0
@@ -25532,6 +25540,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 53
+  ForcibleType: 0
 --- !u!1 &1425578769673976
 GameObject:
   m_ObjectHideFlags: 0
@@ -29578,6 +29587,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 90
+  ForcibleType: 0
 --- !u!1 &1509198580400012
 GameObject:
   m_ObjectHideFlags: 0
@@ -43941,6 +43951,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 76
+  ForcibleType: 0
 --- !u!1 &1771740289693890
 GameObject:
   m_ObjectHideFlags: 0
@@ -49342,6 +49353,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114933454797239092}
   height: 100
   skill: 1
@@ -54363,6 +54375,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114814108228076522}
   height: 100
   skill: 1
@@ -55062,6 +55075,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd8a28803ea652644a3cf129881a14c9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  NeedShowToggle: 1
   scrollView: {fileID: 114516088850249046}
   height: 100
   skill: 1
@@ -60045,6 +60059,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 109
+  ForcibleType: 0
 --- !u!1 &4696212455422337375
 GameObject:
   m_ObjectHideFlags: 0
@@ -60388,6 +60403,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 110
+  ForcibleType: 0
 --- !u!1 &6363819797903564153
 GameObject:
   m_ObjectHideFlags: 0
@@ -60514,6 +60530,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cloneObjType: 91
+  ForcibleType: 0
 --- !u!1 &6382224306327407532
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/LayWaterHose/LayWaterHose.cs

@@ -561,6 +561,12 @@ public class LayWaterHose : MonoBehaviour
             ParentLayHose.name = "LayWaterHose" + creatnum;
             creatnum++;
             ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().ConnectFireman = gameObject;
+           
+            if (GetComponent<FireManWaterHoseManager>().IsConnentWaterSource)
+            {
+                FireManWaterHoseManager thisFireman = GetComponent<FireManWaterHoseManager>();
+                ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().BindWaterSource(thisFireman.hasWaterConnect, thisFireman.hasFoamConnect, thisFireman.ConnentSource, thisFireman.WaterLineConnent);
+            }
             allInits.Clear(); //与之前铺设的水带切断联系
             AddInit(); //将当前位置作为起点 
             endPoint = transform.position;