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_bingdong1026.prefab | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Assets/00000/package/Prefab/Effect_bingdong1026.prefab b/Assets/00000/package/Prefab/Effect_bingdong1026.prefab
index 556aa6c..85833ed 100644
--- a/Assets/00000/package/Prefab/Effect_bingdong1026.prefab
+++ b/Assets/00000/package/Prefab/Effect_bingdong1026.prefab
@@ -48,7 +48,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -4918,7 +4918,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -9772,6 +9772,7 @@
- {fileID: 1916355198176119810}
- {fileID: 7497032114766724615}
- {fileID: 5292275683670844028}
+ - {fileID: 410417867720661205}
m_Father: {fileID: 5188812776810247605}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14616,7 +14617,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -19486,7 +19487,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -24342,8 +24343,8 @@
- {fileID: 3919129628388337672}
- {fileID: 895535832985558944}
- {fileID: 3059320043405674505}
- m_Father: {fileID: 5188812776810247605}
- m_RootOrder: 1
+ m_Father: {fileID: 8115904079539523006}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &7362736457726227135
ParticleSystem:
@@ -24361,7 +24362,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -29150,7 +29151,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -34020,7 +34021,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -38870,7 +38871,6 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8115904079539523006}
- - {fileID: 410417867720661205}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -38922,7 +38922,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -43792,7 +43792,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
--
Gitblit v1.9.1