From 7f57b14fc459d79c38908a25548847b4dbd877b3 Mon Sep 17 00:00:00 2001
From: atr_ljf <641572213@qq.com>
Date: 星期三, 05 九月 2018 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab | 10 +++++-----
Effects/UI/Z_FaBaoZhiHun/Material/01.mat | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab b/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab
index a0b3433..6051122 100644
--- a/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab
+++ b/Effects/UI/Z_FaBaoZhiHun/Effect_FBZH_BenYuan.prefab
@@ -133,7 +133,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1649082345077736}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.7, y: -11.2, z: -69.1}
+ m_LocalPosition: {x: -0.7, y: -11.2, z: -1000}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224705066826073554}
@@ -159,7 +159,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1165282805772988}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 0, y: -12.3, z: -27.6}
+ m_LocalPosition: {x: 0, y: -12.3, z: -1000}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224705066826073554}
@@ -185,7 +185,7 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1577767238038102}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 1.3999939, y: -6.1, z: 0}
+ m_LocalPosition: {x: 1.3999939, y: -6.1, z: -999}
m_LocalScale: {x: 183.81926, y: 186.16776, z: 168.8836}
m_Children: []
m_Father: {fileID: 224705066826073554}
@@ -365,7 +365,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 774492227
+ randomSeed: -1340835918
InitialModule:
serializedVersion: 3
enabled: 1
@@ -3491,7 +3491,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -1783246163
+ randomSeed: 434509602
InitialModule:
serializedVersion: 3
enabled: 1
diff --git a/Effects/UI/Z_FaBaoZhiHun/Material/01.mat b/Effects/UI/Z_FaBaoZhiHun/Material/01.mat
index dfe076e..e1633fe 100644
--- a/Effects/UI/Z_FaBaoZhiHun/Material/01.mat
+++ b/Effects/UI/Z_FaBaoZhiHun/Material/01.mat
@@ -80,4 +80,4 @@
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- - _TintColor: {r: 0.66176474, g: 0.33987597, b: 0.13137977, a: 0.491}
+ - _TintColor: {r: 0.66176474, g: 0.33987597, b: 0.13137977, a: 0.4862745}
--
Gitblit v1.8.0