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_baoshishengji1026.prefab | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab b/Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab
index 14673cf..673da92 100644
--- a/Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab
+++ b/Assets/00000/package/Prefab/Effect_baoshishengji1026.prefab
@@ -11,7 +11,7 @@
- component: {fileID: 205327247226680446}
- component: {fileID: 9159405114710681343}
- component: {fileID: 1254767974128129732}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4795,7 +4795,7 @@
- component: {fileID: 4371543401292120808}
- component: {fileID: 6823118513517684991}
- component: {fileID: 5827753079007572346}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -4832,7 +4832,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -9633,7 +9633,7 @@
- component: {fileID: 6849173858055577030}
- component: {fileID: 7839380129961592989}
- component: {fileID: 4007183820653444652}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9670,7 +9670,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -14413,7 +14413,7 @@
- component: {fileID: 2680840517320409922}
- component: {fileID: 2586355792005556170}
- component: {fileID: 4819239624475064938}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14442,7 +14442,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3041320400755764835}
serializedVersion: 6
- lengthInSec: 5
+ lengthInSec: 2
simulationSpeed: 1
stopAction: 0
cullingMode: 3
@@ -14450,7 +14450,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -19200,7 +19200,7 @@
serializedVersion: 6
m_Component:
- component: {fileID: 414171139532945711}
- m_Layer: 0
+ m_Layer: 5
m_Name: Effect_baoshishengji1026
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -19233,7 +19233,7 @@
- component: {fileID: 2602531485965247386}
- component: {fileID: 409958106875626656}
- component: {fileID: 3581389055168329025}
- m_Layer: 0
+ m_Layer: 5
m_Name: 03 (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -19270,7 +19270,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
--
Gitblit v1.9.1