From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab
index 4f4d9b0..1a42e4d 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_SpHit.prefab
@@ -26,7 +26,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8722474620072867906}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -0.88999987}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8722474620394408426}
@@ -222,7 +222,7 @@
serializedVersion: 2
minMaxState: 0
minColor: {r: 0.8679245, g: 0.80619806, b: 0.6673193, a: 0.20392157}
- maxColor: {r: 0.701, g: 0.48985538, b: 0.33360842, a: 0.09803922}
+ maxColor: {r: 0.701, g: 0.48985538, b: 0.33360842, a: 0.2901961}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@@ -4990,7 +4990,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 0
- randomSeed: 10
+ randomSeed: 161
InitialModule:
serializedVersion: 3
enabled: 1
@@ -5166,8 +5166,8 @@
startSize:
serializedVersion: 2
minMaxState: 3
- scalar: 1
- minScalar: 5
+ scalar: 3
+ minScalar: 7
maxCurve:
serializedVersion: 2
m_Curve:
@@ -5930,8 +5930,8 @@
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.43173
- value: 0.1780526
+ time: 0.47328123
+ value: 0.20739795
inSlope: -0.96006167
outSlope: -0.96006167
tangentMode: 0
@@ -9778,7 +9778,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &8722474620457621473
Transform:
m_ObjectHideFlags: 0
@@ -9947,7 +9947,7 @@
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
- maxColor: {r: 1, g: 1, b: 1, a: 0.68235296}
+ maxColor: {r: 1, g: 1, b: 1, a: 0.9098039}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14551,7 +14551,7 @@
m_Component:
- component: {fileID: 8722474621117613192}
m_Layer: 0
- m_Name: Effect_MuJingLing_Hit_02
+ m_Name: Effect_Elf_Mu_SpHit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
--
Gitblit v1.9.1