From adf4e32c75f0886b330c6ad449f6a2a46b3d3771 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 13 Nov 2020 15:25:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab b/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab
index a1fc959..ab53cd1 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_UI_KaPai_Huo.prefab
@@ -56,7 +56,7 @@
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0.6
+    scalar: 0
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -4944,7 +4944,7 @@
   startDelay:
     serializedVersion: 2
     minMaxState: 0
-    scalar: 0.6
+    scalar: 0
     minScalar: 0
     maxCurve:
       serializedVersion: 2
@@ -9787,7 +9787,7 @@
   m_Component:
   - component: {fileID: 3046677259689348461}
   m_Layer: 0
-  m_Name: Effect_HuoJingLing_BaoShi
+  m_Name: Effect_UI_KaPai_Huo
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

--
Gitblit v1.9.1