From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master
---
Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab b/Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab
index c606613..26e7c0c 100644
--- a/Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab
+++ b/Assets/00000/package/Prefab/Effect_baoxiangliuguang.prefab
@@ -11,7 +11,7 @@
- component: {fileID: 6483550274172889368}
- component: {fileID: 9063163293966560924}
- component: {fileID: 5646038450406300724}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4823,7 +4823,7 @@
- component: {fileID: 2577498066342915017}
- component: {fileID: 8269348752032478107}
- component: {fileID: 225098535084566565}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9603,7 +9603,7 @@
- component: {fileID: 5515370996906599170}
- component: {fileID: 5615289772056028100}
- component: {fileID: 8547658018333476940}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14415,7 +14415,7 @@
- component: {fileID: 8405723799059347027}
- component: {fileID: 3092402726960188686}
- component: {fileID: 1660097769711779516}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14429,10 +14429,14 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 870485128784404710}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ 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_Children:
+ - {fileID: 8127586394238111544}
+ - {fileID: 5274007779426262277}
+ - {fileID: 7447818994281711396}
+ - {fileID: 8877387921138942492}
m_Father: {fileID: 9172433746249288375}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -19204,7 +19208,7 @@
- component: {fileID: 5274007779426262277}
- component: {fileID: 6307234537575525644}
- component: {fileID: 5684333037806031723}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -19219,13 +19223,13 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1321180754241619822}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.1249924, y: 0.17, z: 2.1699996}
+ m_LocalPosition: {x: -2.124996, y: 0.17000212, z: 2.1700277}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5515370996906599170}
- {fileID: 2577498066342915017}
- m_Father: {fileID: 9172433746249288375}
- m_RootOrder: 2
+ m_Father: {fileID: 8405723799059347027}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &6307234537575525644
ParticleSystem:
@@ -23991,7 +23995,7 @@
- component: {fileID: 8877387921138942492}
- component: {fileID: 3092609289629582618}
- component: {fileID: 1487484863008227184}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -24006,13 +24010,13 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1725767361987641002}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 1.97, y: 0.17, z: -2.14}
+ m_LocalPosition: {x: 1.9700001, y: 0.17000167, z: -2.139987}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2315050507316397792}
- {fileID: 4589986282934079196}
- m_Father: {fileID: 9172433746249288375}
- m_RootOrder: 4
+ m_Father: {fileID: 8405723799059347027}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &3092609289629582618
ParticleSystem:
@@ -28778,7 +28782,7 @@
- component: {fileID: 7447818994281711396}
- component: {fileID: 1398491665614238023}
- component: {fileID: 2205539796091058834}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -28793,13 +28797,13 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2886618795321168369}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.1100082, y: 0.17, z: 2.02}
+ m_LocalPosition: {x: 2.1100042, y: 0.17000212, z: 2.019996}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6483550274172889368}
- {fileID: 8543150265502839998}
- m_Father: {fileID: 9172433746249288375}
- m_RootOrder: 3
+ m_Father: {fileID: 8405723799059347027}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &1398491665614238023
ParticleSystem:
@@ -33565,7 +33569,7 @@
- component: {fileID: 4589986282934079196}
- component: {fileID: 5876603695562221763}
- component: {fileID: 5143196848909417750}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -38345,7 +38349,7 @@
- component: {fileID: 8127586394238111544}
- component: {fileID: 7993050527577989293}
- component: {fileID: 4540520726809085660}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -38360,13 +38364,13 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4168714877601053456}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.1699905, y: 0.17, z: -1.9200015}
+ m_LocalPosition: {x: -2.1699998, y: 0.17000167, z: -1.9199746}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2821988081791312618}
- {fileID: 260024444801041072}
- m_Father: {fileID: 9172433746249288375}
- m_RootOrder: 1
+ m_Father: {fileID: 8405723799059347027}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &7993050527577989293
ParticleSystem:
@@ -43132,7 +43136,7 @@
- component: {fileID: 260024444801041072}
- component: {fileID: 3922321418846271238}
- component: {fileID: 5488817991362421910}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -47910,7 +47914,7 @@
serializedVersion: 6
m_Component:
- component: {fileID: 9172433746249288375}
- m_Layer: 0
+ m_Layer: 5
m_Name: Effect_baoxiangliuguang
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -47929,10 +47933,6 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8405723799059347027}
- - {fileID: 8127586394238111544}
- - {fileID: 5274007779426262277}
- - {fileID: 7447818994281711396}
- - {fileID: 8877387921138942492}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -47947,7 +47947,7 @@
- component: {fileID: 8543150265502839998}
- component: {fileID: 7949812528459633709}
- component: {fileID: 7000084856983500232}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -52727,7 +52727,7 @@
- component: {fileID: 2821988081791312618}
- component: {fileID: 4137122629647607925}
- component: {fileID: 6240494657516716312}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -57539,7 +57539,7 @@
- component: {fileID: 2315050507316397792}
- component: {fileID: 7242132907110882762}
- component: {fileID: 1564618375033694671}
- m_Layer: 0
+ m_Layer: 5
m_Name: 01 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
--
Gitblit v1.9.1