替换图片

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/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/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/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();
 
             }
         }