出警界面配置

.vsconfig

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [ 
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+} 

Assets/Editor/SceneToolFloor.cs

@@ -503,31 +503,43 @@ public class SceneToolFloor
         {
             if (obj[i].GetComponent<XFSS>())
             {
-                GameObject quad = GameObject.Instantiate(quadMat.Quad);
+                if (!obj[i].transform.Find("Quad"))
-                quad.name = "Quad";
+                {
-                quad.transform.parent = obj[i].transform;
+                    GameObject quad = GameObject.Instantiate(quadMat.Quad);
-                quad.transform.localPosition = Vector3.up * 10;
+                    quad.name = "Quad";
-                quad.transform.localScale = Vector3.one * 3;
+                    quad.transform.parent = obj[i].transform;
-                switch (obj[i].GetComponent<XFSS>().type)
+                    quad.transform.localPosition = Vector3.up * 10;
-                {
+                    switch (obj[i].GetComponent<XFSS>().type)
-                    case XFSSType.地上消火栓:
+                    {
-                        quad.GetComponent<Renderer>().material = quadMat.mats[0];
+                        case XFSSType.地上消火栓:
-                        break;
+                            quad.GetComponent<Renderer>().material = quadMat.mats[0];
-                    case XFSSType.泡沫栓:
+                            break;
-                        quad.GetComponent<Renderer>().material = quadMat.mats[1];
+                        case XFSSType.泡沫栓:
-                        break;
+                            quad.GetComponent<Renderer>().material = quadMat.mats[1];
-                    case XFSSType.水泵接合器:
+                            break;
-                        quad.GetComponent<Renderer>().material = quadMat.mats[2];
+                        case XFSSType.水泵接合器:
-                        break;
+                            quad.GetComponent<Renderer>().material = quadMat.mats[2];
-                    case XFSSType.水炮:
+                            break;
-                        quad.GetComponent<Renderer>().material = quadMat.mats[3];
+                        case XFSSType.水炮:
-                        break;
+                            quad.GetComponent<Renderer>().material = quadMat.mats[3];
-                    case XFSSType.室内消火栓:
+                            break;
-                        quad.GetComponent<Renderer>().material = quadMat.mats[0];
+                        case XFSSType.室内消火栓:
-                        break;
+                            quad.GetComponent<Renderer>().material = quadMat.mats[0];
-                    default:
+                            break;
-                        break;
+                        default:
+                            break;
+                    }
+                    quad.layer = LayerMask.NameToLayer("FightDeploy");
+                    obj[i].transform.Find("Quad").localScale = new Vector3(3, 3, 3);
+                    quad.gameObject.SetActive(false);
                 }
+                else
+                {
+                    obj[i].transform.Find("Quad").gameObject.layer = LayerMask.NameToLayer("FightDeploy");
+                    obj[i].transform.Find("Quad").localScale = new Vector3(3, 3, 3);
+                    obj[i].transform.Find("Quad").gameObject.SetActive(false);
+                }
+
             }
 
         }

Assets/MscPublic/Assets/Resources/UI/FloorItem.prefab

@@ -64,8 +64,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 5448f37be88977646bc3013883817301, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -158,8 +156,6 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   m_IsOn: 0
 --- !u!114 &886484853937208961
 MonoBehaviour:
@@ -244,8 +240,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
@@ -318,8 +312,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: cfad5fdf0e7e7ad45bbbc3bd066cb609, type: 3}
     m_FontSize: 22
@@ -346,7 +338,6 @@ GameObject:
   - component: {fileID: 222551298539894938}
   - component: {fileID: 114451063700641064}
   - component: {fileID: 6151036416438185726}
-  - component: {fileID: 2229400231140118989}
   m_Layer: 5
   m_Name: Background
   m_TagString: Untagged
@@ -400,8 +391,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -454,29 +443,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   m_IsOn: 0
---- !u!114 &2229400231140118989
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1711419534937118}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 16a33de889563db4fa6b5f24e003e464, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  buildNum: 
-  floorNum: 0
-  interlayerNum: 0
-  MyChildFloors: []
-  floorsPanelManager: {fileID: 0}
-  MyText: {fileID: 114464141237427192}
-  HasChild: {fileID: 0}
-  MyTarget: {fileID: 0}
 --- !u!1 &1967893008667110
 GameObject:
   m_ObjectHideFlags: 0
@@ -540,8 +507,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 25d9b074034294a4c81cbcf69bff3c82, type: 3}
   m_Type: 0
   m_PreserveAspect: 0

Assets/MscPublic/Assets/Scripts/MainScene/FloorControlModule/UIFloor.cs

@@ -28,7 +28,7 @@ public class UIFloor : BaseToggle
     public GameObject HasChild;//显示该建筑(区域)下的所有楼层
     public Transform MyTarget;
     //private CameraManager cameraManager;
-    private float FollowCameraDistance = 100f;
+    private float FollowCameraDistance = 250f;
     private CameraManager cameraManager;
     private Transform P_AllParent;
     private void Start()

Assets/Prefabs/Common/OperationalPreparations/PincerAttack.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: 1825643745417846}
-  m_IsPrefabParent: 1
 --- !u!1 &1593856149030416
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  serializedVersion: 5
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
   - component: {fileID: 224062295758179050}
   - component: {fileID: 222372730112722622}
@@ -28,107 +18,39 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1715816119568964
+--- !u!224 &224062295758179050
-GameObject:
+RectTransform:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  serializedVersion: 5
+  m_PrefabAsset: {fileID: 0}
-  m_Component:
+  m_GameObject: {fileID: 1593856149030416}
-  - component: {fileID: 224731903690275734}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  - component: {fileID: 222094038477968646}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  - component: {fileID: 114473637694816622}
+  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Layer: 5
+  m_Children: []
-  m_Name: Background
+  m_Father: {fileID: 224689090819966654}
-  m_TagString: Untagged
+  m_RootOrder: 1
-  m_Icon: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_NavMeshLayer: 0
+  m_AnchorMin: {x: 0, y: 0}
-  m_StaticEditorFlags: 0
+  m_AnchorMax: {x: 1, y: 1}
-  m_IsActive: 1
+  m_AnchoredPosition: {x: 0, y: 26.2}
---- !u!1 &1825643745417846
+  m_SizeDelta: {x: -2, y: 8}
-GameObject:
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &222372730112722622
+CanvasRenderer:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  serializedVersion: 5
+  m_PrefabAsset: {fileID: 0}
-  m_Component:
+  m_GameObject: {fileID: 1593856149030416}
-  - component: {fileID: 224689090819966654}
+  m_CullTransparentMesh: 0
-  - component: {fileID: 114428558753936534}
-  - component: {fileID: 114051807802791130}
-  - component: {fileID: 114824605360391722}
-  - component: {fileID: 114099772853413152}
-  - component: {fileID: 114719272891236184}
-  - component: {fileID: 114614441972222774}
-  - component: {fileID: 114961611341016774}
-  - component: {fileID: 114962565808020660}
-  - component: {fileID: 114097078343746612}
-  m_Layer: 5
-  m_Name: PincerAttack
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1907169312238020
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224585440547244708}
-  - component: {fileID: 222703316487380818}
-  - component: {fileID: 114036865834897130}
-  m_Layer: 5
-  m_Name: Checkmark
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &114036865834897130
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1907169312238020}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: f5046dd1741fc8040b2788a31ec04d06, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!114 &114051807802791130
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1825643745417846}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 55475a7d97e0f00459a5739bca447956, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &114053529965922996
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1593856149030416}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -141,8 +63,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3}
     m_FontSize: 24
@@ -157,34 +77,131 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5939\u653B"
---- !u!114 &114097078343746612
+--- !u!1 &1715816119568964
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224731903690275734}
+  - component: {fileID: 222094038477968646}
+  - component: {fileID: 114473637694816622}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &224731903690275734
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1715816119568964}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224585440547244708}
+  m_Father: {fileID: 224689090819966654}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0.000011444092, y: 0}
+  m_SizeDelta: {x: 80, y: 30}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &222094038477968646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1715816119568964}
+  m_CullTransparentMesh: 0
+--- !u!114 &114473637694816622
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  m_GameObject: {fileID: 1825643745417846}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1715816119568964}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ae617ee7dba472a44b125e6c5e4656e1, type: 3}
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &114099772853413152
+  m_Material: {fileID: 0}
-MonoBehaviour:
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_ObjectHideFlags: 1
+  m_RaycastTarget: 1
-  m_PrefabParentObject: {fileID: 0}
+  m_OnCullStateChanged:
-  m_PrefabInternal: {fileID: 100100000}
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 895caf1fec0b6564ab660e706087c98d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!1 &1825643745417846
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224689090819966654}
+  - component: {fileID: 114428558753936534}
+  - component: {fileID: 114051807802791130}
+  - component: {fileID: 114824605360391722}
+  - component: {fileID: 114099772853413152}
+  - component: {fileID: 114719272891236184}
+  - component: {fileID: 114614441972222774}
+  - component: {fileID: 114961611341016774}
+  - component: {fileID: 114962565808020660}
+  - component: {fileID: 114097078343746612}
+  m_Layer: 5
+  m_Name: PincerAttack
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &224689090819966654
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
-  m_Enabled: 1
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_EditorHideFlags: 0
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_Script: {fileID: 11500000, guid: 01f1204e77200024a84a8d550f914c67, type: 3}
+  m_LocalScale: {x: 0.9996732, y: 0.9996732, z: 0.9996732}
-  m_Name: 
+  m_Children:
-  m_EditorClassIdentifier: 
+  - {fileID: 224731903690275734}
-  objWorldPos: {x: 0, y: 0, z: 0}
+  - {fileID: 224062295758179050}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.00020599365, y: -0.000048577785}
+  m_SizeDelta: {x: 80, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &114428558753936534
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -222,77 +239,77 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   m_IsOn: 0
---- !u!114 &114473637694816622
+--- !u!114 &114051807802791130
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  m_GameObject: {fileID: 1715816119568964}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 55475a7d97e0f00459a5739bca447956, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+--- !u!114 &114824605360391722
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: fea1f79cd89f1034c9a23d1618fcbdc9, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!114 &114614441972222774
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d8819a7368bf93b4eaa328041e614c1b, type: 3}
+  m_Script: {fileID: 11500000, guid: 6e39c327f4d4f474186d8845f48f9af7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  gameObjID: 0
+  gameObjType: 130
+  UserID: 0
+--- !u!114 &114099772853413152
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1825643745417846}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01f1204e77200024a84a8d550f914c67, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  objWorldPos: {x: 0, y: 0, z: 0}
 --- !u!114 &114719272891236184
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ee3b23ea672769749883ad8681ada933, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &114824605360391722
+--- !u!114 &114614441972222774
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6e39c327f4d4f474186d8845f48f9af7, type: 3}
+  m_Script: {fileID: 11500000, guid: d8819a7368bf93b4eaa328041e614c1b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  gameObjID: 0
-  gameObjType: 130
-  UserID: 0
 --- !u!114 &114961611341016774
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -301,56 +318,52 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
 --- !u!114 &114962565808020660
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1825643745417846}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1935e8bd7b3a88e41a1b126785992130, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!222 &222094038477968646
+--- !u!114 &114097078343746612
-CanvasRenderer:
+MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  m_GameObject: {fileID: 1715816119568964}
+  m_PrefabAsset: {fileID: 0}
---- !u!222 &222372730112722622
+  m_GameObject: {fileID: 1825643745417846}
-CanvasRenderer:
+  m_Enabled: 1
-  m_ObjectHideFlags: 1
+  m_EditorHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_Script: {fileID: 11500000, guid: ae617ee7dba472a44b125e6c5e4656e1, type: 3}
-  m_PrefabInternal: {fileID: 100100000}
+  m_Name: 
-  m_GameObject: {fileID: 1593856149030416}
+  m_EditorClassIdentifier: 
---- !u!222 &222703316487380818
+--- !u!1 &1907169312238020
-CanvasRenderer:
+GameObject:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  m_GameObject: {fileID: 1907169312238020}
+  m_PrefabAsset: {fileID: 0}
---- !u!224 &224062295758179050
+  serializedVersion: 6
-RectTransform:
+  m_Component:
-  m_ObjectHideFlags: 1
+  - component: {fileID: 224585440547244708}
-  m_PrefabParentObject: {fileID: 0}
+  - component: {fileID: 222703316487380818}
-  m_PrefabInternal: {fileID: 100100000}
+  - component: {fileID: 114036865834897130}
-  m_GameObject: {fileID: 1593856149030416}
+  m_Layer: 5
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Name: Checkmark
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_TagString: Untagged
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Icon: {fileID: 0}
-  m_Children: []
+  m_NavMeshLayer: 0
-  m_Father: {fileID: 224689090819966654}
+  m_StaticEditorFlags: 0
-  m_RootOrder: 1
+  m_IsActive: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 26.2}
-  m_SizeDelta: {x: -2, y: 8}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224585440547244708
 RectTransform:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1907169312238020}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -364,42 +377,38 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 80, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224689090819966654
+--- !u!222 &222703316487380818
-RectTransform:
+CanvasRenderer:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  m_GameObject: {fileID: 1825643745417846}
+  m_PrefabAsset: {fileID: 0}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_GameObject: {fileID: 1907169312238020}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_CullTransparentMesh: 0
-  m_LocalScale: {x: 0.9996732, y: 0.9996732, z: 0.9996732}
+--- !u!114 &114036865834897130
-  m_Children:
+MonoBehaviour:
-  - {fileID: 224731903690275734}
+  m_ObjectHideFlags: 0
-  - {fileID: 224062295758179050}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_Father: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
-  m_RootOrder: 0
+  m_PrefabAsset: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_GameObject: {fileID: 1907169312238020}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_Enabled: 1
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_EditorHideFlags: 0
-  m_AnchoredPosition: {x: -0.00020599365, y: -0.000048577785}
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_SizeDelta: {x: 80, y: 30}
+  m_Name: 
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_EditorClassIdentifier: 
---- !u!224 &224731903690275734
+  m_Material: {fileID: 0}
-RectTransform:
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_ObjectHideFlags: 1
+  m_RaycastTarget: 1
-  m_PrefabParentObject: {fileID: 0}
+  m_OnCullStateChanged:
-  m_PrefabInternal: {fileID: 100100000}
+    m_PersistentCalls:
-  m_GameObject: {fileID: 1715816119568964}
+      m_Calls: []
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Sprite: {fileID: 21300000, guid: f5046dd1741fc8040b2788a31ec04d06, type: 3}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_Type: 0
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_PreserveAspect: 0
-  m_Children:
+  m_FillCenter: 1
-  - {fileID: 224585440547244708}
+  m_FillMethod: 4
-  m_Father: {fileID: 224689090819966654}
+  m_FillAmount: 1
-  m_RootOrder: 0
+  m_FillClockwise: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_FillOrigin: 0
-  m_AnchorMin: {x: 0, y: 1}
+  m_UseSpriteMesh: 0
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.000011444092, y: 0}
-  m_SizeDelta: {x: 80, y: 30}
-  m_Pivot: {x: 0, y: 1}

Assets/Resources/Common/DrillImage.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: a154abe4e32fe7a43b83cf3da1cca573
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 83de988bb1148df4e9296cd3c81fa2d4
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Common/ExerciseImage.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 6d83b575f38f9434892287edf280d642
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 7bfbf30cfaef9f741a3464c9fba2741b
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/CommandCenter/PoliceToController.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 587e97f351681ec42960f5dc1448fb9d
+guid: d2ac4de1a047f734f8825c280b6d008d
+timeCreated: 1524530984
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/CommandSystem/Commands/FireDeployCameraDragExitCmd.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: ffb1eb4714af3ce4ba84a4e943791585
+guid: a2e515e3829b97c4482b5651c0846070
+timeCreated: 1529628186
+licenseType: Pro
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

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

@@ -404,6 +404,7 @@ public class TrappedMoveFree : MonoBehaviour
         if (info.gameObjID == GetComponent<BaseGameObjInfo>().gameObjID)
         {
             
+
             if (IsBefirstAirOrMoving)
             {
                 LoadPromptWin.Instance.LoadTextPromptWindow("该人员正在被急救或者移动，不能操作", 2f);
@@ -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))
+                if (Haemal > 50)
-                {
-                    LoadPromptWin.Instance.LoadTextPromptWindow("该人员已跟随移动", 1f);
-                    return;
-                }
-                else
                 {
-                    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/EquipSystem/MyFrame/UniRx/Scripts/UnityEngineBridge/Operators/SampleFrame.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: a769abeccb1b6924193ff4330ccd134b
+guid: e04c7fc1929a3db458bf7ae31bcd9e55
+timeCreated: 1455373901
+licenseType: Store
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/EquipSystem/MyFrame/UniRx/Scripts/UnityEngineBridge/Triggers/ObservableEventTrigger.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: d850189042209ed4a998d3204f882add
+guid: 48e93426b16d5454c89e8d47ccded1c5
+timeCreated: 1455373898
+licenseType: Store
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/GuDingShuipao/GuDingShuiPaoControl.cs

@@ -17,6 +17,7 @@ public struct ShuiPaoSyncData
     public Quaternion dizuoRotation;
     public Quaternion shuiQiangRotation;
 }
+
 public class GuDingShuiPaoControl : MonoBehaviour
 {
 
@@ -44,7 +45,10 @@ public class GuDingShuiPaoControl : MonoBehaviour
     public int RemianWater;
     public float AllUseWater;
     private float timer = 1f;
-
+    /// <summary>
+    /// 出水类型
+    /// </summary>
+    public SprayParticleType SpType;
     public SprayMode spraymode = SprayMode.PS30;
     void Start()
     {
@@ -52,7 +56,14 @@ public class GuDingShuiPaoControl : MonoBehaviour
         dizuo = transform.GetComponentInChildren<GuDingShuiPaoDiZuo>().gameObject;
         shuiQiang = transform.GetComponentInChildren<GuDingShuiPaoShuiQiang>().gameObject;
         gameObjectID = GetComponent<BaseGameObjInfo>().gameObjID;
-        waterStraightPrefab = Resources.Load<GameObject>("Particle/WaterStraight");
+        if(SpType==SprayParticleType.WaterStraight)
+        {
+            waterStraightPrefab = Resources.Load<GameObject>("Particle/WaterStraight");
+        }
+        if (SpType == SprayParticleType.Froth) 
+        {
+            waterStraightPrefab = Resources.Load<GameObject>("Particle/Froth");
+        }
         NetworkMessageDispatcher.AddListener("GUDINGSHUIPAO_CONTROL_SYNC", SetController);
         NetworkMessageDispatcher.AddListener("GUDINGSHUIPAO_DATA_SYNC", SetShuiPao);  
         SprayParameter spray = SprayParameter.GetInfo(SprayMode.PS30);

Assets/Scripts/Common/Menu/ModeImageLoad.cs

@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ModeImageLoad : MonoBehaviour
+{
+    /// <summary>
+    /// 是否是演习图片
+    /// </summary>
+    public bool IsDrillPanel;
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (IsDrillPanel)
+        {
+            Texture2D tex = Resources.Load<Texture2D>("Common/DrillImage");
+            GetComponent<Image>().sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), Vector2.one * 0.5f);
+        }
+        else 
+        {
+            Texture2D tex = Resources.Load<Texture2D>("Common/ExerciseImage");
+            GetComponent<Image>().sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), Vector2.one * 0.5f);
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/Common/Menu/ModeImageLoad.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 351eaed31d066ec48b3301f7af88d088
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/OperationalPreparation/XFSS.cs

@@ -39,11 +39,11 @@ public class XFSS : MonoBehaviour {
         {
             if (info.Value)
             {
-                transform.Find("Quad").gameObject.SetActive(false);
+                transform.Find("Quad").gameObject.SetActive(true);
             }
             else
             {
-                transform.Find("Quad").gameObject.SetActive(true);
+                transform.Find("Quad").gameObject.SetActive(false);
             }
         }
     }

Assets/Scripts/Common/OperationalPreparation/XFSSShowOrHide.cs

@@ -7,6 +7,25 @@ using UnityEngine.UI;
 
 public class XFSSShowOrHide : BaseToggle
 {
+    private void Start()
+    {
+        XFSS[] xfsshas = GameObject.Find("SceneAll").GetComponentsInChildren<XFSS>(true);
+        List<string> type = new List<string>();
+        for (int i = 0; i < xfsshas.Length; i++)
+        {
+            if (!type.Contains(xfsshas[i].type.ToString())) 
+            {
+                type.Add(xfsshas[i].type.ToString());
+            }
+        }
+        for (int i = 0; i < type.Count; i++)
+        {
+            if (!type.Contains(transform.Find("Label").GetComponent<Text>().text)) 
+            {
+                gameObject.SetActive(false);
+            }
+        }
+    }
     public override void RespondFun(bool value)
     {
         string XFSSTyepe = transform.Find("Label").GetComponent<Text>().text;

Assets/Scripts/Common/Police/CarMoveManager.cs

@@ -1,13 +1,33 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEngine.UI;
+using Newtonsoft.Json;
+
+[Serializable]
+public class PoliceRoadConfig
+{
+    public string SceneName;
+    public List<Vector2> AllRoadPos = new List<Vector2>();
+    public string ImagePath;
+}
 
 public class CarMoveManager : MonoBehaviour
 {
     public PowerMessage PowerMsg;
-    public GameObject[] RoadPoints;//移动拐点
+
+    public GameObject StartPos;
+    public GameObject EndPos;
+    public GameObject LineImageObj;
+    public Transform LineParent;
+    public Image BgImage;
+    public Transform LinePosParent;
+    public GameObject LinePosObj;
+
+    public List<Vector2> AllRoadPos = new List<Vector2>();
+    public List<GameObject> RoadPoints = new List<GameObject>();//移动拐点
     public GameObject Car;
     private float PathLength;
     private bool CanMove;
@@ -27,8 +47,14 @@ public class CarMoveManager : MonoBehaviour
 
     void Awake()
     {
+        LoadConfig();
+        //AllRoadPos.Clear();
+        //foreach (var item in RoadPoints)
+        //{
+        //    AllRoadPos.Add(item.GetComponent<RectTransform>().localPosition);
+        //}
         //读取路径长度作为总出警总距离
-        for (int i = 0; i < RoadPoints.Length - 1; i++)
+        for (int i = 0; i < RoadPoints.Count - 1; i++)
         {
             //PathLength += Vector2.Distance(RoadPoints[i].transform.position, RoadPoints[i + 1].transform.position);
             PathLength += Vector2.Distance(RoadPoints[i].GetComponent<RectTransform>().anchoredPosition,
@@ -43,7 +69,7 @@ public class CarMoveManager : MonoBehaviour
 
         float tempDis = 0;//当前段路径已移动多少距离
 
-        tempDis = Vector2.Distance(Car.GetComponent<RectTransform>().anchoredPosition , 
+        tempDis = Vector2.Distance(Car.GetComponent<RectTransform>().anchoredPosition,
             RoadPoints[index - 1].GetComponent<RectTransform>().anchoredPosition);
 
         float currentDis = movedDis + tempDis;
@@ -72,7 +98,7 @@ public class CarMoveManager : MonoBehaviour
     {
         if (CanMove)
         {
-            if (index < RoadPoints.Length)
+            if (index < RoadPoints.Count)
             {
                 //Car.transform.Translate((RoadPoints[index].transform.position - Car.transform.position).normalized * Time.deltaTime * Speed);
 
@@ -115,4 +141,131 @@ public class CarMoveManager : MonoBehaviour
             }
         }
     }
+
+    public void CreateBGLine(List<Vector2> AllRoadPos)
+    {
+        foreach (Transform t in LineParent)
+        {
+            Destroy(t.gameObject);
+        }
+        Car.transform.localPosition = AllRoadPos[0];
+        for (int i = 0; i < AllRoadPos.Count; i++)
+        {
+            if (i < AllRoadPos.Count - 1)
+                CreatLine(AllRoadPos[i], AllRoadPos[i + 1]);
+        }
+        Debug.Log("CreateLine");
+    }
+    public void CreatLine(Vector2 startPos, Vector2 endPos)
+    {
+        float length = Vector2.Distance(startPos, endPos);
+        GameObject lineImage = Instantiate(LineImageObj, LineParent);
+        lineImage.transform.localPosition = endPos;
+        lineImage.GetComponent<RectTransform>().sizeDelta = new Vector2(5, length);
+
+        double angle = Math.Atan2(startPos.y - endPos.y, startPos.x - endPos.x) * 180 / Math.PI;
+        lineImage.transform.rotation = Quaternion.Euler(0, 0, (float)angle + 270);
+    }
+
+    public void LoadBG(string bgPath)
+    {
+        string _path = Path.Combine(Application.dataPath + "/StreamingAssets", bgPath);//获取地址
+
+        FileStream _fileStream = new FileStream(_path, FileMode.Open, FileAccess.Read);//使用流数据读取
+
+        byte[] _buffur = new byte[_fileStream.Length];
+
+        _fileStream.Read(_buffur, 0, _buffur.Length);//转换成字节流数据
+
+        Texture2D _texture2d = new Texture2D((int)BgImage.rectTransform.rect.width, (int)BgImage.rectTransform.rect.height);//设置宽高
+
+        _texture2d.LoadImage(_buffur);//将流数据转换成Texture2D
+
+        Sprite _sprite = Sprite.Create(_texture2d, new Rect(0, 0, _texture2d.width, _texture2d.height), Vector3.zero);//创建一个Sprite
+
+        BgImage.sprite = _sprite;//赋值
+
+        Debug.Log("加载成功!");
+
+    }
+
+    public void LoadConfig()
+    {
+        var config = LoadPoliceConfig();
+        if (config == null)
+        {
+            Debug.Log("Null");
+            return;
+        }
+        LoadBG(config.ImagePath);
+        foreach (Transform t in LinePosParent)
+        {
+            Destroy(t.gameObject);
+        }
+        RoadPoints.Clear();
+        AllRoadPos.Clear();
+        foreach (var item in config.AllRoadPos)
+        {
+            GameObject linePos = Instantiate(LinePosObj, LinePosParent);
+            linePos.transform.localPosition = item;
+            RoadPoints.Add(linePos);
+            AllRoadPos.Add(item);
+        }
+        GameObject start = Instantiate(StartPos, LinePosParent);
+        start.transform.localPosition = AllRoadPos[0];
+        GameObject end = Instantiate(EndPos, LinePosParent);
+        end.transform.localPosition = AllRoadPos[AllRoadPos.Count - 1];
+        CreateBGLine(AllRoadPos);
+    }
+
+    PoliceRoadConfig LoadPoliceConfig()
+    {
+        PoliceRoadConfig result = null;
+        string json = null;
+        string path = Path.Combine(Application.streamingAssetsPath, "police/policeConfig.json");
+        if (File.Exists(path))
+        {
+            json = File.ReadAllText(path);
+        }
+        var data = JsonConvert.DeserializeObject<List<PoliceRoadConfig>>(json);
+        if (data != null)
+        {
+            foreach (PoliceRoadConfig obj in data)
+            {
+                if (GameSettings.othersSettings.mapname == obj.SceneName)
+                {
+                    result = obj;
+                    return result;
+                }
+            }
+        }
+        return result;
+    }
+    //private void LateUpdate()
+    //{
+    //    if (Input.GetKeyDown(KeyCode.T))
+    //    {
+    //        string jsonpath = Path.Combine(Application.streamingAssetsPath, "policeConfig.json");
+    //        PoliceRoadConfig config = new PoliceRoadConfig();
+    //        config.AllRoadPos = AllRoadPos;
+    //        config.ImagePath = "Police/PoliceTexture/行车路线.jpg";
+    //        config.SceneName = "场景名称";
+    //        List<PoliceRoadConfig> configs = new List<PoliceRoadConfig>();
+    //        configs.Add(config);
+    //        SaveJson(jsonpath, configs);
+    //    }
+    //}
+    ////把上面初始化的数据进行保存
+    //public void SaveJson(string JsonPath, List<PoliceRoadConfig> policeConfig)
+    //{
+    //    //如果本地没有对应的json 文件，重新创建
+    //    if (!File.Exists(JsonPath))
+    //    {
+    //        File.Create(JsonPath);
+    //    }
+    //    string json = JsonConvert.SerializeObject(policeConfig);
+
+    //    File.WriteAllText(JsonPath, json);
+    //    Debug.Log("保存成功");
+    //}
 }

Assets/Scripts/Common/Police/Prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3c085283236c7b745988156db3e3190c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/CarPoint.prefab

@@ -0,0 +1,115 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6471847221937162226
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6471847221937162227}
+  - component: {fileID: 6471847221937162229}
+  - component: {fileID: 6471847221937162228}
+  - component: {fileID: 6471847221937162230}
+  m_Layer: 5
+  m_Name: CarPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6471847221937162227
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6471847221937162226}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -298, y: -141.7}
+  m_SizeDelta: {x: 25, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6471847221937162229
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6471847221937162226}
+  m_CullTransparentMesh: 0
+--- !u!114 &6471847221937162228
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6471847221937162226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: e423f55d29d372a45bccd751e94e09f0, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!114 &6471847221937162230
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6471847221937162226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6471847221937162228}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Scripts/Common/Police/Prefab/CarPoint.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 54b74d72d9c70114592507759aba9672
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/EndPoint.prefab

@@ -0,0 +1,152 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8774760039319386078
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8774760039319386079}
+  - component: {fileID: 8774760039319386077}
+  - component: {fileID: 8774760039319386076}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8774760039319386079
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8774760039319386078}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8774760039522883319}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000024438, y: 6.9}
+  m_SizeDelta: {x: 15.6, y: 17.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8774760039319386077
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8774760039319386078}
+  m_CullTransparentMesh: 0
+--- !u!114 &8774760039319386076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8774760039319386078}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3}
+    m_FontSize: 13
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7EC8"
+--- !u!1 &8774760039522883318
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8774760039522883319}
+  - component: {fileID: 8774760039522883317}
+  - component: {fileID: 8774760039522883316}
+  m_Layer: 5
+  m_Name: EndPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8774760039522883319
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8774760039522883318}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8774760039319386079}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 259, y: -43.4}
+  m_SizeDelta: {x: 35, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8774760039522883317
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8774760039522883318}
+  m_CullTransparentMesh: 0
+--- !u!114 &8774760039522883316
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8774760039522883318}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: cddab3a1b1ac35c4a9d13a4a7c892dcb, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0

Assets/Scripts/Common/Police/Prefab/EndPoint.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 62c27588a05c06443937da86a7e7a98f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/LineImage.prefab

@@ -0,0 +1,74 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5778339470275892829
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5778339470275892826}
+  - component: {fileID: 5778339470275892824}
+  - component: {fileID: 5778339470275892827}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5778339470275892826
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5778339470275892829}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -258.32, y: -87.07502}
+  m_SizeDelta: {x: 72.7, y: 5}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &5778339470275892824
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5778339470275892829}
+  m_CullTransparentMesh: 0
+--- !u!114 &5778339470275892827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5778339470275892829}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.7794118, b: 0.29563898, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0

Assets/Scripts/Common/Police/Prefab/LineImage.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e7b95162f054b844b9f6543e598499d3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/LinePos.prefab

@@ -0,0 +1,74 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7979880848896225074
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7979880848896225075}
+  - component: {fileID: 7979880848896225073}
+  - component: {fileID: 7979880848896225072}
+  m_Layer: 5
+  m_Name: 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7979880848896225075
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7979880848896225074}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -228, y: -143}
+  m_SizeDelta: {x: 25, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7979880848896225073
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7979880848896225074}
+  m_CullTransparentMesh: 0
+--- !u!114 &7979880848896225072
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7979880848896225074}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: e423f55d29d372a45bccd751e94e09f0, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0

Assets/Scripts/Common/Police/Prefab/LinePos.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e564531e6eddf3a4dbf8399b8e702cf2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/Police.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7be83522b4a2a034a8562c78d5b6a1ac
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/StartPoint.prefab

@@ -0,0 +1,152 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1486422900866735205
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1486422900866735206}
+  - component: {fileID: 1486422900866735200}
+  - component: {fileID: 1486422900866735207}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1486422900866735206
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486422900866735205}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1486422901036558942}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000024438, y: 6.9}
+  m_SizeDelta: {x: 15.6, y: 17.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1486422900866735200
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486422900866735205}
+  m_CullTransparentMesh: 0
+--- !u!114 &1486422900866735207
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486422900866735205}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3}
+    m_FontSize: 13
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8D77"
+--- !u!1 &1486422901036558941
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1486422901036558942}
+  - component: {fileID: 1486422901036558936}
+  - component: {fileID: 1486422901036558943}
+  m_Layer: 5
+  m_Name: StartPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1486422901036558942
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486422901036558941}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1486422900866735206}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -298, y: -121}
+  m_SizeDelta: {x: 35, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1486422901036558936
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486422901036558941}
+  m_CullTransparentMesh: 0
+--- !u!114 &1486422901036558943
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486422901036558941}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 7745e7d5aa17fa243be2a1ddde3c0199, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0

Assets/Scripts/Common/Police/Prefab/StartPoint.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ad712fd4102923948b106b37e6f2a1a8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Common/Police/Prefab/万达广场.jpg.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 3d933c0626fd0cf41a7bb3afe718b884
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: da932ab7d59d74d438f776f881b080b8
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

Assets/Scripts/Common/RoomWaiting/RoomInfoPanel.cs

@@ -17,7 +17,8 @@ public class RoomInfoPanel : MonoBehaviour
     {
         //:ToDo
         //房间缩略图
-        //SelectSceneImage.sprite=
+        Texture2D tex= Resources.Load<Texture2D>("Common/DongYouLiQing");
+        SelectSceneImage.sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), Vector2.one * 0.5f);
         SetRoomInfo();
     }
 

Assets/Scripts/Common/Serialization/LinqExpressions/LinqInternal/Collections/ThreadSafe/NeedleReservoir.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 61b8936c2439ee144bdb17ca5e2ba70d
+guid: 528de640f10c3a341a781661cfd8ab9e
+timeCreated: 1503884892
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/LinqInternal/Threading/Disposable.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: fc308aa6461587542a39fc2a8bd96975
+guid: 7cb5ccd14899cd24191cf867a6f036eb
+timeCreated: 1503884893
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Action6.net35.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: d16a4f3867aacce469cc935b844d8fb7
+guid: 1b3aed509bc3c2d43825c499232d3bac
+timeCreated: 1503884891
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Dynamic/Utils/RuntimeOps.RuntimeVariableList.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: c5312a199773f8247a114f0ca76a174a
+guid: 305e9b4cdda820441855009d356118cc
+timeCreated: 1503884892
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Func6.net35.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 7eca3c7e320899347b3d8215c038bbab
+guid: c7b02a5fcb153184c8de744b5c0a4d4a
+timeCreated: 1503884895
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Linq/Expressions/Interpreter/LightDelegateCreator.net30.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 29ee5d72c4e327c40932415c569d566d
+guid: 404d0177aa294894c878ff91ad5cab2c
+timeCreated: 1503884892
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Linq/Expressions/LambdaExpression.net30.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 8bda9b320357b8c44b7501aa262736f6
+guid: 8bde42f6601746146b6e722a5a0cdcd2
+timeCreated: 1503884893
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Runtime/CompilerServices/CallerMemberNameAttribute.net40.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 563712e4ed51a534381ac5f9b4996003
+guid: 066bf66398027684fa5933e8ecd8b2f1
+timeCreated: 1503884891
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Runtime/CompilerServices/IteratorStateMachineAttribute.net40.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 7476257953c5555439927b1164b212ba
+guid: 780933673db74174db9cd1b73cabc0d7
+timeCreated: 1503884893
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/Common/Serialization/LinqExpressions/System/Threading/CountdownEvent.net35.cs.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 56f90dcd7826a9045ba965474c7dcf20
+guid: 4a275a33c5618b348b84abe50aec5777
+timeCreated: 1503884892
+licenseType: Free
 MonoImporter:
-  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

Assets/Scripts/DongYouLiQing/4GMap/FourthGCamCtrl.cs

@@ -4,7 +4,8 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class FourthGCamCtrl : MonoBehaviour {
+public class FourthGCamCtrl : MonoBehaviour
+{
     public Vector3 QuaterView = Vector3.zero;
     public float InitY;
     private static FourthGCamCtrl instance;
@@ -26,15 +27,16 @@ public class FourthGCamCtrl : MonoBehaviour {
     private Transform target;
     private Vector3 preTargetPosition;
     private bool lookOver = false;
-    private float height = 3; //查看人员模式下，摄像机高度
+    private float height = 1.5f; //查看人员模式下，摄像机高度
     private float distance = 2; //查看人员模式下，人与摄像机之间的距离
     private float dampTrace = 20.0f; //查看人员模式下，摄像机平滑追踪的变量
-    private float lookingAtHeight = 3.5f;
+    private float lookingAtHeight = 2f;
     private float lookingAtDistance = 5;
 
     private bool isQuading = false;
     // Use this for initialization
-    void Start () {
+    void Start()
+    {
         MessageDispatcher.AddListener("OpenFourthG", EnableCamera);
         MessageDispatcher.AddListener("QuadrupleMode", DisableCamera);
         MessageDispatcher.AddListener("4GNobodySelected", NobodySelected);
@@ -73,13 +75,13 @@ public class FourthGCamCtrl : MonoBehaviour {
     {
         var value = (bool)obj.Data;
         //如果打开了4G图传，又处于四分屏模式，则此相机禁用
-        if(value ==true && isQuading == true)
+        if (value == true && isQuading == true)
         {
             this.enabled = false;
             cam.enabled = false;
         }
         //如果打开了4G图传，未处于四分屏模式，则此相机激活
-        else if(value==true && isQuading == false)
+        else if (value == true && isQuading == false)
         {
             this.enabled = true;
             cam.enabled = true;
@@ -103,9 +105,10 @@ public class FourthGCamCtrl : MonoBehaviour {
         cam.enabled = !value;
     }
     // Update is called once per frame
-    void Update () {
+    void Update()
+    {
         //有目标人员并且相机激活时才执行
-        if (target != null && cam.enabled==true)
+        if (target != null && cam.enabled == true)
         {
             if (!lookOver)
             {
@@ -119,7 +122,7 @@ public class FourthGCamCtrl : MonoBehaviour {
                 transform.LookAt(target.position + (target.forward * lookingAtDistance) + (Vector3.up * lookingAtHeight));
             }
         }
-	}
+    }
     /// <summary>
     /// 查看人员视角
     /// </summary>

Assets/Scripts/DongYouLiQing/4GMap/QuadCamera.cs

@@ -4,14 +4,15 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class QuadCamera : MonoBehaviour {
+public class QuadCamera : MonoBehaviour
+{
     public CloneGameObjInfo info;
     public Transform target;
     private Camera myCam;
-    private float height = 3; //查看人员模式下，摄像机高度
+    private float height = 1.5f; //查看人员模式下，摄像机高度
     private float distance = 2; //查看人员模式下，人与摄像机之间的距离
     private float dampTrace = 20.0f; //查看人员模式下，摄像机平滑追踪的变量
-    private float lookingAtHeight = 3.5f;
+    private float lookingAtHeight = 2f;
     private float lookingAtDistance = 5;
     void Awake()
     {
@@ -53,7 +54,7 @@ public class QuadCamera : MonoBehaviour {
             return;
         }
         //打开图传面板时，在四分屏模式，则相机和此脚本开启
-        if (value==true && QuadrupleMode.quadingMode == true)
+        if (value == true && QuadrupleMode.quadingMode == true)
         {
             this.enabled = true;
             myCam.enabled = true;
@@ -84,7 +85,7 @@ public class QuadCamera : MonoBehaviour {
     void LateUpdate()
     {
         //有目标人员并且相机当前激活
-        if (target && myCam.enabled==true)
+        if (target && myCam.enabled == true)
         {
             //相机的位置，在人员胸前
             transform.position = Vector3.Lerp(transform.position, target.position + (target.forward * distance) + (Vector3.up * height), Time.deltaTime * dampTrace);

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

@@ -60,14 +60,14 @@ public class FireFightNormal : MonoBehaviour
         //将该火加入到对应的火堆字典中
         //因为蔓延火是在演练开始后才开始蔓延，所以能加进去
         //只加蔓延火
-        if (baseinfo.gameObjType==CloneObjType.SpreadedFire&&
+        if (baseinfo.gameObjType == CloneObjType.SpreadedFire &&
             GetComponent<SpreadedFireCtrl>())
         {
             long mainFireId = GetComponent<SpreadedFireCtrl>().fireGameObjID;
             SpreadFireController.fireStruckContainDic[mainFireId].Add(this);
         }
     }
-     void OnDisable()
+    void OnDisable()
     {
         if (GameSettings.othersSettings.isStartDrill)
         {
@@ -98,6 +98,20 @@ public class FireFightNormal : MonoBehaviour
                 if (SpreadFireController.fireStruckContainDic[mainFireId].Contains(this))
                 {
                     SpreadFireController.fireStruckContainDic[mainFireId].Remove(this);
+                    if (SpreadFireController.fireStruckContainDic[mainFireId].Count < 1)
+                    {
+                        EntitiesManager.Instance.DeleteObj(EntitiesManager.Instance.GetEntityByID(mainFireId));
+                        if (GameSettings.othersSettings.mode != Mode.DisasterManagement)
+                        {
+                            if (CurrentUserInfo.room != null && CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
+                            {
+                                BaseNetworkSyncDate arg = new BaseNetworkSyncDate();
+                                arg.SendUserID = CurrentUserInfo.mySelf.Id;
+                                arg.gameObjID = mainFireId;
+                                NetworkManager.Default.SendAsync("OBJ_DELECT_SYNC", arg);
+                            }
+                        }
+                    }
                 }
             }
 
@@ -124,7 +138,7 @@ public class FireFightNormal : MonoBehaviour
     void OnParticleCollision(GameObject other)
     {
 
-        if (CurrentUserInfo.room!=null&&CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
+        if (CurrentUserInfo.room != null && CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
         {
             if (baseinfo.gameObjType == CloneObjType.fireNormal)
             {
@@ -187,6 +201,7 @@ public class FireFightNormal : MonoBehaviour
                     transform.GetChild(i).gameObject.SetActive(false);
                 }
                 GetComponent<Collider>().enabled = false;
+                SpreadFireController.fireStruckContainDic[baseinfo.gameObjID].Remove(this);
             }
 
         }

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

@@ -20,7 +20,7 @@ public class SpreadFireController : MonoBehaviour
     /// <summary>
     /// 火堆字典，每个火堆对应几个火,key为火堆（主火id），list为这堆火由哪几个火组成
     /// </summary>
-    public  static Dictionary<long, List<FireFightNormal>> fireStruckContainDic = new Dictionary<long, List<FireFightNormal>>();
+    public static Dictionary<long, List<FireFightNormal>> fireStruckContainDic = new Dictionary<long, List<FireFightNormal>>();
     // Use this for initialization
     void Start()
     {
@@ -45,17 +45,17 @@ public class SpreadFireController : MonoBehaviour
     {
         if (GameSettings.othersSettings.isStartDrill)
         {
-            if (flag==false)
+            if (flag == false)
             {
                 GetFireStruckList();
                 GetfireStruckContainDic();
                 flag = true;
             }
-            if (CurrentUserInfo.mySelf==null||CurrentUserInfo.room==null) 
+            if (CurrentUserInfo.mySelf == null || CurrentUserInfo.room == null)
             {
                 return;
             }
-            if (CurrentUserInfo.mySelf.Id==CurrentUserInfo.room.Owner.UserInfo.Id)
+            if (CurrentUserInfo.mySelf.Id == CurrentUserInfo.room.Owner.UserInfo.Id)
             {
                 if (p_FireNormal.childCount > 0)
                 {
@@ -138,7 +138,7 @@ public class SpreadFireController : MonoBehaviour
     {
         for (int i = 0; i < fireNormalStruckList.Count; i++)
         {
-            if (fireStruckContainDic[fireNormalStruckList[i]].Count<1)
+            if (fireStruckContainDic[fireNormalStruckList[i]].Count < 1)
             {
                 fireStruckContainDic.Remove(fireNormalStruckList[i]);
                 fireNormalStruckList.Remove(fireNormalStruckList[i]);
@@ -162,21 +162,21 @@ public class SpreadFireController : MonoBehaviour
             {
                 //该火堆中每个火的baseinfo
                 BaseGameObjInfo info = nowstruck[j].GetComponent<BaseGameObjInfo>();
-                if (info.gameObjType==CloneObjType.fireNormal)
+                if (info.gameObjType == CloneObjType.fireNormal)
                 {
                     fireArea += info.GetComponent<FireSpreadCtrl>().fireAttribute.initialSize;
                 }
-                if(info.gameObjType == CloneObjType.SpreadedFire)
+                if (info.gameObjType == CloneObjType.SpreadedFire)
                 {
                     fireArea += 10;
                 }
-                if (info.GetComponent<FireFightNormal>().Straightwater.Count>0)
+                if (info.GetComponent<FireFightNormal>().Straightwater.Count > 0)
                 {
                     //作用在某个火的面积
                     for (int k = 0; k < info.GetComponent<FireFightNormal>().Straightwater.Count; k++)
                     {
                         WaterFightFire water = info.GetComponent<FireFightNormal>().Straightwater[k];
-                        if (water.GetComponentInParent<BaseGameObjInfo>().gameObjType == CloneObjType.fireman||
+                        if (water.GetComponentInParent<BaseGameObjInfo>().gameObjType == CloneObjType.fireman ||
                             water.GetComponentInParent<BaseGameObjInfo>().gameObjType == CloneObjType.FirefightingRobot)
                         {
                             waterControlArea += 50;
@@ -190,7 +190,8 @@ public class SpreadFireController : MonoBehaviour
             }
 
             //如果可以控制住
-            if (waterControlArea >= fireArea)
+
+            if (waterControlArea > fireArea)
             {
 
                 mainfire.GetComponent<FireSpreadCtrl>().BeController = true;
@@ -199,6 +200,7 @@ public class SpreadFireController : MonoBehaviour
             {
                 mainfire.GetComponent<FireSpreadCtrl>().BeController = false;
             }
+
         }
     }
 }

Assets/Scripts/DongYouLiQing/Common/OilTanks/OilTanksManager.cs

@@ -11,8 +11,17 @@ public class OilTanksManager : MonoBehaviour
     public Transform OilTankParent;
     private ToggleGroup FatherGroup;
     private List<OilTankMessage> AllList = new List<OilTankMessage>();
+    private void Awake()
+    {
+        if (GameSettings.othersSettings.SceneType != SceneType.化工建筑)
+        {
+            gameObject.SetActive(false);
+            return;
+        }
+    }
     void Start()
     {
+        
         //AllGuanQu = GameObject.Find("GuanQu_normal").transform;
         //for (int i = 0; i < AllGuanQu.childCount; i++)
         //{

Assets/Scripts/DongYouLiQing/LeadGroup/PoliceCall/PoliceCallPanel.cs

@@ -357,6 +357,8 @@ public class PoliceCallPanel : MonoBehaviour
                         }
                     }
                 }
+                Transform OilTankSet = transform.parent.Find("OilTankSet");
+                OilTankSet.GetComponent<OilSetManager>().SetInteractable();
 
             }
         }

Assets/StreamingAssets/Police.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f66e9ab1b4984b6439961ea88ba9df7b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Police/PoliceTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8bee62ce79bd6fc45b6f5f91de5cb30b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Police/PoliceTexture/万达广场.jpg.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 27b24c7b15df97d4480dba51c6e9b571
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Police/PoliceTexture/行车路线.jpg.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 99b77e1e80b87184d84efe9e127fa910
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Police/policeConfig.json

@@ -0,0 +1,58 @@
+[
+  {
+    "SceneName": "万达广场",
+    "AllRoadPos": [
+      {
+        "x": -237,
+        "y": 7
+      },
+      {
+        "x": -240,
+        "y": -21
+      },
+      {
+        "x": 82,
+        "y": -34
+      },
+      {
+        "x": 81,
+        "y": 61
+      },
+      {
+        "x": 202,
+        "y": 59
+      },
+      {
+        "x": 203,
+        "y": 88
+      }
+    ],
+    "ImagePath": "Police/PoliceTexture/万达广场.jpg"
+  },
+  {
+    "SceneName": "维多利亚酒店",
+    "AllRoadPos": [
+      {
+        "x": -331.1,
+        "y": 52.2
+      },
+      {
+        "x": -329.7,
+        "y": 19.7
+      },
+      {
+        "x": 231.0,
+        "y": 10.2
+      },
+      {
+        "x": 231.7,
+        "y": 55.9
+      },
+      {
+        "x": 254.7,
+        "y": 55.8
+      }
+    ],
+    "ImagePath": "Police/PoliceTexture/行车路线.jpg"
+  }
+]

Assets/StreamingAssets/Police/policeConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5f285ba54e8870a49b51fe57ede1839b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/UITexture/OperationalPreparations/夹攻.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 9
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
     filterMode: -1
     aniso: -1
     mipBias: -100
-    wrapU: -1
+    wrapU: 1
-    wrapV: -1
+    wrapV: 1
     wrapW: -1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -75,7 +75,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: f3206a587ed16d74ab8a3d25a8b970a9
     vertices: []
     indices: 
     edges: []