From 0beab784e9d7b5b1844c5e5e19e8d083030baa74 Mon Sep 17 00:00:00 2001
From: art_lxj <1234123@qq.com>
Date: 星期四, 11 十月 2018 16:56:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/Skill/Zs00/Skill12/Zs_skill12.prefab | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/Effects/Skill/Zs00/Skill12/Zs_skill12.prefab b/Effects/Skill/Zs00/Skill12/Zs_skill12.prefab
index 201c7d4..91bc109 100644
--- a/Effects/Skill/Zs00/Skill12/Zs_skill12.prefab
+++ b/Effects/Skill/Zs00/Skill12/Zs_skill12.prefab
@@ -21,13 +21,13 @@
- component: {fileID: 4954161279551736}
- component: {fileID: 33835358670260144}
- component: {fileID: 23249262270098532}
- m_Layer: 0
+ m_Layer: 18
m_Name: xuan2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1191370877694626
GameObject:
m_ObjectHideFlags: 1
@@ -38,13 +38,13 @@
- component: {fileID: 4003527167794516}
- component: {fileID: 33779266651989020}
- component: {fileID: 23261008769343074}
- m_Layer: 0
+ m_Layer: 18
m_Name: feng1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1223609025515136
GameObject:
m_ObjectHideFlags: 1
@@ -55,13 +55,13 @@
- component: {fileID: 4190837973521048}
- component: {fileID: 33545019234127498}
- component: {fileID: 23037813479431718}
- m_Layer: 0
+ m_Layer: 25
m_Name: xuan1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1361184669381174
GameObject:
m_ObjectHideFlags: 1
@@ -72,13 +72,13 @@
- component: {fileID: 4518686840889104}
- component: {fileID: 33854420556177604}
- component: {fileID: 23720138430520824}
- m_Layer: 0
+ m_Layer: 26
m_Name: liu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1502394599159196
GameObject:
m_ObjectHideFlags: 1
@@ -89,13 +89,13 @@
- component: {fileID: 4869668894022542}
- component: {fileID: 33707344746746792}
- component: {fileID: 23694537509266878}
- m_Layer: 0
+ m_Layer: 18
m_Name: feng2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1505247859878760
GameObject:
m_ObjectHideFlags: 1
@@ -106,7 +106,7 @@
- component: {fileID: 4445695918671832}
- component: {fileID: 198128816078143116}
- component: {fileID: 199955181241117758}
- m_Layer: 0
+ m_Layer: 26
m_Name: lizi
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -123,13 +123,13 @@
- component: {fileID: 4371763930862468}
- component: {fileID: 33345549173834570}
- component: {fileID: 23905009483220706}
- m_Layer: 0
+ m_Layer: 25
m_Name: k2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1654708585670456
GameObject:
m_ObjectHideFlags: 0
@@ -156,13 +156,13 @@
- component: {fileID: 4145773233461638}
- component: {fileID: 33836828645430190}
- component: {fileID: 23789682539066682}
- m_Layer: 0
+ m_Layer: 25
m_Name: k1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &1885887365121184
GameObject:
m_ObjectHideFlags: 0
@@ -189,22 +189,22 @@
- component: {fileID: 4406580512634536}
- component: {fileID: 33587374898925288}
- component: {fileID: 23557076085378348}
- m_Layer: 0
+ m_Layer: 18
m_Name: diyun
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &4003527167794516
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1191370877694626}
- m_LocalRotation: {x: -0.6294176, y: 0.32223204, z: 0.32223204, w: 0.6294176}
+ m_LocalRotation: {x: -0.6770639, y: 0.20392282, z: 0.20392282, w: 0.6770639}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.4544011, y: 0.45440075, z: 2.3328037}
+ m_LocalScale: {x: 0.455068, y: 0.4550677, z: 2.3362277}
m_Children: []
m_Father: {fileID: 4613420437729598}
m_RootOrder: 1
@@ -228,9 +228,9 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1223609025515136}
- m_LocalRotation: {x: 0.084797285, y: 0, z: -0.9963982, w: 0}
- m_LocalPosition: {x: -0, y: 0.165, z: 0}
- m_LocalScale: {x: 2.0799897, y: 1.6089349, z: 2.0799897}
+ m_LocalRotation: {x: 0.1438314, y: 0, z: -0.9896022, w: 0}
+ m_LocalPosition: {x: 0, y: 0.165, z: 0}
+ m_LocalScale: {x: 2.093156, y: 1.6177263, z: 2.093156}
m_Children: []
m_Father: {fileID: 4613420437729598}
m_RootOrder: 5
@@ -241,7 +241,7 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1595712402300864}
- m_LocalRotation: {x: 0.47632346, y: 0.522605, z: 0.522605, w: -0.47632346}
+ m_LocalRotation: {x: 0.36533856, y: 0.6054154, z: 0.6054154, w: -0.36533856}
m_LocalPosition: {x: 0, y: 0.019999972, z: 0}
m_LocalScale: {x: 1.4537377, y: 1.4537368, z: 1.4537365}
m_Children: []
@@ -255,8 +255,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1898479665077076}
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
- m_LocalPosition: {x: -0, y: 0.02, z: 0}
- m_LocalScale: {x: 10.822931, y: 10.822932, z: 10.822932}
+ m_LocalPosition: {x: 0, y: 0.02, z: 0}
+ m_LocalScale: {x: 11.13772, y: 11.137721, z: 11.137721}
m_Children: []
m_Father: {fileID: 4613420437729598}
m_RootOrder: 0
@@ -267,7 +267,7 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1505247859878760}
- m_LocalRotation: {x: 0.7058206, y: 0.042629566, z: 0.042629566, w: -0.7058206}
+ m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@@ -295,8 +295,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1361184669381174}
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
- m_LocalPosition: {x: -0, y: 0.0010567569, z: 4.6192383e-11}
- m_LocalScale: {x: 0.7210795, y: 0.7210796, z: 0.09679753}
+ m_LocalPosition: {x: 0, y: 0.0010567569, z: 4.6192383e-11}
+ m_LocalScale: {x: 0.7210709, y: 0.72107095, z: 0.09679637}
m_Children: []
m_Father: {fileID: 4613420437729598}
m_RootOrder: 7
@@ -329,9 +329,9 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1502394599159196}
- m_LocalRotation: {x: -0.63555175, y: 0.30995813, z: 0.30995813, w: 0.63555175}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: -0.000000009313226, z: 0}
- m_LocalScale: {x: 0.4449453, y: 0.4449453, z: 2.3763409}
+ m_LocalScale: {x: 0.44673517, y: 0.44673517, z: 2.393921}
m_Children: []
m_Father: {fileID: 4613420437729598}
m_RootOrder: 2
@@ -342,9 +342,9 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1108298657319216}
- m_LocalRotation: {x: -0.22213049, y: 0, z: 0.975017, w: -0}
+ m_LocalRotation: {x: -0.19392028, y: 0, z: 0.9810173, w: -0}
m_LocalPosition: {x: 0, y: 1.264, z: 0}
- m_LocalScale: {x: 2.8463397, y: 2.1487687, z: 2.846341}
+ m_LocalScale: {x: 2.8496735, y: 2.160947, z: 2.849675}
m_Children: []
m_Father: {fileID: 4613420437729598}
m_RootOrder: 6
@@ -691,7 +691,8 @@
m_EditorClassIdentifier:
duration: 4
effectId: 0
- startTime: 8.397579
+ startTime: 25.588009
+ releaseHideChildren: 1
--- !u!198 &198128816078143116
ParticleSystem:
m_ObjectHideFlags: 1
@@ -749,7 +750,7 @@
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -1850850063
+ randomSeed: -1864369481
InitialModule:
serializedVersion: 3
enabled: 1
@@ -1412,8 +1413,8 @@
- serializedVersion: 2
time: 1
value: 0.31168747
- inSlope: -0.96048117
- outSlope: -0.96048117
+ inSlope: -0.9604812
+ outSlope: -0.9604812
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
@@ -1939,7 +1940,7 @@
m_Curve:
- serializedVersion: 2
time: 1
- value: 0.025970459
+ value: 0.02597046
inSlope: 0
outSlope: 0
tangentMode: 0
--
Gitblit v1.8.0