From d185e655cd926e45ed7f7ce3f59af7dc23b4c372 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Tue, 22 Dec 2020 09:53:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab
index c54a91a..7f39fba 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_Atk.prefab
@@ -25,7 +25,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320732480030835271}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: -1, z: 0}
+ m_LocalPosition: {x: 0, y: -0.00001, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8976928300708152277}
@@ -40,7 +40,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320732480030835271}
m_Enabled: 1
- m_CastShadows: 1
+ m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
@@ -72,22 +72,22 @@
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
- m_Time: 0.15
+ m_Time: 0.3
m_Parameters:
serializedVersion: 3
- widthMultiplier: 8
+ widthMultiplier: 6
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
- inSlope: -1.4996829
+ inSlope: 28.250004
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
- outWeight: 0.12096773
+ outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
@@ -104,7 +104,7 @@
serializedVersion: 2
key0: {r: 0.8392157, g: 0.3878792, b: 0, a: 0.7411765}
key1: {r: 0.8392157, g: 0.3878792, b: 0, a: 0.7411765}
- key2: {r: 0.8392157, g: 0.3123755, b: 0, a: 0}
+ key2: {r: 0.8392157, g: 0.3123755, b: 0, a: 0.7411765}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
@@ -119,8 +119,8 @@
ctime6: 0
ctime7: 0
atime0: 0
- atime1: 65535
- atime2: 0
+ atime1: 8481
+ atime2: 65535
atime3: 0
atime4: 0
atime5: 0
@@ -128,7 +128,7 @@
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
- m_NumAlphaKeys: 2
+ m_NumAlphaKeys: 3
numCornerVertices: 0
numCapVertices: 0
alignment: 0
@@ -179,7 +179,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2402494084725196129}
m_Enabled: 1
- m_CastShadows: 1
+ m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
@@ -211,22 +211,22 @@
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
- m_Time: 0.15
+ m_Time: 0.3
m_Parameters:
serializedVersion: 3
- widthMultiplier: 3
+ widthMultiplier: 2.5
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
- inSlope: -1.4996829
+ inSlope: 28.250004
outSlope: 0
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
- outWeight: 0.12096773
+ outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
--
Gitblit v1.9.1