From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/00000/package/Prefab/Effect_baomihua_02.prefab | 110 +++++++++++++++++++++++++++---------------------------
1 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/Assets/00000/package/Prefab/Effect_baomihua_02.prefab b/Assets/00000/package/Prefab/Effect_baomihua_02.prefab
index 8524a5b..5d35f56 100644
--- a/Assets/00000/package/Prefab/Effect_baomihua_02.prefab
+++ b/Assets/00000/package/Prefab/Effect_baomihua_02.prefab
@@ -46,23 +46,23 @@
cullingMode: 3
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.5
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
- value: 1
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -71,7 +71,7 @@
outWeight: 0.33333334
- serializedVersion: 3
time: 1
- value: 1
+ value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -4830,9 +4830,9 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -4891,7 +4891,7 @@
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
- scalingMode: 1
+ scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@@ -9642,16 +9642,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -10994,7 +10994,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -14563,16 +14563,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -15915,7 +15915,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -19484,16 +19484,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -20836,7 +20836,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -24407,16 +24407,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -25759,7 +25759,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -29327,16 +29327,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -30679,7 +30679,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -34281,16 +34281,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -35633,7 +35633,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -39201,16 +39201,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -40553,7 +40553,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -44124,16 +44124,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -45476,7 +45476,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
@@ -49044,16 +49044,16 @@
cullingMode: 0
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
- looping: 0
- prewarm: 0
- playOnAwake: 1
+ looping: 1
+ prewarm: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
startDelay:
serializedVersion: 2
minMaxState: 0
- scalar: 0.1
+ scalar: 0
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -50396,7 +50396,7 @@
m_RotationOrder: 4
separateAxes: 0
ColorModule:
- enabled: 1
+ enabled: 0
gradient:
serializedVersion: 2
minMaxState: 1
--
Gitblit v1.9.1