From 52fb8c663b1e74b2a36b79bc70a452ca73db6341 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 12 Nov 2020 17:20:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

---
 Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab b/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab
index 721dad2..f622a38 100644
--- a/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab
+++ b/Assets/00000/package/Prefab/Effect_HuoJingLing_Atk.prefab
@@ -9747,7 +9747,7 @@
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
   looping: 1
-  prewarm: 1
+  prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 0
@@ -9815,8 +9815,8 @@
     startLifetime:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.3
-      minScalar: 0.5
+      scalar: 0.2
+      minScalar: 0.4
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -9868,7 +9868,7 @@
     startSpeed:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 20
+      scalar: 15
       minScalar: 5
       maxCurve:
         serializedVersion: 2
@@ -9985,7 +9985,7 @@
       serializedVersion: 2
       minMaxState: 3
       scalar: 5
-      minScalar: 20
+      minScalar: 15
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -10565,7 +10565,7 @@
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 20
+      scalar: 10
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -11020,7 +11020,7 @@
         ctime6: 0
         ctime7: 0
         atime0: 0
-        atime1: 20239
+        atime1: 21781
         atime2: 65535
         atime3: 65535
         atime4: 0

--
Gitblit v1.9.1