Compare commits

...

3 Commits

  1. 715
      Assets/Scenes/DongYouLiQing.unity
  2. BIN
      Assets/Scenes/DongYouLiQing/NavMesh-NavMeshSuferCar.asset
  3. BIN
      Assets/Scenes/DongYouLiQing/NavMesh-NavMeshSuferMan.asset
  4. 4
      Assets/Scenes/Menu.unity
  5. 65
      Assets/Scripts/Common/HelpClasses/SceneType.cs
  6. 6
      Assets/Scripts/Common/Lobby/DisasterItem.cs
  7. 6
      Assets/Scripts/Common/Lobby/UpdateMaps.cs
  8. 4
      Assets/Scripts/Common/Menu/Menu.cs
  9. 4
      Assets/Scripts/Common/Menu/Systensetting/SystemSettig.cs
  10. 4
      Assets/Scripts/Common/RoomWaiting/RoomInfoPanel.cs
  11. 5
      Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/FireFightNormal.cs
  12. 2
      Assets/StreamingAssets/MainMapXml.xml
  13. 4
      Assets/StreamingAssets/System.json
  14. 13
      ProjectSettings/ProjectSettings.asset
  15. 2
      ProjectSettings/QualitySettings.asset

715
Assets/Scenes/DongYouLiQing.unity

@ -51677,6 +51677,97 @@ MonoBehaviour:
id: 6977921559222561745
- component: {fileID: 623421843}
id: 6977921559222561746
--- !u!1 &626566667
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 626566671}
- component: {fileID: 626566670}
- component: {fileID: 626566669}
- component: {fileID: 626566668}
m_Layer: 15
m_Name: Cube (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &626566668
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 626566667}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &626566669
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 626566667}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &626566670
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 626566667}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &626566671
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 626566667}
m_LocalRotation: {x: 0, y: 0.09323945, z: 0, w: 0.99564373}
m_LocalPosition: {x: -295.6, y: 0.1, z: 154.4}
m_LocalScale: {x: 80, y: 0.01, z: 80}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 10.7, z: 0}
--- !u!1 &626697280 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6458301473593899211, guid: 3d33bbc1141aaeb4cb607ccfd2737e33,
@ -89459,6 +89550,22 @@ MonoBehaviour:
id: 6977921559222562131
- component: {fileID: 678398617}
id: 6977921559222562132
--- !u!114 &678398618
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 678398613}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
--- !u!1 &681592645 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 184092177697447403, guid: da398c2db7a06ed47aa399b00807ebaf,
@ -89559,6 +89666,22 @@ MonoBehaviour:
id: 6977921559222562186
- component: {fileID: 683723494}
id: 6977921559222562187
--- !u!114 &683723495
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 683723490}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_OverrideArea: 1
m_Area: 1
m_IgnoreFromBuild: 0
m_AffectedAgents: ffffffff
--- !u!1 &686320002 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5319515180965989479, guid: 335293fcea10fdb4ea9879c926d77fb0,
@ -128424,6 +128547,97 @@ MonoBehaviour:
id: 6855563786410005636
- component: {fileID: 807849571}
id: 6855563786410005637
--- !u!1 &810984259
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 810984263}
- component: {fileID: 810984262}
- component: {fileID: 810984261}
- component: {fileID: 810984260}
m_Layer: 15
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &810984260
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 810984259}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &810984261
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 810984259}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &810984262
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 810984259}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &810984263
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 810984259}
m_LocalRotation: {x: 0, y: 0.0806338, z: 0, w: 0.9967438}
m_LocalPosition: {x: -60.2, y: 0.05, z: 114.2}
m_LocalScale: {x: 400, y: 0.01, z: 35}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 9.25, z: 0}
--- !u!1 &812220044 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8026358135903518547, guid: da398c2db7a06ed47aa399b00807ebaf,
@ -129860,6 +130074,97 @@ MonoBehaviour:
id: 6855563786410007351
- component: {fileID: 880679533}
id: 6855563786410007352
--- !u!1 &881276454
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 881276458}
- component: {fileID: 881276457}
- component: {fileID: 881276456}
- component: {fileID: 881276455}
m_Layer: 15
m_Name: Cube (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &881276455
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881276454}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &881276456
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881276454}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &881276457
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881276454}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &881276458
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 881276454}
m_LocalRotation: {x: 0, y: 0.47255075, z: 0, w: 0.8813035}
m_LocalPosition: {x: 255.1, y: 0.1, z: 45.4}
m_LocalScale: {x: 80, y: 0.01, z: 80}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 56.4, z: 0}
--- !u!1 &892761308 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9113235920402983370, guid: 3d33bbc1141aaeb4cb607ccfd2737e33,
@ -139320,6 +139625,97 @@ MonoBehaviour:
id: 6977921559222561760
- component: {fileID: 1047810311}
id: 6977921559222561761
--- !u!1 &1050879432
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1050879436}
- component: {fileID: 1050879435}
- component: {fileID: 1050879434}
- component: {fileID: 1050879433}
m_Layer: 15
m_Name: Cube (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &1050879433
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050879432}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1050879434
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050879432}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &1050879435
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050879432}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1050879436
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050879432}
m_LocalRotation: {x: 0, y: 0.0806338, z: 0, w: 0.9967438}
m_LocalPosition: {x: -577, y: 0.05, z: 199}
m_LocalScale: {x: 483.99, y: 0.01, z: 35}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 9.25, z: 0}
--- !u!1 &1054116506 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5209772863912236613, guid: 3d33bbc1141aaeb4cb607ccfd2737e33,
@ -139741,6 +140137,97 @@ MonoBehaviour:
id: 6855563786410003392
- component: {fileID: 1083798232}
id: 6855563786410003393
--- !u!1 &1088092695
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1088092699}
- component: {fileID: 1088092698}
- component: {fileID: 1088092697}
- component: {fileID: 1088092696}
m_Layer: 15
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &1088092696
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088092695}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1088092697
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088092695}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &1088092698
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088092695}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1088092699
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088092695}
m_LocalRotation: {x: 0, y: 0.118923835, z: 0, w: 0.9929034}
m_LocalPosition: {x: 206.3, y: 0.05, z: 64.4}
m_LocalScale: {x: 150, y: 0.01, z: 35}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 13.66, z: 0}
--- !u!1 &1088537335 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7185737435873440009, guid: 3d33bbc1141aaeb4cb607ccfd2737e33,
@ -142705,7 +143192,7 @@ PrefabInstance:
- target: {fileID: 224001330236392204, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000003486904
value: 0.000019609253
objectReference: {fileID: 0}
- target: {fileID: 224123732978855200, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -142745,7 +143232,7 @@ PrefabInstance:
- target: {fileID: 224171116340244144, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000019404819
value: -0.00002864484
objectReference: {fileID: 0}
- target: {fileID: 224180419744436474, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -142770,7 +143257,7 @@ PrefabInstance:
- target: {fileID: 224181501778157638, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000010561932
value: 0.0000058736814
objectReference: {fileID: 0}
- target: {fileID: 224373752534357086, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -142850,7 +143337,7 @@ PrefabInstance:
- target: {fileID: 224756375583235730, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0000067947294
value: 0.000037279435
objectReference: {fileID: 0}
- target: {fileID: 224796681591186844, guid: 863dfe406d9716349adc35fb55cd722c,
type: 3}
@ -181518,6 +182005,102 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.size
value: 53
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[29]
value: 4
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[30]
value: 1
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[31]
value: 3
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[32]
value: 7
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[33]
value: 8
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[35]
value: 5
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[36]
value: 9
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[37]
value: 19
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[38]
value: 23
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[39]
value: 6
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[40]
value: 24
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[41]
value: 25
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[42]
value: 26
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[43]
value: 27
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[44]
value: 28
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[45]
value: 29
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[46]
value: 30
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[47]
value: 102
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[48]
value: 103
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[49]
value: 104
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[50]
value: 105
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[51]
value: 107
objectReference: {fileID: 0}
- target: {fileID: 74067600, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: CloneableTypes.Array.data[52]
value: 108
objectReference: {fileID: 0}
- target: {fileID: 640103531, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: m_StaticEditorFlags
value: 64
@ -181538,6 +182121,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 64
objectReference: {fileID: 0}
- target: {fileID: 2129577658, guid: 335293fcea10fdb4ea9879c926d77fb0, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 327700099475979648, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_StaticEditorFlags
@ -181711,13 +182298,18 @@ PrefabInstance:
- target: {fileID: 327700099475979758, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_Layer
value: 0
value: 16
objectReference: {fileID: 0}
- target: {fileID: 327700099475979758, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_StaticEditorFlags
value: 64
objectReference: {fileID: 0}
- target: {fileID: 327700099475979758, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 327700099475979760, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_StaticEditorFlags
@ -182258,6 +182850,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 64
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398608, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398610, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_StaticEditorFlags
@ -182308,6 +182905,16 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 64
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398692, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_Layer
value: 16
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398692, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398694, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_StaticEditorFlags
@ -182343,6 +182950,11 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 64
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398706, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6237348183828398708, guid: 335293fcea10fdb4ea9879c926d77fb0,
type: 3}
propertyPath: m_StaticEditorFlags
@ -183443,7 +184055,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 1386278505}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2129577657}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3}
m_Name:
@ -272006,6 +272618,97 @@ MonoBehaviour:
id: 6855563786410005440
- component: {fileID: 2072521674}
id: 6855563786410005441
--- !u!1 &2078615888
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2078615892}
- component: {fileID: 2078615891}
- component: {fileID: 2078615890}
- component: {fileID: 2078615889}
m_Layer: 15
m_Name: Cube (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &2078615889
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2078615888}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &2078615890
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2078615888}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &2078615891
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2078615888}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &2078615892
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2078615888}
m_LocalRotation: {x: 0, y: 0.1452197, z: 0, w: 0.98939943}
m_LocalPosition: {x: 488.1, y: 0.05, z: -25.9}
m_LocalScale: {x: 400, y: 0.01, z: 35}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 16.7, z: 0}
--- !u!1 &2084523993 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7185989094956967985, guid: 3d33bbc1141aaeb4cb607ccfd2737e33,

BIN
Assets/Scenes/DongYouLiQing/NavMesh-NavMeshSuferCar.asset

Binary file not shown.

BIN
Assets/Scenes/DongYouLiQing/NavMesh-NavMeshSuferMan.asset

Binary file not shown.

4
Assets/Scenes/Menu.unity

@ -662,7 +662,7 @@ MonoBehaviour:
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 1
m_IsOn: 0
--- !u!1 &158043993
GameObject:
m_ObjectHideFlags: 0
@ -4079,7 +4079,7 @@ MonoBehaviour:
onValueChanged:
m_PersistentCalls:
m_Calls: []
m_IsOn: 0
m_IsOn: 1
--- !u!1 &597455626
GameObject:
m_ObjectHideFlags: 0

65
Assets/Scripts/Common/HelpClasses/SceneType.cs

@ -2,9 +2,50 @@
using System.Collections.Generic;
using UnityEngine;
//public enum SceneType
//{
// None = -1,
// /// <summary>
// /// 高层建筑
// /// </summary>
// 高层建筑,
// /// <summary>
// /// 综合体建筑
// /// </summary>
// 综合体建筑,
// /// <summary>
// /// 化工建筑
// /// </summary>
// 化工建筑,
// /// <summary>
// /// 地下建筑
// /// </summary>
// 地下建筑,
// /// <summary>
// /// 大跨度
// /// </summary>
// 大跨度建筑,
// /// <summary>
// /// 地铁
// /// </summary>
// 地铁,
// /// <summary>
// /// 堆场, 仓库, 厂房
// /// </summary>
// 堆场_仓库_厂房 = 6,
// /// <summary>
// /// 隧道
// /// </summary>
// 隧道,
// /// <summary>
// /// 人员密集
// /// </summary>
// 人员密集,
//}
public enum SceneType
{
None,
None = -1,
/// <summary>
/// 高层建筑
/// </summary>
@ -20,6 +61,26 @@ public enum SceneType
/// <summary>
/// 地下建筑
/// </summary>
,
/// <summary>
/// 大跨度
/// </summary>
,
/// <summary>
/// 地铁
/// </summary>
,
/// <summary>
/// 堆场, 仓库, 厂房
/// </summary>
__,
/// <summary>
/// 隧道
/// </summary>
,
/// <summary>
/// 人员密集
/// </summary>
}

6
Assets/Scripts/Common/Lobby/DisasterItem.cs

@ -100,7 +100,8 @@ public class DisasterItem : MonoBehaviour {
victoryCondition.text = "XXXX";
timeSpeed.text = "XXX";
XiaQZDName.text = mapType.areaSquadron;
//注释掉了根据配置文件显示默认辖区中队
XiaQZDName.text = "XXX中队";// mapType.areaSquadron;
maxPersons = GameObject.Find("Canvas/Background/CreateRoom").GetComponent<GET_MAX_PERSONS_REPLY>().maxPersons;
personCount.text = maxPersons.ToString();
}
@ -143,7 +144,8 @@ public class DisasterItem : MonoBehaviour {
if (GameSettings.othersSettings.mode != Mode.None && GameSettings.othersSettings.mode != Mode.DisasterManagement)
{
timeSpeed.text = "XXX";
XiaQZDName.text = mapType.areaSquadron;
//注释掉了根据配置文件显示默认辖区中队
XiaQZDName.text = "XXX中队";//mapType.areaSquadron;
maxPersons = GameObject.Find("Canvas/Background/CreateRoom").GetComponent<GET_MAX_PERSONS_REPLY>().maxPersons;
personCount.text = maxPersons.ToString();
}

6
Assets/Scripts/Common/Lobby/UpdateMaps.cs

@ -55,7 +55,11 @@ public class UpdateMaps : MonoBehaviour {
{
sceneTp = SceneType.;
}
else if (sceneType == SceneType..ToString())
{
sceneTp = SceneType.;
}
var path = node.GetAttribute("Path");
var unit = Unit.None;

4
Assets/Scripts/Common/Menu/Menu.cs

@ -199,6 +199,10 @@ public class Menu : MonoBehaviour
{
sceneTp = SceneType.;
}
else if (sceneType == SceneType..ToString())
{
sceneTp = SceneType.;
}
var mapName = node.GetAttribute("MapName");
GameSettings.othersSettings.SceneType = sceneTp;
GameSettings.othersSettings.mapname = mapName;

4
Assets/Scripts/Common/Menu/Systensetting/SystemSettig.cs

@ -61,7 +61,7 @@ public class SystemSettig : MonoBehaviour
public const float DefultBgmValue = 0.5f;
public const float DefultSEValue = 0.5f;
public const bool DefultIsMute = false;
public const Frame DefultFrameSelect = Frame.;
public const Frame DefultFrameSelect = Frame.;
public static SystemSettig instance = null;
@ -133,7 +133,7 @@ public class SystemSettig : MonoBehaviour
//画面设置
if (sys.frameSelect == Frame.)
{
QualitySettings.SetQualityLevel(0);
QualitySettings.SetQualityLevel(1);
}
if (sys.frameSelect == Frame.)
{

4
Assets/Scripts/Common/RoomWaiting/RoomInfoPanel.cs

@ -28,6 +28,10 @@ public class RoomInfoPanel : MonoBehaviour
IntroduceText.text = CurrentUserInfo.room.Map.introduction;
Creater.text = CurrentUserInfo.room.Owner.UserInfo.Username;
ScenceType.text = CurrentUserInfo.room.Map.sceneType.ToString();
if (ScenceType.text== "堆场_仓库_厂房")
{
ScenceType.text = "堆场,仓库,厂房";
}
RoomNum.text = CurrentUserInfo.room.UserList.Count.ToString() + "/" + CurrentUserInfo.room.MaxPersons;
}

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

@ -201,7 +201,10 @@ public class FireFightNormal : MonoBehaviour
transform.GetChild(i).gameObject.SetActive(false);
}
GetComponent<Collider>().enabled = false;
SpreadFireController.fireStruckContainDic[baseinfo.gameObjID].Remove(this);
if (SpreadFireController.fireStruckContainDic.ContainsKey(baseinfo.gameObjID))
{
SpreadFireController.fireStruckContainDic[baseinfo.gameObjID].Remove(this);
}
}
}

2
Assets/StreamingAssets/MainMapXml.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Maps>
<Map MapName ="思杨木业" MapType="地下建筑" Path="DongYouLiQing" Hash="96b95d4b2b1ae1c6e9b4e1c4a379a50" Intro="思杨木业,地下建筑" XiaQZD="龙泾中队">
<Map MapName ="思杨木业" MapType="大跨度建筑" Path="DongYouLiQing" Hash="96b95d4b2b1ae1c6e9b4e1c4a379a50" Intro="思杨木业,大跨度建筑" XiaQZD="龙泾中队">
<DeptInfo>
<BaseInfo Id ="基本情况">

4
Assets/StreamingAssets/System.json

@ -1,9 +1,9 @@
{
"resolutionX": 1366,
"resolutionX": 1280,
"resolutionY": 768,
"isFullScreen": false,
"bgmValue": 0.4214285612106323,
"seValue": 0.443526953458786,
"isMuto": false,
"frameSelect": 1
"frameSelect": 3
}

13
ProjectSettings/ProjectSettings.asset

@ -615,7 +615,18 @@ PlayerSettings:
webGLCompressionFormat: 1
webGLLinkerTarget: 1
webGLThreadsSupport: 0
scriptingDefineSymbols: {}
scriptingDefineSymbols:
1: UNITY_POST_PROCESSING_STACK_V2
4: UNITY_POST_PROCESSING_STACK_V2
7: UNITY_POST_PROCESSING_STACK_V2
13: UNITY_POST_PROCESSING_STACK_V2
14: UNITY_POST_PROCESSING_STACK_V2
19: UNITY_POST_PROCESSING_STACK_V2
21: UNITY_POST_PROCESSING_STACK_V2
25: UNITY_POST_PROCESSING_STACK_V2
26: UNITY_POST_PROCESSING_STACK_V2
27: UNITY_POST_PROCESSING_STACK_V2
28: UNITY_POST_PROCESSING_STACK_V2
platformArchitecture: {}
scriptingBackend:
Standalone: 0

2
ProjectSettings/QualitySettings.asset

@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 5
m_CurrentQuality: 1
m_QualitySettings:
- serializedVersion: 2
name: Fastest

Loading…
Cancel
Save