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_FengMo.prefab | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_FengMo.prefab b/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_FengMo.prefab
index 4b42113..7ec90d8 100644
--- a/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_FengMo.prefab
+++ b/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_FengMo.prefab
@@ -214,8 +214,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1578950462979610}
m_LocalRotation: {x: -0.5024586, y: -0.49752936, z: -0.4975293, w: 0.5024585}
- m_LocalPosition: {x: -0.000019524, y: -53.2, z: -0}
- m_LocalScale: {x: 21.083818, y: 26.4066, z: 41.124077}
+ m_LocalPosition: {x: -0.000019524, y: -58.8, z: 0}
+ m_LocalScale: {x: 21.083818, y: 26.4066, z: 42.152176}
m_Children: []
m_Father: {fileID: 224194721947001930}
m_RootOrder: 0
@@ -227,8 +227,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1892007215713472}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -76.7, y: -46.3, z: 0}
- m_LocalScale: {x: 160.95087, y: 154.91531, z: 167.2217}
+ m_LocalPosition: {x: -81.127, y: -53.3, z: 0}
+ m_LocalScale: {x: 170.46503, y: 164.07271, z: 177.10654}
m_Children: []
m_Father: {fileID: 224194721947001930}
m_RootOrder: 1
@@ -240,8 +240,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1379992988422756}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 74.1, y: -45.5, z: 0}
- m_LocalScale: {x: 158.9391, y: 156.92722, z: 167.22198}
+ m_LocalPosition: {x: 78.587, y: -52.452, z: 0}
+ m_LocalScale: {x: 168.33435, y: 166.20354, z: 177.10686}
m_Children: []
m_Father: {fileID: 224194721947001930}
m_RootOrder: 2
@@ -266,8 +266,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1746833458468544}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
- m_LocalPosition: {x: 41.8, y: -43.1, z: 0}
- m_LocalScale: {x: 237.73833, y: 234.0602, z: 255.81044}
+ m_LocalPosition: {x: 45.781, y: -45.3, z: 0}
+ m_LocalScale: {x: 260.24457, y: 256.21823, z: 280.02753}
m_Children: []
m_Father: {fileID: 224194721947001930}
m_RootOrder: 3
@@ -279,8 +279,8 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1162805732218066}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -42.3, y: -43.1, z: 0}
- m_LocalScale: {x: 237.738, y: 234.06, z: 255.81}
+ m_LocalPosition: {x: -46.281, y: -45.299995, z: 0}
+ m_LocalScale: {x: 260.24423, y: 256.218, z: 280.027}
m_Children: []
m_Father: {fileID: 224194721947001930}
m_RootOrder: 4
@@ -563,7 +563,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 1468418655
+ randomSeed: 271353868
InitialModule:
serializedVersion: 3
enabled: 1
@@ -3689,7 +3689,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 1625433646
+ randomSeed: 2100562716
InitialModule:
serializedVersion: 3
enabled: 1
@@ -6821,7 +6821,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -1947075394
+ randomSeed: -1383998074
InitialModule:
serializedVersion: 3
enabled: 1
@@ -9953,7 +9953,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -65427121
+ randomSeed: -373632991
InitialModule:
serializedVersion: 3
enabled: 1
--
Gitblit v1.8.0