同步修改

Assets/Editor/SceneToolFloor.cs

@@ -384,6 +384,7 @@ public class SceneToolFloor
                     obj[i].gameObject.GetComponent<XFSS>().type = XFSSType.室内消火栓;
                     obj[i].gameObject.GetComponent<CloneableEnums>().CloneableTypes = SNXHS.CloneableTypes;
                     obj[i].gameObject.GetComponent<WaterSource>().water = true;
+                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.staticGameObject;
                 }
             }
         }
@@ -555,6 +556,7 @@ public class SceneToolFloor
                     obj[i].gameObject.GetComponent<XFSS>().type = XFSSType.地上消火栓;
                     obj[i].gameObject.GetComponent<CloneableEnums>().CloneableTypes = SNXHS.CloneableTypes;
                     obj[i].gameObject.GetComponent<WaterSource>().water = true;
+                    obj[i].gameObject.GetComponent<CloneGameObjInfo>().gameObjType = CloneObjType.staticGameObject;
                     if (obj[i].GetComponent<XFSS>()) 
                     {
                         if (obj[i].GetComponent<XFSS>().type==XFSSType.泡沫栓) 

Assets/Scenes/DongYouLiQing.unity

@@ -1781,7 +1781,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1487}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -66.330826, y: 1.65, z: 96.98681}
+  m_LocalPosition: {x: -174.28873, y: 1.65, z: 7.2432785}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6004}
@@ -9275,7 +9275,7 @@ PrefabInstance:
     - target: {fileID: 224001330236392204, guid: 863dfe406d9716349adc35fb55cd722c,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00001615877
+      value: -0.00000090282015
       objectReference: {fileID: 0}
     - target: {fileID: 224123732978855200, guid: 863dfe406d9716349adc35fb55cd722c,
         type: 3}
@@ -9340,7 +9340,7 @@ PrefabInstance:
     - target: {fileID: 224181501778157638, guid: 863dfe406d9716349adc35fb55cd722c,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.000036720794
+      value: 0.0000672327
       objectReference: {fileID: 0}
     - target: {fileID: 224373752534357086, guid: 863dfe406d9716349adc35fb55cd722c,
         type: 3}
@@ -12009,6 +12009,16 @@ PrefabInstance:
       propertyPath: m_Name
       value: SceneAll
       objectReference: {fileID: 0}
+    - target: {fileID: 6797150352519138728, guid: 09c0cccb124191341899682630b4af0f,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6797150353667632906, guid: 09c0cccb124191341899682630b4af0f,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 09c0cccb124191341899682630b4af0f, type: 3}
 --- !u!1 &1786135625

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

@@ -296,10 +296,10 @@ public class HaemalStrand : MonoBehaviour
             safearea.HasWounderNum= safearea.HasWounderNum+1;
             if (TargetObj.GetComponent<TrappedMoveFree>())
             {
-                TargetObj.GetComponent<NavMeshAgent>().SetDestination(TargetObj.transform.position);
+                //TargetObj.GetComponent<NavMeshAgent>().SetDestination(TargetObj.transform.position);
                 TargetObj.GetComponent<TrappedMoveFree>().TargetPosition = TargetObj.transform.position;
                 TargetObj.GetComponent<TrappedPathFind>().pathFindEnable = false;
-                TargetObj.GetComponent<NavMeshAgent>().baseOffset = 0.2f;
+                //TargetObj.GetComponent<NavMeshAgent>().baseOffset = 0.2f;
                 TargetObj.GetComponent<TrappedMoveFree>().IsBefirstAirOrMoving = false;
                 TargetObj.GetComponent<TrappedMoveFree>().OverMoveOrGuidance = true;
                 TargetObj.GetComponent<TrappedMoveFree>().SaveFrirmanUserId = fireman1.GetComponent<BaseGameObjInfo>().UserID;

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

@@ -186,7 +186,7 @@ public class TrappedMoveFree : MonoBehaviour
     public void OnEnable()
     {
         //MessageDispatcher.AddListener("SetGuidpathIndex", AddGuidIndex);
-       // MessageDispatcher.AddListener("MOVE_MAN_COMMAND", MoveExcute);
+        MessageDispatcher.AddListener("MOVE_MAN_COMMAND", MoveExcute);
         MessageDispatcher.AddListener("GUIDANCE_MAN_COMMAND", GuidanceTrapped);
         MessageDispatcher.AddListener("FRISTAID_MAN_COMMAND", FristAidTrapped);
         MessageDispatcher.AddListener("TRAPPED_MOVE_FOLLOW_GUIDE_POINT_COMMAND", MoveFollowGuidPoint);
@@ -203,7 +203,7 @@ public class TrappedMoveFree : MonoBehaviour
     public void OnDestroy()
     {
         // MessageDispatcher.RemoveListener("SetGuidpathIndex", AddGuidIndex);
-        //MessageDispatcher.RemoveListener("MOVE_MAN_COMMAND", MoveExcute);
+        MessageDispatcher.RemoveListener("MOVE_MAN_COMMAND", MoveExcute);
         MessageDispatcher.RemoveListener("GUIDANCE_MAN_COMMAND", GuidanceTrapped);
         MessageDispatcher.RemoveListener("FRISTAID_MAN_COMMAND", FristAidTrapped);
         MessageDispatcher.RemoveListener("TRAPPED_MOVE_FOLLOW_GUIDE_POINT_COMMAND", MoveFollowGuidPoint);
@@ -219,7 +219,7 @@ public class TrappedMoveFree : MonoBehaviour
     public void OnDisable()
     {
         //MessageDispatcher.RemoveListener("SetGuidpathIndex", AddGuidIndex);
-       // MessageDispatcher.RemoveListener("MOVE_MAN_COMMAND", MoveExcute);
+        MessageDispatcher.RemoveListener("MOVE_MAN_COMMAND", MoveExcute);
         MessageDispatcher.RemoveListener("GUIDANCE_MAN_COMMAND", GuidanceTrapped);
         MessageDispatcher.RemoveListener("FRISTAID_MAN_COMMAND", FristAidTrapped);
         MessageDispatcher.RemoveListener("TRAPPED_MOVE_FOLLOW_GUIDE_POINT_COMMAND", MoveFollowGuidPoint);
@@ -403,6 +403,7 @@ public class TrappedMoveFree : MonoBehaviour
 
         if (info.gameObjID == GetComponent<BaseGameObjInfo>().gameObjID)
         {
+            
 
             if (IsBefirstAirOrMoving)
             {
@@ -419,21 +420,27 @@ public class TrappedMoveFree : MonoBehaviour
                 LoadPromptWin.Instance.LoadTextPromptWindow("该人员被营救,不能再进行操作", 1f);
                 return;
             }
-            if (fireMan.GetComponent<FiremanMoveTrapped>().trappedlist.Count > 0)
+           
+            //if (fireMan.GetComponent<FiremanMoveTrapped>().trappedlist.Count > 0)
+            //{
+            //    if (fireMan.GetComponent<FiremanMoveTrapped>().trappedlist.Contains(info.gameObjID))
+            //    {
+            //        LoadPromptWin.Instance.LoadTextPromptWindow("该人员已跟随移动", 1f);
+            //        return;
+            //    }
+            //    else
+            //    {
+            //        LoadPromptWin.Instance.LoadTextPromptWindow("不能同时移动多名人员", 1f);
+            //        return;
+            //    }
+            //}
+            if (!IsMoveState && !OverMoveOrGuidance)
             {
-                if (fireMan.GetComponent<FiremanMoveTrapped>().trappedlist.Contains(info.gameObjID))
-                {
-                    LoadPromptWin.Instance.LoadTextPromptWindow("该人员已跟随移动", 1f);
-                    return;
-                }
-                else
+                if (Haemal > 50)
                 {
-                    LoadPromptWin.Instance.LoadTextPromptWindow("不能同时移动多名人员", 1f);
+                    LoadPromptWin.Instance.LoadTextPromptWindow("该被困人员不需要移动", 1f);
                     return;
                 }
-            }
-            if (!IsMoveState && !OverMoveOrGuidance)
-            {
                 if (Vector3.Distance(fireMan.transform.position, transform.position) > 3)
                 {
                     LoadPromptWin.Instance.LoadTextPromptWindow("请靠近需救助人员", 1f);

Assets/Scripts/Common/ReportSystem/UIViewQuestionnaire.cs

@@ -35,6 +35,13 @@ public class UIViewQuestionnaire : UIView
 
     private void Awake()
     {
+        if (!CheckZD())
+        {
+            LoadPromptWin.Instance.LoadTextPromptWindow("未检测到中队，跳过打分环节",2f);
+            gameObject.SetActive(false);
+            return;
+        }
+
         // 读取数据
         Questions = ResourceManager.LoadJson<List<Question>>("Question.json");
         if (ReportDataMgr.IsVictory)
@@ -53,7 +60,20 @@ public class UIViewQuestionnaire : UIView
         StartCoroutine(CreateItem());
         ButtonEnter.GetComponent<Button>().interactable = false;
     }
+    private bool CheckZD() 
+    {
+        bool has = false;
+        for (int i = 0; i < CurrentUserInfo.room.UserList.Count; i++)
+        {
+            if (CurrentUserInfo.room.UserList[i].Role==Role.中队指挥) 
+            {
+                has = true;
+                break;
+            }
+        }
+        return has;
 
+    }
     internal void SetSyncData(List<Question> questions)
     {
         // count +1