From 343f35a1a05e71fb13a1d946c22f87bd83c5786c Mon Sep 17 00:00:00 2001 From: "DESKTOP-KFV16CV\\cyt" <2268162076@qq.com> Date: Thu, 20 Aug 2020 14:35:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=BC=94=E7=BB=83=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=E6=94=BE=E5=9B=9E=E4=B8=BB=E8=8F=9C=E5=8D=95=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E8=A1=8C=E6=BC=94=E7=BB=83=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=9D=A2=E6=9D=BF=E6=8A=A5=E9=94=99=EF=BC=8C=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=B8=80=E4=BA=9B=E7=9B=91=E5=90=AC=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E8=84=9A=E6=9C=AC=E5=86=8D=E9=94=80=E6=AF=81?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E7=A7=BB=E9=99=A4=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E7=9B=91=E5=90=AC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FloatingFirePumpWaterSupply.prefab | 422 ++++++++++++++++++ .../FloatingFirePumpWaterSupply.prefab.meta | 9 + .../HandPumpWaterSupply.prefab | 422 ++++++++++++++++++ .../HandPumpWaterSupply.prefab.meta | 9 + .../OperationalPreparations.prefab | 24 +- .../SuctionFeedWaterSupply.prefab | 422 ++++++++++++++++++ .../SuctionFeedWaterSupply.prefab.meta | 9 + .../WaterLineWaterSupply.prefab | 422 ++++++++++++++++++ .../WaterLineWaterSupply.prefab.meta | 9 + .../ArrivedPower/ArrivedPowerPanel.cs | 4 + .../ExternalForce/ExternalForcePanel.cs | 6 +- .../InsiderFeedback/InsiderFeedbackPanel.cs | 4 + .../OnwayForce/OnwayForcePanel.cs | 4 + .../PoliceCallInfo/FireInfoPanel.cs | 4 + .../RescueInfo/RescueInfoPanel.cs | 4 + .../WaterSupply/WaterSupplyPanel.cs | 6 +- .../Common/EquipSystem/MyFrame/UIView.cs | 2 + .../ReceiveCars/CloneStayingAreaTool.cs | 3 +- .../Common/RoomWaiting/ROOM_LEAVE_SYNC.cs | 3 +- .../DongYouLiQing/4GMap/FourthGPanel.cs | 4 + .../WaterFightFire/FireFightNormal.cs | 5 +- .../WaterFightFire/SpreadFireController.cs | 10 + 22 files changed, 1794 insertions(+), 13 deletions(-) create mode 100644 Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab create mode 100644 Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab.meta create mode 100644 Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab create mode 100644 Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab.meta create mode 100644 Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab create mode 100644 Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab.meta create mode 100644 Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab create mode 100644 Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab.meta diff --git a/Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab b/Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab new file mode 100644 index 0000000..c48379c --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1148247713887916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224972471621970684} + - component: {fileID: 114403612465161820} + - component: {fileID: 114635340586303732} + - component: {fileID: 114591531280048846} + - component: {fileID: 114956532843001394} + - component: {fileID: 114075239032598686} + - component: {fileID: 114935792753302212} + - component: {fileID: 114485042176204860} + - component: {fileID: 114301095202566924} + - component: {fileID: 114125318052056994} + m_Layer: 5 + m_Name: FloatingFirePumpWaterSupply + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224972471621970684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224906417393091256} + - {fileID: 224961163375882256} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &114403612465161820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.8627451, g: 0.8627451, b: 0.8627451, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114080385516799526} + toggleTransition: 1 + graphic: {fileID: 114578437532049600} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &114635340586303732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55475a7d97e0f00459a5739bca447956, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114591531280048846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e39c327f4d4f474186d8845f48f9af7, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjID: 0 + gameObjType: 138 + UserID: 0 +--- !u!114 &114956532843001394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f1204e77200024a84a8d550f914c67, type: 3} + m_Name: + m_EditorClassIdentifier: + objWorldPos: {x: 0, y: 0, z: 0} +--- !u!114 &114075239032598686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee3b23ea672769749883ad8681ada933, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114935792753302212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8819a7368bf93b4eaa328041e614c1b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114485042176204860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 334806c1f69ec7d449c4626c419781c4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114301095202566924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1935e8bd7b3a88e41a1b126785992130, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114125318052056994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae617ee7dba472a44b125e6c5e4656e1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1433940898053094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224961163375882256} + - component: {fileID: 222304410534698680} + - component: {fileID: 114510696831788592} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224961163375882256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224972471621970684} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 34.1} + m_SizeDelta: {x: 95.5, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222304410534698680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_CullTransparentMesh: 0 +--- !u!114 &114510696831788592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6D6E\u8247\u6CF5\u4F9B\u6C34" +--- !u!1 &1750129140566690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224906417393091256} + - component: {fileID: 222464250020217658} + - component: {fileID: 114080385516799526} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224906417393091256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224245478564030882} + m_Father: {fileID: 224972471621970684} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.000030517578, y: 0.000015258789} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &222464250020217658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_CullTransparentMesh: 0 +--- !u!114 &114080385516799526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 254f33bcc20040b449515fab3cf1e3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &1965346976440328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224245478564030882} + - component: {fileID: 222665646177239054} + - component: {fileID: 114578437532049600} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224245478564030882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224906417393091256} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222665646177239054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_CullTransparentMesh: 0 +--- !u!114 &114578437532049600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ee1c02970f7ee494caf17eb239c03f2c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab.meta b/Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab.meta new file mode 100644 index 0000000..777e86e --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/FloatingFirePumpWaterSupply.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 62c80c311becada438bcb5f850304fc9 +timeCreated: 1530492418 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab b/Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab new file mode 100644 index 0000000..db1064c --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1148247713887916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224972471621970684} + - component: {fileID: 114403612465161820} + - component: {fileID: 114635340586303732} + - component: {fileID: 114591531280048846} + - component: {fileID: 114956532843001394} + - component: {fileID: 114075239032598686} + - component: {fileID: 114935792753302212} + - component: {fileID: 114485042176204860} + - component: {fileID: 114301095202566924} + - component: {fileID: 114125318052056994} + m_Layer: 5 + m_Name: HandPumpWaterSupply + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224972471621970684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224906417393091256} + - {fileID: 224961163375882256} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &114403612465161820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.8627451, g: 0.8627451, b: 0.8627451, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114080385516799526} + toggleTransition: 1 + graphic: {fileID: 114578437532049600} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &114635340586303732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55475a7d97e0f00459a5739bca447956, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114591531280048846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e39c327f4d4f474186d8845f48f9af7, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjID: 0 + gameObjType: 137 + UserID: 0 +--- !u!114 &114956532843001394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f1204e77200024a84a8d550f914c67, type: 3} + m_Name: + m_EditorClassIdentifier: + objWorldPos: {x: 0, y: 0, z: 0} +--- !u!114 &114075239032598686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee3b23ea672769749883ad8681ada933, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114935792753302212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8819a7368bf93b4eaa328041e614c1b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114485042176204860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 334806c1f69ec7d449c4626c419781c4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114301095202566924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1935e8bd7b3a88e41a1b126785992130, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114125318052056994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae617ee7dba472a44b125e6c5e4656e1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1433940898053094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224961163375882256} + - component: {fileID: 222304410534698680} + - component: {fileID: 114510696831788592} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224961163375882256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224972471621970684} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 34.1} + m_SizeDelta: {x: 95.5, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222304410534698680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_CullTransparentMesh: 0 +--- !u!114 &114510696831788592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u624B\u53F0\u6CF5\u4F9B\u6C34" +--- !u!1 &1750129140566690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224906417393091256} + - component: {fileID: 222464250020217658} + - component: {fileID: 114080385516799526} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224906417393091256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224245478564030882} + m_Father: {fileID: 224972471621970684} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.000030517578, y: 0.000015258789} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &222464250020217658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_CullTransparentMesh: 0 +--- !u!114 &114080385516799526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 254f33bcc20040b449515fab3cf1e3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &1965346976440328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224245478564030882} + - component: {fileID: 222665646177239054} + - component: {fileID: 114578437532049600} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224245478564030882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224906417393091256} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222665646177239054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_CullTransparentMesh: 0 +--- !u!114 &114578437532049600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ee1c02970f7ee494caf17eb239c03f2c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab.meta b/Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab.meta new file mode 100644 index 0000000..d2bbc20 --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/HandPumpWaterSupply.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d9771f206fcb9e149bf1c9497d196556 +timeCreated: 1530492418 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab b/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab index 7c9a766..79117bb 100644 --- a/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab +++ b/Assets/Prefabs/Common/OperationalPreparations/OperationalPreparations.prefab @@ -2563,7 +2563,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ba7f93d8f17b754a98f558391fd66b4, type: 3} m_Name: m_EditorClassIdentifier: - clonePrefab: {fileID: 0} + clonePrefab: {fileID: 1148247713887916, guid: d9771f206fcb9e149bf1c9497d196556, + type: 3} cloneObjType: 137 --- !u!114 &114199595844236244 MonoBehaviour: @@ -2577,7 +2578,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 287f99325b529da41825211964308b58, type: 3} m_Name: m_EditorClassIdentifier: - ClonePrefab: {fileID: 0} + ClonePrefab: {fileID: 1148247713887916, guid: d9771f206fcb9e149bf1c9497d196556, + type: 3} CloneType: 137 --- !u!1 &1194503761589596 GameObject: @@ -6444,7 +6446,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ba7f93d8f17b754a98f558391fd66b4, type: 3} m_Name: m_EditorClassIdentifier: - clonePrefab: {fileID: 0} + clonePrefab: {fileID: 1148247713887916, guid: f4aae218ec55e0d4aa85c92dbab4198a, + type: 3} cloneObjType: 136 --- !u!114 &114308997018665374 MonoBehaviour: @@ -6458,7 +6461,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 287f99325b529da41825211964308b58, type: 3} m_Name: m_EditorClassIdentifier: - ClonePrefab: {fileID: 0} + ClonePrefab: {fileID: 1148247713887916, guid: f4aae218ec55e0d4aa85c92dbab4198a, + type: 3} CloneType: 136 --- !u!1 &1570555963216124 GameObject: @@ -8304,7 +8308,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ba7f93d8f17b754a98f558391fd66b4, type: 3} m_Name: m_EditorClassIdentifier: - clonePrefab: {fileID: 0} + clonePrefab: {fileID: 1148247713887916, guid: 958f2aef3ac67f2428cb679a360b0191, + type: 3} cloneObjType: 135 --- !u!114 &114107695142235756 MonoBehaviour: @@ -8318,7 +8323,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 287f99325b529da41825211964308b58, type: 3} m_Name: m_EditorClassIdentifier: - ClonePrefab: {fileID: 0} + ClonePrefab: {fileID: 1148247713887916, guid: 958f2aef3ac67f2428cb679a360b0191, + type: 3} CloneType: 135 --- !u!1 &1676188697509182 GameObject: @@ -8921,7 +8927,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ba7f93d8f17b754a98f558391fd66b4, type: 3} m_Name: m_EditorClassIdentifier: - clonePrefab: {fileID: 0} + clonePrefab: {fileID: 1148247713887916, guid: 62c80c311becada438bcb5f850304fc9, + type: 3} cloneObjType: 138 --- !u!114 &114172297556239748 MonoBehaviour: @@ -8935,7 +8942,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 287f99325b529da41825211964308b58, type: 3} m_Name: m_EditorClassIdentifier: - ClonePrefab: {fileID: 0} + ClonePrefab: {fileID: 1148247713887916, guid: 62c80c311becada438bcb5f850304fc9, + type: 3} CloneType: 138 --- !u!1 &1702113574758242 GameObject: diff --git a/Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab b/Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab new file mode 100644 index 0000000..177af1c --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1148247713887916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224972471621970684} + - component: {fileID: 114403612465161820} + - component: {fileID: 114635340586303732} + - component: {fileID: 114591531280048846} + - component: {fileID: 114956532843001394} + - component: {fileID: 114075239032598686} + - component: {fileID: 114935792753302212} + - component: {fileID: 114485042176204860} + - component: {fileID: 114301095202566924} + - component: {fileID: 114125318052056994} + m_Layer: 5 + m_Name: SuctionFeedWaterSupply + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224972471621970684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224906417393091256} + - {fileID: 224961163375882256} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &114403612465161820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.8627451, g: 0.8627451, b: 0.8627451, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114080385516799526} + toggleTransition: 1 + graphic: {fileID: 114578437532049600} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &114635340586303732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55475a7d97e0f00459a5739bca447956, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114591531280048846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e39c327f4d4f474186d8845f48f9af7, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjID: 0 + gameObjType: 136 + UserID: 0 +--- !u!114 &114956532843001394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f1204e77200024a84a8d550f914c67, type: 3} + m_Name: + m_EditorClassIdentifier: + objWorldPos: {x: 0, y: 0, z: 0} +--- !u!114 &114075239032598686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee3b23ea672769749883ad8681ada933, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114935792753302212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8819a7368bf93b4eaa328041e614c1b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114485042176204860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 334806c1f69ec7d449c4626c419781c4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114301095202566924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1935e8bd7b3a88e41a1b126785992130, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114125318052056994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae617ee7dba472a44b125e6c5e4656e1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1433940898053094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224961163375882256} + - component: {fileID: 222304410534698680} + - component: {fileID: 114510696831788592} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224961163375882256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224972471621970684} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 34.1} + m_SizeDelta: {x: 95.5, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222304410534698680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_CullTransparentMesh: 0 +--- !u!114 &114510696831788592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6392\u5438\u6C14\u4F9B\u6C34" +--- !u!1 &1750129140566690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224906417393091256} + - component: {fileID: 222464250020217658} + - component: {fileID: 114080385516799526} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224906417393091256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224245478564030882} + m_Father: {fileID: 224972471621970684} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.000030517578, y: 0.000015258789} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &222464250020217658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_CullTransparentMesh: 0 +--- !u!114 &114080385516799526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 254f33bcc20040b449515fab3cf1e3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &1965346976440328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224245478564030882} + - component: {fileID: 222665646177239054} + - component: {fileID: 114578437532049600} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224245478564030882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224906417393091256} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222665646177239054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_CullTransparentMesh: 0 +--- !u!114 &114578437532049600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ee1c02970f7ee494caf17eb239c03f2c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab.meta b/Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab.meta new file mode 100644 index 0000000..6d8f51a --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/SuctionFeedWaterSupply.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f4aae218ec55e0d4aa85c92dbab4198a +timeCreated: 1530492418 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab b/Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab new file mode 100644 index 0000000..ae76f00 --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1148247713887916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224972471621970684} + - component: {fileID: 114403612465161820} + - component: {fileID: 114635340586303732} + - component: {fileID: 114591531280048846} + - component: {fileID: 114956532843001394} + - component: {fileID: 114075239032598686} + - component: {fileID: 114935792753302212} + - component: {fileID: 114485042176204860} + - component: {fileID: 114301095202566924} + - component: {fileID: 114125318052056994} + m_Layer: 5 + m_Name: WaterLineWaterSupply + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224972471621970684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224906417393091256} + - {fileID: 224961163375882256} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &114403612465161820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.8627451, g: 0.8627451, b: 0.8627451, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114080385516799526} + toggleTransition: 1 + graphic: {fileID: 114578437532049600} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 0 +--- !u!114 &114635340586303732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55475a7d97e0f00459a5739bca447956, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114591531280048846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e39c327f4d4f474186d8845f48f9af7, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjID: 0 + gameObjType: 132 + UserID: 0 +--- !u!114 &114956532843001394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f1204e77200024a84a8d550f914c67, type: 3} + m_Name: + m_EditorClassIdentifier: + objWorldPos: {x: 0, y: 0, z: 0} +--- !u!114 &114075239032598686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee3b23ea672769749883ad8681ada933, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114935792753302212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8819a7368bf93b4eaa328041e614c1b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114485042176204860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 334806c1f69ec7d449c4626c419781c4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114301095202566924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1935e8bd7b3a88e41a1b126785992130, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114125318052056994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148247713887916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae617ee7dba472a44b125e6c5e4656e1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1433940898053094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224961163375882256} + - component: {fileID: 222304410534698680} + - component: {fileID: 114510696831788592} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224961163375882256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224972471621970684} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 34.1} + m_SizeDelta: {x: 95.5, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222304410534698680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_CullTransparentMesh: 0 +--- !u!114 &114510696831788592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433940898053094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: eb3d4c61201564c4a83060e3db7ad0cb, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8FD0\u6C34\u4F9B\u6C34" +--- !u!1 &1750129140566690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224906417393091256} + - component: {fileID: 222464250020217658} + - component: {fileID: 114080385516799526} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224906417393091256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224245478564030882} + m_Father: {fileID: 224972471621970684} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.000030517578, y: 0.000015258789} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &222464250020217658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_CullTransparentMesh: 0 +--- !u!114 &114080385516799526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750129140566690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 254f33bcc20040b449515fab3cf1e3bb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &1965346976440328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224245478564030882} + - component: {fileID: 222665646177239054} + - component: {fileID: 114578437532049600} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224245478564030882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224906417393091256} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222665646177239054 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_CullTransparentMesh: 0 +--- !u!114 &114578437532049600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1965346976440328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: ee1c02970f7ee494caf17eb239c03f2c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab.meta b/Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab.meta new file mode 100644 index 0000000..e406fb4 --- /dev/null +++ b/Assets/Prefabs/Common/OperationalPreparations/WaterLineWaterSupply.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 958f2aef3ac67f2428cb679a360b0191 +timeCreated: 1530492418 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ArrivedPower/ArrivedPowerPanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ArrivedPower/ArrivedPowerPanel.cs index a3ca1df..b0e153f 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ArrivedPower/ArrivedPowerPanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ArrivedPower/ArrivedPowerPanel.cs @@ -12,6 +12,10 @@ public class ArrivedPowerPanel : MonoBehaviour { CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); } + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.ArrivedForce.ToString(), OpenPanel); + } private void closeClick() { MessageDispatcher.SendMessage("CloseFireInfoPanel", (int)FireInfoMessage.ArrivedForce); diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ExternalForce/ExternalForcePanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ExternalForce/ExternalForcePanel.cs index b5a350b..a9eb47f 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ExternalForce/ExternalForcePanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/ExternalForce/ExternalForcePanel.cs @@ -11,7 +11,11 @@ public class ExternalForcePanel : MonoBehaviour { CloseButton = transform.Find("HeadTitleBG/CloseButton").GetComponent(); CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); - } + } + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.ExternalForce.ToString(), OpenPanel); + } private void closeClick() { MessageDispatcher.SendMessage("CloseFireInfoPanel", (int)FireInfoMessage.ExternalForce); diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/InsiderFeedback/InsiderFeedbackPanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/InsiderFeedback/InsiderFeedbackPanel.cs index 4a40f11..fa7ab82 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/InsiderFeedback/InsiderFeedbackPanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/InsiderFeedback/InsiderFeedbackPanel.cs @@ -12,6 +12,10 @@ public class InsiderFeedbackPanel : MonoBehaviour { CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); } + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.InsiderFeedback.ToString(), OpenPanel); + } private void closeClick() { MessageDispatcher.SendMessage("CloseFireInfoPanel", (int)FireInfoMessage.InsiderFeedback); diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/OnwayForce/OnwayForcePanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/OnwayForce/OnwayForcePanel.cs index 0873e2f..384506b 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/OnwayForce/OnwayForcePanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/OnwayForce/OnwayForcePanel.cs @@ -12,6 +12,10 @@ public class OnwayForcePanel : MonoBehaviour { CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); } + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.OnWayForce.ToString(), OpenPanel); + } private void closeClick() { MessageDispatcher.SendMessage("CloseFireInfoPanel", (int)FireInfoMessage.OnWayForce); diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/PoliceCallInfo/FireInfoPanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/PoliceCallInfo/FireInfoPanel.cs index f1ab792..d1fb1dd 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/PoliceCallInfo/FireInfoPanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/PoliceCallInfo/FireInfoPanel.cs @@ -12,6 +12,10 @@ public class FireInfoPanel : MonoBehaviour { CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); } + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.AlarmMessage.ToString(), OpenPanel); + } private void closeClick() { MessageDispatcher.SendMessage("CloseFireInfoPanel", (int)FireInfoMessage.AlarmMessage); diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/RescueInfo/RescueInfoPanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/RescueInfo/RescueInfoPanel.cs index 84a7cdb..6ae1531 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/RescueInfo/RescueInfoPanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/RescueInfo/RescueInfoPanel.cs @@ -15,6 +15,10 @@ public class RescueInfoPanel : MonoBehaviour { CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); } + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.EvacuationAndRescue.ToString(), OpenPanel); + } private void closeClick() { MessageDispatcher.SendMessage("CloseFireInfoPanel", (int)FireInfoMessage.EvacuationAndRescue); diff --git a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/WaterSupply/WaterSupplyPanel.cs b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/WaterSupply/WaterSupplyPanel.cs index 30fb701..0dda8f8 100644 --- a/Assets/Scripts/Common/ChatSystem/FireSiteInfo/WaterSupply/WaterSupplyPanel.cs +++ b/Assets/Scripts/Common/ChatSystem/FireSiteInfo/WaterSupply/WaterSupplyPanel.cs @@ -14,7 +14,11 @@ public class WaterSupplyPanel : MonoBehaviour { CloseButton.OutInterFaceButton = closeClick; gameObject.SetActive(false); } - void OpenPanel(IMessage obj) + private void OnDestroy() + { + MessageDispatcher.RemoveListener(FireInfoMessage.WaterSupplyReport.ToString(), OpenPanel); + } + void OpenPanel(IMessage obj) { var value = (bool)obj.Data; gameObject.SetActive(value); diff --git a/Assets/Scripts/Common/EquipSystem/MyFrame/UIView.cs b/Assets/Scripts/Common/EquipSystem/MyFrame/UIView.cs index a788317..64973dc 100644 --- a/Assets/Scripts/Common/EquipSystem/MyFrame/UIView.cs +++ b/Assets/Scripts/Common/EquipSystem/MyFrame/UIView.cs @@ -55,6 +55,8 @@ public abstract class UIView : MonoBehaviour //页面销毁是通知UIManager自己销毁了 public virtual void OnDestroy() { + OnShow = null; + OnHide = null; UIManager.DestroyView(ViewName); } } diff --git a/Assets/Scripts/Common/ReceiveCars/CloneStayingAreaTool.cs b/Assets/Scripts/Common/ReceiveCars/CloneStayingAreaTool.cs index 0319477..d993526 100644 --- a/Assets/Scripts/Common/ReceiveCars/CloneStayingAreaTool.cs +++ b/Assets/Scripts/Common/ReceiveCars/CloneStayingAreaTool.cs @@ -449,7 +449,8 @@ public class CloneStayingAreaTool : CloneBase//集结区调车时注意场景中 { //如果是全液面火 long guanID = allDisaster[i].GetComponent().TargetNormalID; - if (EntitiesManager.Instance.GetEntityByID(guanID).GetComponent()) + if (EntitiesManager.Instance.GetEntityByID(guanID) + && EntitiesManager.Instance.GetEntityByID(guanID).GetComponent()) { OilTankMessage msg = EntitiesManager.Instance.GetEntityByID(guanID).GetComponent(); float direction = msg.Tank_D; diff --git a/Assets/Scripts/Common/RoomWaiting/ROOM_LEAVE_SYNC.cs b/Assets/Scripts/Common/RoomWaiting/ROOM_LEAVE_SYNC.cs index 44e69e5..8ed950b 100644 --- a/Assets/Scripts/Common/RoomWaiting/ROOM_LEAVE_SYNC.cs +++ b/Assets/Scripts/Common/RoomWaiting/ROOM_LEAVE_SYNC.cs @@ -12,7 +12,8 @@ public class ROOM_LEAVE_SYNC : NetworkMessageBehaviour protected override void Execute(BinaryMessage message) { var info = message.Body.Deserialize(); - if (info.RoomId == CurrentUserInfo.room.Id) + if (CurrentUserInfo.room!=null&& + info.RoomId == CurrentUserInfo.room.Id) { if (CurrentUserInfo.mySelf.Id == info.UserData.UserInfo.Id) {//返回本人处理 diff --git a/Assets/Scripts/DongYouLiQing/4GMap/FourthGPanel.cs b/Assets/Scripts/DongYouLiQing/4GMap/FourthGPanel.cs index 5811233..f0b05f6 100644 --- a/Assets/Scripts/DongYouLiQing/4GMap/FourthGPanel.cs +++ b/Assets/Scripts/DongYouLiQing/4GMap/FourthGPanel.cs @@ -12,6 +12,10 @@ public class FourthGPanel : MonoBehaviour { MessageDispatcher.AddListener("OpenFourthG", ShowOrHidePanel); gameObject.SetActive(false); } + private void OnDestroy() + { + MessageDispatcher.RemoveListener("OpenFourthG", ShowOrHidePanel); + } void Start() { CloseButton.OutInterFaceButton = closeClick; diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/FireFightNormal.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/FireFightNormal.cs index c54df37..406bfbd 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/FireFightNormal.cs +++ b/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/FireFightNormal.cs @@ -89,7 +89,10 @@ public class FireFightNormal : MonoBehaviour GetComponent()) { long mainFireId = GetComponent().fireGameObjID; - SpreadFireController.fireStruckContainDic[mainFireId].Remove(this); + if (SpreadFireController.fireStruckContainDic[mainFireId].Contains(this)) + { + SpreadFireController.fireStruckContainDic[mainFireId].Remove(this); + } } Straightwater.Clear(); FrothList.Clear(); diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/SpreadFireController.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/SpreadFireController.cs index 521a5b4..a70bdf8 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/SpreadFireController.cs +++ b/Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/SpreadFireController.cs @@ -29,7 +29,17 @@ public class SpreadFireController : MonoBehaviour //p_watercannon = p_AllParent.Find("P_Tools/P_WaterCannon"); p_FireNormal = p_AllParent.Find("P_Disasters/P_FireNormal"); } + private void OnDestroy() + { + fireNormalStruckList.Clear(); + fireStruckContainDic.Clear(); + } + private void OnDisable() + { + fireNormalStruckList.Clear(); + fireStruckContainDic.Clear(); + } // Update is called once per frame void Update() {