同步高层修改

Assets/Resources/ClonePrefabs/Tool/WaterCurtainHoseParent.prefab

@@ -1,22 +1,12 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1337212604450592}
-  m_IsPrefabParent: 1
 --- !u!1 &1337212604450592
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
   - component: {fileID: 4865545528353728}
   - component: {fileID: 114527167725944044}
@@ -35,9 +25,10 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &4865545528353728
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -46,93 +37,105 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114384052613779776
+--- !u!114 &114527167725944044
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 54153f038171b554a9142e99a94a0f98, type: 3}
+  m_Script: {fileID: 11500000, guid: 19c043b4b714b9f4cbba9383af04145c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  selected: 0
---- !u!114 &114462536095990460
+  gameObjID: 0
+  gameObjType: 108
+  UserID: 0
+  buildNum: 
+  floorNum: 0
+  interlayerNum: 0
+  Layer: 0
+  ShoworHidden: 0
+  FullName: 
+--- !u!114 &114384052613779776
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0d7b99748219b9d4f89b9686a4ca48fa, type: 3}
+  m_Script: {fileID: 11500000, guid: 54153f038171b554a9142e99a94a0f98, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &114527167725944044
+  selected: 0
+--- !u!114 &114934588300932396
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 19c043b4b714b9f4cbba9383af04145c, type: 3}
+  m_Script: {fileID: 11500000, guid: 4b257af13b3263c40b41dd82e9ba852c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  gameObjID: 0
-  gameObjType: 108
-  UserID: 0
-  buildNum: 
-  floorNum: 0
-  interlayerNum: 0
-  Layer: 0
-  ShoworHidden: 0
-  FullName: 
 --- !u!114 &114603823186471106
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 2f3bdb2ded22b3545b36eff11986b64c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &114934588300932396
+--- !u!114 &114994459010142998
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4b257af13b3263c40b41dd82e9ba852c, type: 3}
+  m_Script: {fileID: 11500000, guid: 0a2ae739074b1f74a839051cde37ee81, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!114 &114935359761360162
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 70e40b6af31cb3a48b4ac39caaabfd62, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  spaceDistance: 2
+  startSprayWaterDistance: 5
+  accumulationDis: 0
+  spaceDistance: 5
   pathPoints: []
   isClonedWaterCurtain: 0
---- !u!114 &114994459010142998
+  waterSourceGameObjId: -1
+  startPointIsWaterSource: 0
+  flag: 0
+--- !u!114 &114462536095990460
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1337212604450592}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0a2ae739074b1f74a839051cde37ee81, type: 3}
+  m_Script: {fileID: 11500000, guid: 0d7b99748219b9d4f89b9686a4ca48fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 

Assets/Scenes/DisasterLibraryManage.unity

@@ -1586,7 +1586,17 @@ PrefabInstance:
     - target: {fileID: 224885700138999974, guid: 9c85ddbcfc2c9924a8b9a9595c016377,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.000022009759
+      value: -0.00006968152
+      objectReference: {fileID: 0}
+    - target: {fileID: 114379362504804110, guid: 9c85ddbcfc2c9924a8b9a9595c016377,
+        type: 3}
+      propertyPath: m_Text
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 114191464068583674, guid: 9c85ddbcfc2c9924a8b9a9595c016377,
+        type: 3}
+      propertyPath: m_Text
+      value: 
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9c85ddbcfc2c9924a8b9a9595c016377, type: 3}

Assets/Scripts/Common/Disasters/Wound_Trapped/TRAPPED_GUIDANCE_SYNC.cs

@@ -71,15 +71,32 @@ public class TRAPPED_GUIDANCE_SYNC : NetworkMessageBehaviour
                         }
                         else
                         {
-                            trapped.Guidance = false;
-                            trapped.movestate = MoveState.IDLE;
-                            GetComponent<TrappedPathFind>().StopAllCoroutines();
-                            trapped.StopAllCoroutines();
-                            //GetComponent<NavMeshAgent>().enabled = false;
-                            trapped.OverMoveOrGuidance = true;
-                            //MessageDispatcher.SendMessage("SomeoneOutOfTrap"); //通知火场信息-疏散救生-被困时间部分更新，看是否可以停止计时
-                            TrappedTime.CheckStopTime();
-                            // GetComponent<Animator>().SetFloat("Speed", 0);
+                            if (trapped.OverMoveOrGuidance)
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                trapped.Guidance = false;
+                                trapped.movestate = MoveState.IDLE;
+                                GetComponent<TrappedPathFind>().StopAllCoroutines();
+                                trapped.StopAllCoroutines();
+
+                                trapped.OverMoveOrGuidance = true;
+                                MessageDispatcher.SendMessage("SomeoneOutOfTrap"); //通知火场信息-疏散救生-被困时间部分更新，看是否可以停止计时
+                                TrappedTime.CheckStopTime();
+
+                                transform.position = trapped.guidPoint[trapped.guidPoint.Count - 1];
+                                GetComponent<NavMeshAgent>().SetDestination(transform.position);
+                                GetComponent<NavMeshAgent>().enabled = false;
+                                if (trapped.IsselfClient)
+                                {
+                                    LoadPromptWin.Instance.LoadTextPromptWindow("被困人员到达引导目标位置", 1f);
+                                }
+                                // GetComponent<Animator>().SetFloat("Speed", 0);
+                            }
+
+
                         }
                     }
 

Assets/Scripts/Common/Disasters/Wound_Trapped/TrappedMoveFree.cs

@@ -596,14 +596,14 @@ public class TrappedMoveFree : MonoBehaviour
 
     }
 
-    IEnumerator checkguide() 
+    IEnumerator checkguide()
     {
-        while (Guidance&&!OverMoveOrGuidance)
+        while (Guidance && !OverMoveOrGuidance)
         {
             yield return new WaitForSeconds(10f);
-            if (Vector3.Distance(transform.position, guidPoint[0]) > 1f) 
+            if (Vector3.Distance(transform.position, guidPoint[0]) > 1f)
             {
-                if (CurrentUserInfo.mySelf.Id==CurrentUserInfo.room.Owner.UserInfo.Id) 
+                if (CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
                 {
                     TrappedPathFindingCmdArgs arg = new TrappedPathFindingCmdArgs();
                     arg.hitPoint = guidPoint[0];
@@ -870,11 +870,12 @@ public class TrappedMoveFree : MonoBehaviour
                             {
                                 LoadPromptWin.Instance.LoadTextPromptWindow("被困人员到达引导目标位置", 1f);
                             }
-                            //TrappedGuidanceSyncData argguide = new TrappedGuidanceSyncData();
-                            //argguide.IsEnd = true;
-                            //argguide.SendUserID = CurrentUserInfo.mySelf.Id;
-                            //argguide.gameObjID = GetComponent<BaseGameObjInfo>().gameObjID;
-                            //NetworkManager.Default.SendAsync("TRAPPED_GUIDANCE_SYNC", argguide);
+                            TrappedGuidanceSyncData argguide = new TrappedGuidanceSyncData();
+                            argguide.IsEnd = true;
+                            argguide.SendUserID = CurrentUserInfo.mySelf.Id;
+                            argguide.gameObjID = GetComponent<BaseGameObjInfo>().gameObjID;
+                            NetworkManager.Default.SendAsync("TRAPPED_GUIDANCE_SYNC", argguide);
+
                             MessageDispatcher.SendMessage("SomeoneOutOfTrap"); //通知火场信息-疏散救生-被困时间部分更新，看是否可以停止计时
                             return;
 

Assets/Scripts/Common/Tools/WaterCurtainHoseSkillCtrl.cs

@@ -27,7 +27,7 @@ public class WaterCurtainHoseSkillCtrl : MonoBehaviour
 
     public float startSprayWaterDistance = 5f;//距离水源（水源车，消火栓除外）5米开外出水
     public float accumulationDis = 0;
-    public float spaceDistance = 2f;//在水幕水带上出水的间隔距离，默认1米
+    public float spaceDistance = 5f;//在水幕水带上出水的间隔距离，默认1米
     public List<Vector3> pathPoints = new List<Vector3>();//水幕水带拐点；用于计算每间隔1米出水的位置
     private List<Vector3> sprayWaterPoss = new List<Vector3>();//水幕水带上的出水位置数组
 
@@ -41,11 +41,12 @@ public class WaterCurtainHoseSkillCtrl : MonoBehaviour
     public bool flag;
 
     // Use this for initialization
-    void Start () {
+    void Start()
+    {
         MessageDispatcher.AddListener("GET_SPRAYWATER_POSITIONS", GetSprayWaterPositions);
 
         WaterCurtain = Resources.Load("WaterCurtain/WaterCurtain") as GameObject;
-	}
+    }
 
     private void OnDestroy()
     {
@@ -69,7 +70,7 @@ public class WaterCurtainHoseSkillCtrl : MonoBehaviour
                 GameObject waterSourceObj = EntitiesManager.Instance.GetEntityByID(waterSourceGameObjId);
                 if (startPointIsWaterSource)
                 {//顺序获取分割点
-                   
+
                     if (waterSourceObj != null)
                     {
                         if (waterSourceObj.GetComponent<BaseGameObjInfo>().gameObjType == CloneObjType.WaterTanker
@@ -268,7 +269,7 @@ public class WaterCurtainHoseSkillCtrl : MonoBehaviour
             }
         }
 
-       if (!isClonedWaterCurtain)
+        if (!isClonedWaterCurtain)
         {//选中的水幕水带不存在水幕粒子特效，实例化水幕
             CloneGameObjInfo info = selectedWaterCurtainHose.GetComponent<CloneGameObjInfo>();
             for (int i = 0; i < sprayWaterPoss.Count; i++)
@@ -336,7 +337,8 @@ public class WaterCurtainHoseSkillCtrl : MonoBehaviour
     }
 
     // Update is called once per frame
-    void Update () {
-		
-	}
-}
+    void Update()
+    {
+
+    }
+}

Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs

@@ -1794,16 +1794,22 @@ public class TruckBindWaterSource : MonoBehaviour
         {
             for (int j = 0; j < watersouce[i].Count; j++)
             {
-                WaterSource ws = EntitiesManager.Instance.GetEntityByID(watersouce[i][j]).GetComponent<WaterSource>();
-                if (ws.TotalWater != -100)
-                {
-                    allremain += (ws.TotalWater - ws.AllUserWater);
-                }
-                else
+
+                if (EntitiesManager.Instance.GetEntityByID(watersouce[i][j])
+                    && EntitiesManager.Instance.GetEntityByID(watersouce[i][j]).GetComponent<WaterSource>())
                 {
-                    allremain = -100;
-                    break;
+                    WaterSource ws = EntitiesManager.Instance.GetEntityByID(watersouce[i][j]).GetComponent<WaterSource>();
+                    if (ws.TotalWater != -100)
+                    {
+                        allremain += (ws.TotalWater - ws.AllUserWater);
+                    }
+                    else
+                    {
+                        allremain = -100;
+                        break;
+                    }
                 }
+
             }
         }
         return allremain;

Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC.cs

@@ -35,10 +35,18 @@ public class NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC : NetworkMessageBehaviour
         {
             if (CurrentUserInfo.mySelf.Id != info.SendUserID)
             {
-                if (GetComponent<BaseGameObjInfo>().gameObjID==info.gameObjID)
+                if (GetComponent<BaseGameObjInfo>().gameObjID == info.gameObjID)
                 {
-                    emissionModule1.rateOverTime = new ParticleSystem.MinMaxCurve(info.Rateovertime1);
-                    emissionModule2.rateOverTime = new ParticleSystem.MinMaxCurve(info. Rateovertime2);
+
+                    try
+                    {
+                        emissionModule1.rateOverTime = new ParticleSystem.MinMaxCurve(info.Rateovertime1);
+                        emissionModule2.rateOverTime = new ParticleSystem.MinMaxCurve(info.Rateovertime2);
+                    }
+                    catch
+                    {
+
+                    }
 
                     if (info.Rateovertime1 < 0 && info.Rateovertime2 < 0)
                     {
@@ -57,12 +65,12 @@ public class NORMAL_OR_LIQUID_FIRE_FIGHT_SYNC : NetworkMessageBehaviour
                             }
                             GetComponent<Collider>().enabled = false;
                         }
-                       // EntitiesManager.Instance.DeleteObj(gameObject);
+                        // EntitiesManager.Instance.DeleteObj(gameObject);
                     }
                 }
             }
         }
     }
 
-   
+
 }