From 2013b6fef379429fa81ef742e2ca6aea8aabea97 Mon Sep 17 00:00:00 2001
From: art_yxc <616551813@qq.com>
Date: 星期二, 29 一月 2019 17:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/UI/E_tongyong/ZX_jiesuo/Effect_Y_01.prefab | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Y_01.prefab b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Y_01.prefab
index facdcb9..1eccd4f 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Y_01.prefab
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Y_01.prefab
@@ -735,7 +735,7 @@
m_GameObject: {fileID: 1658819831545622}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2, y: 2.4999695, z: 0}
- m_LocalScale: {x: 109.31593, y: 109.315956, z: 109.315956}
+ m_LocalScale: {x: 109.31593, y: 109.31595, z: 109.31595}
m_Children: []
m_Father: {fileID: 224702646881777722}
m_RootOrder: 2
@@ -922,7 +922,7 @@
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- - {fileID: 2100000, guid: fdbdcf16976052349afecdba98fd9ae1, type: 2}
+ - {fileID: 2100000, guid: a67d7f28bf729624c94d213867e0980f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1018,7 +1018,7 @@
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- - {fileID: 2100000, guid: 8028ec9f4994cb54981f03d52017ace3, type: 2}
+ - {fileID: 2100000, guid: 18e836c0a149b0b4e866d7fa6540a6d6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1082,7 +1082,7 @@
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- - {fileID: 2100000, guid: a84793a423373a04487598513fbc4f4c, type: 2}
+ - {fileID: 2100000, guid: d005553e25fb6e44898cbef6e81aa3b3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -5619,7 +5619,7 @@
startColor:
serializedVersion: 2
minMaxState: 2
- minColor: {r: 1, g: 0.83671397, b: 0.66176474, a: 1}
+ minColor: {r: 1, g: 0.836714, b: 0.66176474, a: 1}
maxColor: {r: 0.9485294, g: 0.81192577, b: 0.45334125, a: 1}
maxGradient:
serializedVersion: 2
@@ -6191,7 +6191,7 @@
tangentMode: 0
- serializedVersion: 2
time: 0.31248707
- value: 0.96732605
+ value: 0.9673261
inSlope: -1.6904964
outSlope: -1.6904964
tangentMode: 0
@@ -18299,8 +18299,8 @@
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- - {fileID: 2100000, guid: 957c5cd476447e74281d6373c4e1177f, type: 2}
- - {fileID: 2100000, guid: 957c5cd476447e74281d6373c4e1177f, type: 2}
+ - {fileID: 2100000, guid: ff22e68a3c77411469a1fca9a8e1a078, type: 2}
+ - {fileID: 2100000, guid: ff22e68a3c77411469a1fca9a8e1a078, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
--
Gitblit v1.8.0