网演东油沥青升到2018.4，注释了ab包的一个api的错（2018没有application.iswebplayer,网演没用到ab包）

5 years ago · 63f065408c
41 changed files with 1968 additions and 52 deletions
--- a/Assets/BoilOver/Editor/ImageEffects/BloomAndFlaresEditor.cs
+++ b/Assets/BoilOver/Editor/ImageEffects/BloomAndFlaresEditor.cs
@ -77,7 +77,7 @@ namespace UnityStandardAssets.ImageEffects
            // display info text when screen blend mode cannot be used
            Camera cam = (target as BloomAndFlares).GetComponent<Camera>();
            if (cam != null) {
-                if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
+                if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
                    EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", UnityEditor.MessageType.Info);
                }
            }
--- a/Assets/BoilOver/Editor/ImageEffects/BloomEditor.cs
+++ b/Assets/BoilOver/Editor/ImageEffects/BloomEditor.cs
@ -85,7 +85,7 @@ namespace UnityStandardAssets.ImageEffects
            // display info text when screen blend mode cannot be used
            Camera cam = (target as Bloom).GetComponent<Camera>();
            if (cam != null) {
-                if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
+                if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) {
                    EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", UnityEditor.MessageType.Info);
                }
            }
--- a/Assets/BoilOver/Editor/ImageEffects/TonemappingEditor.cs
+++ b/Assets/BoilOver/Editor/ImageEffects/TonemappingEditor.cs
@ -42,7 +42,7 @@ namespace UnityStandardAssets.ImageEffects

            Camera cam = (target as Tonemapping).GetComponent<Camera>();
            if (cam != null) {
-                if (!cam.hdr) {
+                if (!cam.allowHDR) {
                    EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", UnityEditor.MessageType.Warning);
                }
                else if (!(target as Tonemapping).validRenderTextureFormat) {
--- a/Assets/BoilOver/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs
+++ b/Assets/BoilOver/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs
@ -3,12 +3,12 @@ using UnityEngine.PostProcessing;

 namespace UnityEditor.PostProcessing
 {
-    [CustomPropertyDrawer(typeof(MinAttribute))]
+    [CustomPropertyDrawer(typeof(UnityEngine.MinAttribute))]
    sealed class MinDrawer : PropertyDrawer
    {
        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
        {
-            MinAttribute attribute = (MinAttribute)base.attribute;
+            UnityEngine.MinAttribute attribute = (UnityEngine.MinAttribute)base.attribute;

            if (property.propertyType == SerializedPropertyType.Integer)
            {
--- a/Assets/Effects/ImageEffects/Scripts/Bloom.cs
+++ b/Assets/Effects/ImageEffects/Scripts/Bloom.cs
@ -106,7 +106,7 @@ namespace UnityStandardAssets.ImageEffects

            doHdr = false;
            if (hdr == HDRBloomMode.Auto)
-                doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().hdr;
+                doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().allowHDR;
            else {
                doHdr = hdr == HDRBloomMode.On;
            }
--- a/Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs
+++ b/Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs
@ -109,7 +109,7 @@ namespace UnityStandardAssets.ImageEffects

            doHdr = false;
            if (hdr == HDRBloomMode.Auto)
-                doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().hdr;
+                doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent<Camera>().allowHDR;
            else
            {
                doHdr = hdr == HDRBloomMode.On;
--- a/Assets/Effects/ImageEffects/Scripts/SunShafts.cs
+++ b/Assets/Effects/ImageEffects/Scripts/SunShafts.cs
@ -90,7 +90,7 @@ namespace UnityStandardAssets.ImageEffects
            sunShaftsMaterial.SetVector ("_SunThreshold", sunThreshold);

            if (!useDepthTexture) {
-                var format= GetComponent<Camera>().hdr ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default;
+                var format= GetComponent<Camera>().allowHDR ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default;
                RenderTexture tmpBuffer = RenderTexture.GetTemporary (source.width, source.height, 0, format);
                RenderTexture.active = tmpBuffer;
                GL.ClearWithSkybox (false, GetComponent<Camera>());
--- a/Assets/DongYouLiQing/Models/Scene.FBX.meta
+++ b/Assets/DongYouLiQing/Models/Scene.FBX.meta
--- a/Assets/FBX/sundriesHeap.FBX.meta
+++ b/Assets/FBX/sundriesHeap.FBX.meta
@ -1,9 +1,7 @@
 fileFormatVersion: 2
 guid: 18418cddf14c8bf4c8809a80e066a8d5
-timeCreated: 1499130393
-licenseType: Pro
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
@ -12,10 +10,13 @@ ModelImporter:
    4300000: ZWD
    7400000: Take 001
    9500000: //RootNode
+    2186277476908879412: ImportLogs
+  externalObjects: {}
  materials:
    importMaterials: 0
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -28,12 +29,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations: []
    isReadable: 1
  meshes:
@ -41,22 +45,34 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 0
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 0
  copyAvatar: 0
  humanDescription:
@ -71,7 +87,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
--- a/Assets/Models/Car/Model/模型/YouLiaoBuChongChe.FBX.meta
+++ b/Assets/Models/Car/Model/模型/YouLiaoBuChongChe.FBX.meta
@ -1,9 +1,7 @@
 fileFormatVersion: 2
 guid: 8274cfee54367d243a0115fb6d5be9da
-timeCreated: 1507960014
-licenseType: Pro
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: YouGuanChe_MeshPart0
    100002: YouGuanChe_MeshPart1
@ -19,10 +17,93 @@ ModelImporter:
    4300002: YouGuanChe_MeshPart1
    7400000: Take 001
    9500000: //RootNode
+    2186277476908879412: ImportLogs
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 14 - Default
+    second: {fileID: 2100000, guid: af02aa07e9526754fbc8e44828a6592f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 15 - Default
+    second: {fileID: 2100000, guid: 265dc28796cc5f64a96151977ced58cf, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: "21 - \u53F0\u706F\u73BB\u7483"
+    second: {fileID: 2100000, guid: a610af0ab45f24e4fbdf9907ba4cf822, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_black_plastic
+    second: {fileID: 2100000, guid: e41ba0a24564c6741a9a6a9166500229, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_chrome
+    second: {fileID: 2100000, guid: 28ee26497e5dd0a4290a03565e73eb53, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_glass
+    second: {fileID: 2100000, guid: a2175083570eb554ba5aa0c900ae8f83, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_glass_black
+    second: {fileID: 2100000, guid: fbd282103d2f2eb48b16ac34c805a4cd, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_mirror
+    second: {fileID: 2100000, guid: 7594e605b5398ff42aa7c658d502dfe3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_orangelight
+    second: {fileID: 2100000, guid: d315194796d014f4c921aa7f854e5c5f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_orangelight2
+    second: {fileID: 2100000, guid: abe0f28e187e7fa4a911d6b80aadeef0, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_redlight
+    second: {fileID: 2100000, guid: 52ca801161bacaa41bd936ba688f0701, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Archmodels55_18_rims
+    second: {fileID: 2100000, guid: f2eef6ac008172746976461d214a9aae, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #4'
+    second: {fileID: 2100000, guid: 76d8ad62161ef714da548b772b12cb59, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: QIcaiche_baisequyu1
+    second: {fileID: 2100000, guid: 68383ecd218f59146a23f38317d2ca4f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: QIcaiche_jingdeng1
+    second: {fileID: 2100000, guid: 13479606a9bdad946ba473440c3b5566, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: QIcaiche_jingdenglanse1
+    second: {fileID: 2100000, guid: ba38e642f4b1acb44881451861017cf2, type: 2}
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -35,12 +116,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations: []
    isReadable: 1
  meshes:
@ -48,22 +132,34 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 3
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 0
  humanDescription:
@ -78,7 +174,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 1
--- a/Assets/Models/FireRobot/Models/FireRobot.FBX.meta
+++ b/Assets/Models/FireRobot/Models/FireRobot.FBX.meta
@ -24,6 +24,10 @@ ModelImporter:
    100032: Right_wheel5
    100034: Right_wheel6
    100036: Right_wheel7
+    100038: LvDai
+    100040: Pao1
+    100042: Pao2
+    100044: tank-treading
    400000: Body
    400002: //RootNode
    400004: Gunturret
@ -43,6 +47,10 @@ ModelImporter:
    400032: Right_wheel5
    400034: Right_wheel6
    400036: Right_wheel7
+    400038: LvDai
+    400040: Pao1
+    400042: Pao2
+    400044: tank-treading
    2300000: Body
    2300002: Gunturret
    2300004: Left_tread
@ -61,6 +69,10 @@ ModelImporter:
    2300030: Right_wheel5
    2300032: Right_wheel6
    2300034: Right_wheel7
+    2300036: LvDai
+    2300038: Pao1
+    2300040: Pao2
+    2300042: tank-treading
    3300000: Body
    3300002: Gunturret
    3300004: Left_tread
@ -79,6 +91,10 @@ ModelImporter:
    3300030: Right_wheel5
    3300032: Right_wheel6
    3300034: Right_wheel7
+    3300036: LvDai
+    3300038: Pao1
+    3300040: Pao2
+    3300042: tank-treading
    4300000: Body
    4300002: Gunturret
    4300004: Left_tread
@ -97,6 +113,11 @@ ModelImporter:
    4300030: Right_wheel5
    4300032: Right_wheel6
    4300034: Right_wheel7
+    4300036: tank-treading
+    4300038: LvDai
+    4300040: Pao1
+    4300042: Pao2
+    7400000: Take 001
    9500000: //RootNode
  materials:
    importMaterials: 1
--- a/Assets/Models/fireMan/Animations/DefaultAvatar@Idle_Neutral.fbx.meta
+++ b/Assets/Models/fireMan/Animations/DefaultAvatar@Idle_Neutral.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 7f3897eeab763384893aaa968540a171
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: Chest
    100002: chestProxy_geo
@ -479,10 +479,13 @@ ModelImporter:
    4300114: l_hipProxy_geo
    7400000: Idle
    9500000: //RootNode
+    2186277476908879412: ImportLogs
+  externalObjects: {}
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -500,12 +503,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 0
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations:
    - serializedVersion: 16
      name: Idle
@ -541,22 +547,34 @@ ModelImporter:
    globalScale: 0.01
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 0
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 1
  humanDescription:
@ -1289,7 +1307,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 0
--- a/Assets/Models/fireMan/Animations/DefaultAvatar@RunForward_NtrlFaceFwd.fbx.meta
+++ b/Assets/Models/fireMan/Animations/DefaultAvatar@RunForward_NtrlFaceFwd.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 1377652ab79f573439a1e79074742376
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: Character_Ctrl:Reference
    100002: Chest
@ -627,10 +627,13 @@ ModelImporter:
    4300114: l_hipProxy_geo
    7400000: Run
    9500000: //RootNode
+    2186277476908879412: ImportLogs
+  externalObjects: {}
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -645,12 +648,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 0
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations:
    - serializedVersion: 16
      name: Run
@ -686,22 +692,34 @@ ModelImporter:
    globalScale: 0.01
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 0
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 1
  humanDescription:
@ -1434,7 +1452,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 0
--- a/Assets/Models/fireMan/Animations/DefaultAvatar@WalkForward_NtrlFaceFwd.fbx.meta
+++ b/Assets/Models/fireMan/Animations/DefaultAvatar@WalkForward_NtrlFaceFwd.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 4daa93caa7f785a40a900f6203fd66da
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: Chest
    100002: chestProxy_geo
@ -475,10 +475,13 @@ ModelImporter:
    4300114: l_hipProxy_geo
    7400000: Walk
    9500000: //RootNode
+    2186277476908879412: ImportLogs
+  externalObjects: {}
  materials:
    importMaterials: 0
    materialName: 1
    materialSearch: 2
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -493,12 +496,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 0
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations:
    - serializedVersion: 16
      name: Walk
@ -534,22 +540,34 @@ ModelImporter:
    globalScale: 0.01
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 0
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 1
  humanDescription:
@ -1282,7 +1300,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 0
--- a/Assets/Models/fireMan/Model/XFY_Seven.fbx.meta
+++ b/Assets/Models/fireMan/Model/XFY_Seven.fbx.meta
@ -1,9 +1,7 @@
 fileFormatVersion: 2
 guid: 5a7103b964241fc44929c03f1f7170af
-timeCreated: 1509586135
-licenseType: Pro
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: BHF_Body
    100002: Bip01
@ -175,10 +173,103 @@ ModelImporter:
    13700028: pPipe1 2
    13700030: XiaoFangYuan_Body
    13700032: XiaoFangYuan_Hat
+    2186277476908879412: ImportLogs
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 02 - Default2
+    second: {fileID: 2100000, guid: 3fee1e744d69e04459177ea3b75eb734, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 02 - Default3
+    second: {fileID: 2100000, guid: 3fee1e744d69e04459177ea3b75eb734, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 02 - Default4
+    second: {fileID: 2100000, guid: 3fee1e744d69e04459177ea3b75eb734, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: FireMen_Helmet_T
+    second: {fileID: 2100000, guid: 329ecfa0474369241b7fa76da8417fec, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #1'
+    second: {fileID: 2100000, guid: ea7f8ced2ed04be47bb32c59251827ec, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #4'
+    second: {fileID: 2100000, guid: 9e439d4fcbe2a7a41971556416d99485, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: blinn6
+    second: {fileID: 2100000, guid: 5561cb983b27ded4aa19acde8c98c516, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: blinn7
+    second: {fileID: 2100000, guid: e77f9e7db788b464498572be0e0482da, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: body
+    second: {fileID: 2100000, guid: bc09a1939d950384e812f57f94622868, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: pasted__20 - Default
+    second: {fileID: 2100000, guid: 564834fe441ef45468327583db6dc0ca, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: xiaofangyuan_FHF1_xiaofangyuan_FHF_FHF_C
+    second: {fileID: 2100000, guid: be93f04e8df0c7747a01e43190491ed7, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: xiaofangyuan_FHF1_xiaofangyuan_FHF_blinn3
+    second: {fileID: 2100000, guid: 1e2ef6b47d719934ab00f79882ea5f77, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: xiaofangyuan_FHF1_xiaofangyuan_FHF_blinn4
+    second: {fileID: 2100000, guid: 075a9cc0892dd8848bf6e368d47b8c57, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: xiaofangyuan_FHF1_xiaofangyuan_FHF_lambert3
+    second: {fileID: 2100000, guid: 2a35e892ce4849f45b823855b53b32cf, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: zhandoufuhong
+    second: {fileID: 2100000, guid: f079afa8605cbd944a4a10ab7a3160c0, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: zhandoufuhongmao
+    second: {fileID: 2100000, guid: 4b127da3cbc4a224ebd28e8cc17775a8, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: zhandoufulvse
+    second: {fileID: 2100000, guid: 41f8ce39755317c4dae99e1a64509a78, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: zhandoufuyellowmao
+    second: {fileID: 2100000, guid: b1029068f37526f4d8a5ec05f5c85521, type: 2}
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -191,12 +282,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 3
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations: []
    isReadable: 1
  meshes:
@ -204,22 +298,34 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 3
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 0
  humanDescription:
@ -833,7 +939,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 1
    hasExtraRoot: 1
    skeletonHasParents: 1
--- a/Assets/Particles/ParticleSystem/Froth/model/cylinder001.FBX.meta
+++ b/Assets/Particles/ParticleSystem/Froth/model/cylinder001.FBX.meta
@ -1,9 +1,7 @@
 fileFormatVersion: 2
 guid: 3f26a6b918203a44989f61fcceffa271
-timeCreated: 1488344590
-licenseType: Pro
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
@ -11,26 +9,39 @@ ModelImporter:
    3300000: //RootNode
    4300000: Cylinder001
    4300002: Plane001
+    2186277476908879412: ImportLogs
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: No Name
+    second: {fileID: 2100000, guid: 784435bd0eae8ab40977b72be635e81c, type: 2}
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
    resampleCurves: 1
    optimizeGameObjects: 0
    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
    animationImportErrors: 
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations: []
    isReadable: 1
  meshes:
@ -38,25 +49,38 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 0
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 0
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 0
  humanDescription:
+    serializedVersion: 2
    human: []
    skeleton: []
    armTwist: 0.5
@ -68,6 +92,8 @@ ModelImporter:
    feetSpacing: 0
    rootMotionBoneName: 
    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 0
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  animationType: 0
  humanoidOversampling: 1
--- a/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab
+++ b/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab
--- a/Assets/Scene/DongYouLiQing.FBX.meta
+++ b/Assets/Scene/DongYouLiQing.FBX.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: c64ffadc27310f046930f1e1d1f68b6d
 ModelImporter:
-  serializedVersion: 19
+  serializedVersion: 23
  fileIDToRecycleName:
    100000: Arc017
    100002: Arc018
@ -1313,10 +1313,388 @@ ModelImporter:
    4300514: XiaoFangShuiGuan_001
    7400000: Take 001
    9500000: //RootNode
+    2186277476908879412: ImportLogs
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 02 - Default
+    second: {fileID: 2100000, guid: 080d85cf21dd0d847ba5960b5ee5209f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 03 - Default
+    second: {fileID: 2100000, guid: 6c46e11c514a0bd428d8be2f7164a7f2, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 06 - Default
+    second: {fileID: 2100000, guid: 998f6526126a8734cb07ae53649dd895, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 11 - Default
+    second: {fileID: 2100000, guid: 86915af2fb9cb794896cf13b53919e00, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 16 - Default
+    second: {fileID: 2100000, guid: a760d645e6d42b142955b0339d665d5d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 22 - Default
+    second: {fileID: 2100000, guid: 5e43fdec0b03fd64ab11694a6781aed3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: DYLQ_tietu
+    second: {fileID: 2100000, guid: 5dbbb9e46e878944facf65b63ab46c0b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: GuanDi
+    second: {fileID: 2100000, guid: 485a20310a0ead14686beb7abb6c06ac, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: HL
+    second: {fileID: 2100000, guid: f154e3cb1adb86443b87ef63b2a73818, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: HY-guanxian14
+    second: {fileID: 2100000, guid: d9d8fd8208b55cf4b94c730d3c455b72, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: HY-guanxian2
+    second: {fileID: 2100000, guid: 3341202c0c0417c4a8a7dcf95a7e18f7, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: HY-wall1
+    second: {fileID: 2100000, guid: 479665e2a7afb9d4286c067c5b952f71, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: HY-wall2
+    second: {fileID: 2100000, guid: a1fc455f9abace94ba911798cca3a65c, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #0'
+    second: {fileID: 2100000, guid: a41fb98fd02aa6441849d348aa72b81e, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #1'
+    second: {fileID: 2100000, guid: a48959f9b00dd4c4d863fd709a5a51a4, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #113'
+    second: {fileID: 2100000, guid: 0ca063fa116a06d4bbfdc34ae7b205f2, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #12'
+    second: {fileID: 2100000, guid: acac300248ab4c440a40303c5a168559, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #1275'
+    second: {fileID: 2100000, guid: d5102e94145b2b441a0765c4010d9927, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #130'
+    second: {fileID: 2100000, guid: c8b41873121af8f45927167d64edc59e, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #131'
+    second: {fileID: 2100000, guid: 3d4c5f3d374f1cf478e199894e7f6f62, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #14'
+    second: {fileID: 2100000, guid: 107712c012fe8f247bb71d57f0b18627, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #179'
+    second: {fileID: 2100000, guid: 3b6d3e13537735045a43e1a70647f65a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #2157'
+    second: {fileID: 2100000, guid: 3d4c5f3d374f1cf478e199894e7f6f62, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912358'
+    second: {fileID: 2100000, guid: 4d6b716608482af439eb85b3773bbf9a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912359'
+    second: {fileID: 2100000, guid: 5eeead697dacf8442809e1a3bd74b580, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912460'
+    second: {fileID: 2100000, guid: c9e0143a801f0984a988cbaba7e8ae64, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912565'
+    second: {fileID: 2100000, guid: 01a816bd11a93be4c91d57f0bb009bbf, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912566'
+    second: {fileID: 2100000, guid: c8a9bdb5cd4044346a4301c172b417a5, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912567'
+    second: {fileID: 2100000, guid: bb04b01be0f1cad4392bf08516b7640a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912568'
+    second: {fileID: 2100000, guid: 4dfa6bb5b8de83d499082904b0eae4eb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912569'
+    second: {fileID: 2100000, guid: 0915dcb0934c3b742b6053ce5af65333, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #219912870'
+    second: {fileID: 2100000, guid: 78d721bf7c9318243818f69ba10d6e50, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #25'
+    second: {fileID: 2100000, guid: 4b22de670fe4c7e408cbebeb83f3024f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #27'
+    second: {fileID: 2100000, guid: 36e6fbc6fa8a0d444925c71cd4ac4840, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #28'
+    second: {fileID: 2100000, guid: ac232a5cd29779044a135e767f0d5908, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #29'
+    second: {fileID: 2100000, guid: 67c0114ed458a5947be31023f5eacc82, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #332'
+    second: {fileID: 2100000, guid: b81865aaff3400946b79778390a0775a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #37'
+    second: {fileID: 2100000, guid: 3644d6601dafefc43886cae71894aec6, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #39'
+    second: {fileID: 2100000, guid: 8db1fe63fab0f0c4ba938bf6af52647f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #44'
+    second: {fileID: 2100000, guid: 1d3d4cc83d70b194d8da1a117158ba73, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #4436'
+    second: {fileID: 2100000, guid: d0cfec909ce60bd4783da6501c3880a2, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #49'
+    second: {fileID: 2100000, guid: 6f876b061885db44dae1e27857613109, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #50'
+    second: {fileID: 2100000, guid: c741a8476b80a7d4097d6f3cd5108ef7, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #5051'
+    second: {fileID: 2100000, guid: cb1082323130f8741ab2d1760dd6c7fb, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #5052'
+    second: {fileID: 2100000, guid: d5102e94145b2b441a0765c4010d9927, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #5054'
+    second: {fileID: 2100000, guid: 200ade67b4e8c1d4fb94c3efbeb1b96c, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #5055'
+    second: {fileID: 2100000, guid: 4767bd1f86b944b499e489bd4e8e4f72, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #51'
+    second: {fileID: 2100000, guid: 23e6c552bc6787541bd3103a9bf4ee6d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #64'
+    second: {fileID: 2100000, guid: 4b85e8684825f034a8facfacddb0b04f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #6447'
+    second: {fileID: 2100000, guid: 00e7540176c947f4bbc3ec43678a1f44, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #66'
+    second: {fileID: 2100000, guid: 3644d6601dafefc43886cae71894aec6, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #74'
+    second: {fileID: 2100000, guid: 200ade67b4e8c1d4fb94c3efbeb1b96c, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: 'Material #78'
+    second: {fileID: 2100000, guid: 4d6b716608482af439eb85b3773bbf9a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: PeiLou
+    second: {fileID: 2100000, guid: cbca1e916569c7842a88d656898495b4, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Shiwai_color
+    second: {fileID: 2100000, guid: 1de313bec9d46904289f8cbdc687fe2a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Standard_9
+    second: {fileID: 2100000, guid: 41e2f01d10a19e246a8508845ee8dbf5, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: baise
+    second: {fileID: 2100000, guid: b9074ca5fca87c34a9e15a97990367a3, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: biandao
+    second: {fileID: 2100000, guid: 6608a7ad6aa26eb40a991f0468d49a38, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: cao
+    second: {fileID: 2100000, guid: f56b97edbc446e24aaa535cdb124c1b8, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: cao2
+    second: {fileID: 2100000, guid: ae96b35877f305f409e72e05ad0620fd, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: changjing
+    second: {fileID: 2100000, guid: cca046108d38eaf48b1f0a96f302b21f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: color_color
+    second: {fileID: 2100000, guid: 6c42d8646d4d58049bb3ec44ce770c50, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: langan03
+    second: {fileID: 2100000, guid: 3d4c5f3d374f1cf478e199894e7f6f62, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: langan04
+    second: {fileID: 2100000, guid: 6f59d8971799d464397580ba9c472b5f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: luming
+    second: {fileID: 2100000, guid: 5d8cef50b658d7941ba5f2fce924b7e9, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: luya
+    second: {fileID: 2100000, guid: 48dc44e270ac9dd4bbb78d469a1e7be2, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: malu
+    second: {fileID: 2100000, guid: e61f0623d910a434e8ea2c821257c540, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: malu1
+    second: {fileID: 2100000, guid: b62a0dbee098c0a4991c6f600c3ce4fa, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: malu2
+    second: {fileID: 2100000, guid: 139bd8edd768bfc4cb15f39f278cce52, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: malu3
+    second: {fileID: 2100000, guid: 11d08f8a4983d3d4ca154c736014fea7, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: malu4
+    second: {fileID: 2100000, guid: d8a3d2de92ff1ce4ea18e7aef49a7877, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: pudi
+    second: {fileID: 2100000, guid: 4b85e8684825f034a8facfacddb0b04f, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: shenlamen
+    second: {fileID: 2100000, guid: 3e62e1f51edfff34f8a30e3f235bc93c, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: shui
+    second: {fileID: 2100000, guid: b9a4b66d50908e24c84f057f911f9385, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: stair
+    second: {fileID: 2100000, guid: 36e6fbc6fa8a0d444925c71cd4ac4840, type: 2}
  materials:
    importMaterials: 1
    materialName: 0
    materialSearch: 1
+    materialLocation: 0
  animations:
    legacyGenerateAnimations: 4
    bakeSimulation: 0
@ -1329,12 +1707,15 @@ ModelImporter:
    animationImportWarnings: 
    animationRetargetingWarnings: 
    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
    animationCompression: 1
    animationRotationError: 0.5
    animationPositionError: 0.5
    animationScaleError: 0.5
    animationWrapMode: 0
    extraExposedTransformPaths: []
+    extraUserProperties: []
    clipAnimations: []
    isReadable: 1
  meshes:
@ -1342,22 +1723,34 @@ ModelImporter:
    globalScale: 0.01
    meshCompression: 0
    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 0
    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
    swapUVChannels: 0
    generateSecondaryUV: 0
    useFileUnits: 1
    optimizeMeshForGPU: 1
    keepQuads: 0
    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 1
    secondaryUVAngleDistortion: 8
    secondaryUVAreaDistortion: 15.000001
    secondaryUVHardAngle: 88
    secondaryUVPackMargin: 4
    useFileScale: 0
+    previousCalculatedGlobalScale: 0.01
+    hasPreviousCalculatedGlobalScale: 1
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
    tangentImportMode: 4
+    normalCalculationMode: 0
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
  importAnimation: 1
  copyAvatar: 0
  humanDescription:
@ -1372,7 +1765,6 @@ ModelImporter:
    legStretch: 0.05
    feetSpacing: 0
    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
    hasTranslationDoF: 0
    hasExtraRoot: 0
    skeletonHasParents: 0
--- a/Assets/Scripts/Common/Disasters/FireLiquidLevelCtrl.cs
+++ b/Assets/Scripts/Common/Disasters/FireLiquidLevelCtrl.cs
@ -44,7 +44,7 @@ public class FireLiquidLevelCtrl : MonoBehaviour
        boxCollider = GetComponent<BoxCollider>();
        boxCol_fire = boxCollider.size;

-        box_smoke = smokePS.shape.box;
+        box_smoke = smokePS.shape.scale;
        pos_smoke = smokePS.transform.localPosition;

        FireScale = fireScale;
@ -156,7 +156,7 @@ public class FireLiquidLevelCtrl : MonoBehaviour
        SetRate(smokePS, 1f, 5f);
        SetStartSize(smokePS, 10f, 20f, 50f, 100f);
        var box_Smoke = smokePS.shape;
-        box_Smoke.box = new Vector3(GetValueAccordingStandardValue(1f, 20f),
+        box_Smoke.scale = new Vector3(GetValueAccordingStandardValue(1f, 20f),
                            GetValueAccordingStandardValue(1f, 20f), 
                            GetValueAccordingStandardValue(0.5f, 10f));
        smokePS.transform.localPosition = new Vector3(pos_smoke.x, GetValueAccordingStandardValue(20f, 28.4f), pos_smoke.z);
--- a/Assets/Scripts/Common/Disasters/FireSpread/FireInitialSizeSet.cs
+++ b/Assets/Scripts/Common/Disasters/FireSpread/FireInitialSizeSet.cs
@ -80,14 +80,14 @@ public class FireInitialSizeSet : MonoBehaviour {
        smokePSConstant = smokePS.emission.rateOverTime.constant;
        smokePSStartSizeCstMin = smokePS.main.startSize.constantMin;
        smokePSStartSizeCstMax = smokePS.main.startSize.constantMax;
-        smokePsShapBox = smokePS.shape.box;
+        smokePsShapBox = smokePS.shape.scale;
        smokePsLocalPos = smokePS.transform.localPosition;

        sparksConstant = Sparks.emission.rateOverTime.constant;
        sparksRadius = Sparks.shape.radius;

        glowConstant = Glow.emission.rateOverTime.constant;
-        glowShapBox = Glow.shape.box;
+        glowShapBox = Glow.shape.scale;

        fireLightRange = Firelight.range;

@ -145,7 +145,7 @@ public class FireInitialSizeSet : MonoBehaviour {
        SetEmission(ParticleType.smokePs, smokePS, factor);
        SetStartSize(ParticleType.smokePs, smokePS, factor);
        var box_Smoke = smokePS.shape;
-        box_Smoke.box = new Vector3(smokePsShapBox.x * factor, smokePsShapBox.y * factor, smokePsShapBox.z * factor);
+        box_Smoke.scale = new Vector3(smokePsShapBox.x * factor, smokePsShapBox.y * factor, smokePsShapBox.z * factor);
        smokePS.transform.localPosition = new Vector3(smokePsLocalPos.x, smokePsLocalPos.y * factor, smokePsLocalPos.z);

        SetEmission(ParticleType.sparksPs, Sparks, factor);
@ -154,7 +154,7 @@ public class FireInitialSizeSet : MonoBehaviour {

        SetEmission(ParticleType.glowPs, Glow, factor);
        var box_Glow = Glow.shape;
-        box_Glow.box = new Vector3(glowShapBox.x * factor, glowShapBox.y * factor, glowShapBox.z * factor);
+        box_Glow.scale = new Vector3(glowShapBox.x * factor, glowShapBox.y * factor, glowShapBox.z * factor);

        Firelight.range = fireLightRange * factor;

--- a/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/AssetBundleManager.cs
+++ b/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/AssetBundleManager.cs
@ -89,8 +89,8 @@ public class AssetBundleManager : Singleton<AssetBundleManager>
        if (Application.isEditor)
            //return "file://" + System.Environment.CurrentDirectory.Replace("\\", "/");
            return "file://" + Application.streamingAssetsPath;
-        else if (Application.isWebPlayer)
-            return Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets";
+        //else if (Application.isWebPlayer)
+        //    return Path.GetDirectoryName(Application.absoluteURL).Replace("\\", "/") + "/StreamingAssets";
        else if (Application.isMobilePlatform || Application.isConsolePlatform)
            return Application.streamingAssetsPath;
        else
@ -113,7 +113,7 @@ public class AssetBundleManager : Singleton<AssetBundleManager>
                return "Windows";
            case BuildTarget.StandaloneOSXIntel:
            case BuildTarget.StandaloneOSXIntel64:
-            case BuildTarget.StandaloneOSXUniversal:
+            case BuildTarget.StandaloneOSX:
                return "OSX";
            default:
                return null;
--- a/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/Editor/BuildScript.cs
+++ b/Assets/Scripts/Common/EquipSystem/MyFrame/AssetBundleSystem/Editor/BuildScript.cs
@ -55,7 +55,7 @@ public class BuildScript
                return "/test.exe";
            case BuildTarget.StandaloneOSXIntel:
            case BuildTarget.StandaloneOSXIntel64:
-            case BuildTarget.StandaloneOSXUniversal:
+            case BuildTarget.StandaloneOSX:
                return "/test.app";
            case BuildTarget.WebGL:
                return "";
--- a/Assets/Scripts/DongYouLiQing/Common/OilTanks/ParticleControl.cs
+++ b/Assets/Scripts/DongYouLiQing/Common/OilTanks/ParticleControl.cs
@ -117,13 +117,13 @@ public class ParticleControl : MonoBehaviour
    //方形发射器大小
    private void BoxShapContron()
    {
-        if (shap.box.x < BoxMax.x)
-            shap.box = new Vector3(shap.box.x + Time.deltaTime * BoxSpeed.x, shap.box.y, shap.box.z);
-        if (shap.box.y < BoxMax.y)
-            shap.box = new Vector3(shap.box.x, shap.box.y + Time.deltaTime * BoxSpeed.y, shap.box.z);
-        if (shap.box.z < BoxMax.z)
-            shap.box = new Vector3(shap.box.x, shap.box.y, shap.box.z + Time.deltaTime * BoxSpeed.z);
-        if (shap.box.x >= BoxMax.x && shap.box.y >= BoxMax.y && shap.box.z >= BoxMax.z)
+        if (shap.scale.x < BoxMax.x)
+            shap.scale = new Vector3(shap.scale.x + Time.deltaTime * BoxSpeed.x, shap.scale.y, shap.scale.z);
+        if (shap.scale.y < BoxMax.y)
+            shap.scale = new Vector3(shap.scale.x, shap.scale.y + Time.deltaTime * BoxSpeed.y, shap.scale.z);
+        if (shap.scale.z < BoxMax.z)
+            shap.scale = new Vector3(shap.scale.x, shap.scale.y, shap.scale.z + Time.deltaTime * BoxSpeed.z);
+        if (shap.scale.x >= BoxMax.x && shap.scale.y >= BoxMax.y && shap.scale.z >= BoxMax.z)
            CancelInvoke("BoxShapContron");
    }
 }
--- a/ProjectSettings/AudioManager.asset
+++ b/ProjectSettings/AudioManager.asset
--- a/ProjectSettings/ClusterInputManager.asset
+++ b/ProjectSettings/ClusterInputManager.asset
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
--- a/ProjectSettings/NavMeshAreas.asset
+++ b/ProjectSettings/NavMeshAreas.asset
--- a/ProjectSettings/NetworkManager.asset
+++ b/ProjectSettings/NetworkManager.asset
--- a/ProjectSettings/Physics2DSettings.asset
+++ b/ProjectSettings/Physics2DSettings.asset
--- a/ProjectSettings/PresetManager.asset
+++ b/ProjectSettings/PresetManager.asset
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -0,0 +1 @@
+m_EditorVersion: 2018.4.0f1
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
--- a/ProjectSettings/TimeManager.asset
+++ b/ProjectSettings/TimeManager.asset
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
--- a/ProjectSettings/VFXManager.asset
+++ b/ProjectSettings/VFXManager.asset