Browse Source

1.水幕水带粒子系统升级2018后失效

2、上次提交遗漏说明  作战部署供水系统手抬泵供水等四个添加功能   水火对抗,销毁后静态集合里的变量未清空重置
develop
曹衍涛 4 years ago
parent
commit
51c7c17a89
  1. 4700
      Assets/Particle System.prefab
  2. 7
      Assets/Particle System.prefab.meta
  3. 290
      Assets/Resources/WaterCurtain/WaterCurtain.prefab
  4. 3449
      Assets/Resources/WaterSupplyPanel.prefab
  5. 143
      Assets/Water.prefab
  6. 9
      Assets/Water.prefab.meta

4700
Assets/Particle System.prefab

File diff suppressed because it is too large Load Diff

7
Assets/Particle System.prefab.meta

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

290
Assets/Resources/WaterCurtain/WaterCurtain.prefab

@ -1,22 +1,12 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1041716355804418}
m_IsPrefabParent: 1
--- !u!1 &1041716355804418
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4302055756354436}
- component: {fileID: 114405765293043982}
@ -29,29 +19,12 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1375395428850024
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4923668204333578}
- component: {fileID: 15109425110499608}
- component: {fileID: 12341296527668980}
- component: {fileID: 26785794094080450}
m_Layer: 27
m_Name: Water
m_TagString: Water
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4302055756354436
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041716355804418}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
@ -61,123 +34,12 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4923668204333578
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1375395428850024}
m_LocalRotation: {x: -0.6598029, y: -0, z: -0, w: 0.75143874}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4302055756354436}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -82.57001, y: 0, z: 0}
--- !u!12 &12341296527668980
ParticleAnimator:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1375395428850024}
Does Animate Color?: 1
colorAnimation[0]:
serializedVersion: 2
rgba: 4294967295
colorAnimation[1]:
serializedVersion: 2
rgba: 4294967295
colorAnimation[2]:
serializedVersion: 2
rgba: 4294967295
colorAnimation[3]:
serializedVersion: 2
rgba: 3036676095
colorAnimation[4]:
serializedVersion: 2
rgba: 184549375
worldRotationAxis: {x: 0, y: 0, z: 0}
localRotationAxis: {x: 0, y: 0, z: 0}
sizeGrow: 3.3
rndForce: {x: 1, y: 1, z: 1}
force: {x: 0, y: 0, z: 0}
damping: 1
stopSimulation: 0
autodestruct: 0
--- !u!15 &15109425110499608
EllipsoidParticleEmitter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1375395428850024}
serializedVersion: 2
m_Enabled: 1
m_Emit: 1
minSize: 0.1
maxSize: 0.6
minEnergy: 1
maxEnergy: 1.2
minEmission: 150
maxEmission: 150
worldVelocity: {x: 0, y: 0, z: 0}
localVelocity: {x: 0, y: 0, z: 5}
rndVelocity: {x: 0.3, y: 0.3, z: 0.3}
emitterVelocityScale: 0.05
tangentVelocity: {x: 0, y: 0, z: 0}
angularVelocity: 0
rndAngularVelocity: 0
rndRotation: 0
Simulate in Worldspace?: 1
m_OneShot: 0
m_Ellipsoid: {x: 0, y: 0, z: 0}
m_MinEmitterRange: 0
--- !u!26 &26785794094080450
ParticleRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1375395428850024}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 66ca80b82027e4e489d8456571eb0257, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
serializedVersion: 2
m_CameraVelocityScale: 0
m_StretchParticles: 3
m_LengthScale: -0.11
m_VelocityScale: -0.1
m_MaxParticleSize: Infinity
UV Animation:
x Tile: 1
y Tile: 1
cycles: 1
--- !u!114 &114405765293043982
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041716355804418}
m_Enabled: 1
m_EditorHideFlags: 0
@ -193,25 +55,133 @@ MonoBehaviour:
Layer: 0
ShoworHidden: 0
FullName:
--- !u!114 &114537577496470532
--- !u!114 &114805360510228392
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041716355804418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2464d7cef42d4744b999e4d5e6d79de9, type: 3}
m_Script: {fileID: 11500000, guid: b437887f3d66a484b929548ef73d1c4e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114805360510228392
--- !u!114 &114537577496470532
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1041716355804418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b437887f3d66a484b929548ef73d1c4e, type: 3}
m_Script: {fileID: 11500000, guid: 2464d7cef42d4744b999e4d5e6d79de9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1375395428850024
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4923668204333578}
m_Layer: 27
m_Name: Water
m_TagString: Water
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4923668204333578
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1375395428850024}
m_LocalRotation: {x: -0.6598029, y: -0, z: -0, w: 0.75143874}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2663394080544695694}
m_Father: {fileID: 4302055756354436}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -82.57001, y: 0, z: 0}
--- !u!1001 &7563416965121786239
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4923668204333578}
m_Modifications:
- target: {fileID: 5717732125304230145, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_Name
value: Particle System
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 329732a314f9e9a4b8e8cfc4c876e0a2, type: 3}
--- !u!4 &2663394080544695694 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5476624975714706673, guid: 329732a314f9e9a4b8e8cfc4c876e0a2,
type: 3}
m_PrefabInstance: {fileID: 7563416965121786239}
m_PrefabAsset: {fileID: 0}

3449
Assets/Resources/WaterSupplyPanel.prefab

File diff suppressed because it is too large Load Diff

143
Assets/Water.prefab

@ -0,0 +1,143 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1736840874417750}
m_IsPrefabParent: 1
--- !u!1 &1736840874417750
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4889178593311160}
- component: {fileID: 15651453934412930}
- component: {fileID: 12955688597803586}
- component: {fileID: 26289250683432212}
m_Layer: 27
m_Name: Water
m_TagString: Water
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4889178593311160
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1736840874417750}
m_LocalRotation: {x: -0.6598029, y: -0, z: -0, w: 0.75143874}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -82.57001, y: 0, z: 0}
--- !u!12 &12955688597803586
ParticleAnimator:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1736840874417750}
Does Animate Color?: 1
colorAnimation[0]:
serializedVersion: 2
rgba: 4294967295
colorAnimation[1]:
serializedVersion: 2
rgba: 4294967295
colorAnimation[2]:
serializedVersion: 2
rgba: 4294967295
colorAnimation[3]:
serializedVersion: 2
rgba: 3036676095
colorAnimation[4]:
serializedVersion: 2
rgba: 184549375
worldRotationAxis: {x: 0, y: 0, z: 0}
localRotationAxis: {x: 0, y: 0, z: 0}
sizeGrow: 3.3
rndForce: {x: 1, y: 1, z: 1}
force: {x: 0, y: 0, z: 0}
damping: 1
stopSimulation: 0
autodestruct: 0
--- !u!15 &15651453934412930
EllipsoidParticleEmitter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1736840874417750}
serializedVersion: 2
m_Enabled: 1
m_Emit: 1
minSize: 0.1
maxSize: 0.6
minEnergy: 1
maxEnergy: 1.2
minEmission: 150
maxEmission: 150
worldVelocity: {x: 0, y: 0, z: 0}
localVelocity: {x: 0, y: 0, z: 5}
rndVelocity: {x: 0.3, y: 0.3, z: 0.3}
emitterVelocityScale: 0.05
tangentVelocity: {x: 0, y: 0, z: 0}
angularVelocity: 0
rndAngularVelocity: 0
rndRotation: 0
Simulate in Worldspace?: 1
m_OneShot: 0
m_Ellipsoid: {x: 0, y: 0, z: 0}
m_MinEmitterRange: 0
--- !u!26 &26289250683432212
ParticleRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1736840874417750}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 66ca80b82027e4e489d8456571eb0257, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
serializedVersion: 2
m_CameraVelocityScale: 0
m_StretchParticles: 3
m_LengthScale: -0.11
m_VelocityScale: -0.1
m_MaxParticleSize: Infinity
UV Animation:
x Tile: 1
y Tile: 1
cycles: 1

9
Assets/Water.prefab.meta

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 0bc9bb451c38cce4892616742499d8a7
timeCreated: 1597908226
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Loading…
Cancel
Save