From 7f515438cfe4ea350c58465f5ee4e9a72a96d2b6 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期二, 04 九月 2018 09:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab b/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab
index 2f8cee2..a0b3433 100644
--- a/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab
+++ b/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab
@@ -147,7 +147,7 @@
m_GameObject: {fileID: 1901155166927414}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.4, y: -0.00000023841858, z: 0}
- m_LocalScale: {x: 334.51694, y: 334.51694, z: 334.51694}
+ m_LocalScale: {x: 380.77536, y: 380.7753, z: 380.7753}
m_Children: []
m_Father: {fileID: 224705066826073554}
m_RootOrder: 0
@@ -173,7 +173,7 @@
m_GameObject: {fileID: 1428454509504704}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 1.3999939, y: -0, z: 0}
- m_LocalScale: {x: 334.517, y: 334.517, z: 334.517}
+ m_LocalScale: {x: 380.77542, y: 380.7754, z: 380.7754}
m_Children: []
m_Father: {fileID: 224705066826073554}
m_RootOrder: 1
@@ -185,8 +185,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1577767238038102}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 1.3999939, y: -4.6, z: 0}
- m_LocalScale: {x: 168.88362, y: 168.8836, z: 168.8836}
+ m_LocalPosition: {x: 1.3999939, y: -6.1, z: 0}
+ m_LocalScale: {x: 183.81926, y: 186.16776, z: 168.8836}
m_Children: []
m_Father: {fileID: 224705066826073554}
m_RootOrder: 3
@@ -365,7 +365,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 463049281
+ randomSeed: 774492227
InitialModule:
serializedVersion: 3
enabled: 1
@@ -1021,7 +1021,7 @@
tangentMode: 0
- serializedVersion: 2
time: 1
- value: 0.0035800934
+ value: 0.0035800936
inSlope: -0.6777827
outSlope: -0.6777827
tangentMode: 0
@@ -3491,7 +3491,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -1143710072
+ randomSeed: -1783246163
InitialModule:
serializedVersion: 3
enabled: 1
@@ -4149,7 +4149,7 @@
time: 0.1382712
value: 0.9278823
inSlope: 2.8497498
- outSlope: -0.68870443
+ outSlope: -0.6887044
tangentMode: 69
- serializedVersion: 2
time: 1
--
Gitblit v1.8.0