From 7cd4eee939cdf4700a7eac8d3b5e27650a370776 Mon Sep 17 00:00:00 2001
From: art_dzg <66456565@qq.com>
Date: 星期四, 10 一月 2019 21:12:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/master
---
Effects/ShenBing/Zs/GongJi/Effect_Zs_Sz03_Wq.prefab | 328 +++++++++++++++++++++++++++---------------------------
1 files changed, 164 insertions(+), 164 deletions(-)
diff --git a/Effects/ShenBing/Zs/GongJi/Effect_Zs_Sz03_Wq.prefab b/Effects/ShenBing/Zs/GongJi/Effect_Zs_Sz03_Wq.prefab
index f7644b0..0b8af71 100644
--- a/Effects/ShenBing/Zs/GongJi/Effect_Zs_Sz03_Wq.prefab
+++ b/Effects/ShenBing/Zs/GongJi/Effect_Zs_Sz03_Wq.prefab
@@ -9,49 +9,18 @@
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
- m_RootGameObject: {fileID: 1270338224476032}
+ m_RootGameObject: {fileID: 1797425986438186}
m_IsPrefabParent: 1
---- !u!1 &1113479165692606
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4166997386062000}
- m_Layer: 18
- m_Name: Animation
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1270338224476032
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4265487773482692}
- - component: {fileID: 114298711129623040}
- m_Layer: 18
- m_Name: Effect_Zs_Sz03_Wq
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1303031115498418
+--- !u!1 &1343828282914952
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- - component: {fileID: 4357123227893922}
- - component: {fileID: 114141337228985724}
- - component: {fileID: 114131165628900080}
+ - component: {fileID: 4595872827661052}
+ - component: {fileID: 114912032536176252}
+ - component: {fileID: 114584735651310320}
m_Layer: 18
m_Name: tuowei
m_TagString: Untagged
@@ -59,17 +28,17 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &1494589739188240
+--- !u!1 &1697814778236998
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- - component: {fileID: 4797592587980850}
- - component: {fileID: 198580284691466804}
- - component: {fileID: 199022448896681674}
- - component: {fileID: 114175451590784066}
+ - component: {fileID: 4045662616490698}
+ - component: {fileID: 198475488709741570}
+ - component: {fileID: 199961145411251286}
+ - component: {fileID: 114534782142588796}
m_Layer: 18
m_Name: yezi
m_TagString: Untagged
@@ -77,17 +46,33 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &1579423025391046
+--- !u!1 &1797425986438186
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4482780397929830}
+ - component: {fileID: 114701314528988400}
+ m_Layer: 18
+ m_Name: Effect_Zs_Sz03_Wq
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &1894190746853396
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- - component: {fileID: 4678028541635066}
- - component: {fileID: 33967763606048100}
- - component: {fileID: 23688893303351730}
- - component: {fileID: 114755976075142220}
+ - component: {fileID: 4665235151610178}
+ - component: {fileID: 33263175412304702}
+ - component: {fileID: 23894610983013828}
+ - component: {fileID: 114805150544249444}
m_Layer: 18
m_Name: yun
m_TagString: Untagged
@@ -95,81 +80,96 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &4166997386062000
+--- !u!1 &1985728914925830
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4260311178672224}
+ m_Layer: 18
+ m_Name: Animation
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4045662616490698
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1113479165692606}
- 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: 4797592587980850}
- - {fileID: 4678028541635066}
- - {fileID: 4357123227893922}
- m_Father: {fileID: 4265487773482692}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4265487773482692
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1270338224476032}
- 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: 4166997386062000}
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4357123227893922
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1303031115498418}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0, y: -0, z: 0.491}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 4166997386062000}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4678028541635066
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1579423025391046}
- m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 0, y: 0, z: 0.049}
- m_LocalScale: {x: 0.19512713, y: 0.67994714, z: 0.1951271}
- m_Children: []
- m_Father: {fileID: 4166997386062000}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!4 &4797592587980850
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1494589739188240}
+ m_GameObject: {fileID: 1697814778236998}
m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
m_LocalPosition: {x: -0, y: -0, z: 0.374}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 4166997386062000}
+ m_Father: {fileID: 4260311178672224}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
---- !u!23 &23688893303351730
+--- !u!4 &4260311178672224
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1985728914925830}
+ 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: 4045662616490698}
+ - {fileID: 4665235151610178}
+ - {fileID: 4595872827661052}
+ m_Father: {fileID: 4482780397929830}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4482780397929830
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1797425986438186}
+ 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: 4260311178672224}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4595872827661052
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1343828282914952}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0, y: -0, z: 0.491}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4260311178672224}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4665235151610178
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1894190746853396}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0.049}
+ m_LocalScale: {x: 0.19512711, y: 0.67994714, z: 0.1951271}
+ m_Children: []
+ m_Father: {fileID: 4260311178672224}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!23 &23894610983013828
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1579423025391046}
+ m_GameObject: {fileID: 1894190746853396}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -196,31 +196,70 @@
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 10032
---- !u!33 &33967763606048100
+--- !u!33 &33263175412304702
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1579423025391046}
+ m_GameObject: {fileID: 1894190746853396}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &114131165628900080
+--- !u!114 &114534782142588796
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1303031115498418}
+ m_GameObject: {fileID: 1697814778236998}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 644f267571076be42bee2f66aba2c823, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RendererOrder: 10031
+--- !u!114 &114584735651310320
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1343828282914952}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 644f267571076be42bee2f66aba2c823, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RendererOrder: 10033
---- !u!114 &114141337228985724
+--- !u!114 &114701314528988400
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1303031115498418}
+ m_GameObject: {fileID: 1797425986438186}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d398e1aa1bff9054e84a7cd84cbc2a8b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ duration: 0
+ effectId: 0
+ startTime: 407.80865
+ releaseHideChildren: 1
+--- !u!114 &114805150544249444
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1894190746853396}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 644f267571076be42bee2f66aba2c823, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RendererOrder: 10032
+--- !u!114 &114912032536176252
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1343828282914952}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98335f20237e3de42a9f0b6415312e23, type: 3}
@@ -228,7 +267,7 @@
m_EditorClassIdentifier:
TrailData:
TrailMaterial: {fileID: 2100000, guid: 0c80c6aeee71d0f41bda06eeabc32846, type: 2}
- Lifetime: 0.2
+ Lifetime: 0.35
UsingSimpleSize: 0
SimpleSizeOverLifeStart: 0
SimpleSizeOverLifeEnd: 0
@@ -238,8 +277,8 @@
- serializedVersion: 2
time: 0
value: 0.15
- inSlope: -0.24622515
- outSlope: -0.24622515
+ inSlope: -0.24622516
+ outSlope: -0.24622516
tangentMode: 0
- serializedVersion: 2
time: 1
@@ -255,12 +294,12 @@
SimpleColorOverLifeEnd: {r: 0, g: 0, b: 0, a: 0}
ColorOverLife:
serializedVersion: 2
- key0: {r: 0.92934173, g: 0.97794116, b: 0.62559474, a: 0}
+ key0: {r: 0.92934173, g: 0.9779411, b: 0.62559474, a: 0}
key1: {r: 0.18836506, g: 0.9852941, b: 0.29279032, a: 1}
key2: {r: 0.9326154, g: 0.9558824, b: 0.53416955, a: 0}
- key3: {r: 0.07675083, g: 0.9117647, b: 0.046929054, a: 0}
+ key3: {r: 0.07675083, g: 0.9117647, b: 0.046929058, a: 0}
key4: {r: 1, g: 0.953854, b: 0.33088237, a: 0}
- key5: {r: 0.19137943, g: 1, b: 0.125, a: 0}
+ key5: {r: 0.19137944, g: 1, b: 0.125, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
@@ -292,51 +331,12 @@
MinVertexDistance: 0.25
MaxNumberOfPoints: 30
RandomForceScale: 0.2
---- !u!114 &114175451590784066
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1494589739188240}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 644f267571076be42bee2f66aba2c823, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_RendererOrder: 10031
---- !u!114 &114298711129623040
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1270338224476032}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d398e1aa1bff9054e84a7cd84cbc2a8b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- duration: 0
- effectId: 0
- startTime: 407.80865
- releaseHideChildren: 1
---- !u!114 &114755976075142220
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1579423025391046}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 644f267571076be42bee2f66aba2c823, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_RendererOrder: 10032
---- !u!198 &198580284691466804
+--- !u!198 &198475488709741570
ParticleSystem:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1494589739188240}
+ m_GameObject: {fileID: 1697814778236998}
serializedVersion: 5
lengthInSec: 5
simulationSpeed: 1
@@ -388,7 +388,7 @@
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 1303516753
+ randomSeed: 1574280769
InitialModule:
serializedVersion: 3
enabled: 1
@@ -1560,7 +1560,7 @@
tangentMode: 0
- serializedVersion: 2
time: 0.47633052
- value: 0.122177124
+ value: 0.12217712
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -3493,13 +3493,13 @@
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!199 &199022448896681674
+--- !u!199 &199961145411251286
ParticleSystemRenderer:
serializedVersion: 3
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1494589739188240}
+ m_GameObject: {fileID: 1697814778236998}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
--
Gitblit v1.8.0