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_Tz_idle.prefab | 8 +-
Effects/UI/E_tongyong/ZX_jiesuo/Effect_X_01.prefab | 16 ++--
Effects/UI/E_tongyong/ZX_jiesuo/Effect_Jiesuo_ZX.prefab | 6
Effects/UI/E_tongyong/ZX_jiesuo/Materials/06.mat | 2
Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat | 2
Effects/UI/E_tongyong/ZX_jiesuo/Effect_Y_01.prefab | 16 ++--
Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta | 4
Effects/UI/E_tongyong/ZX_jiesuo/Materials/09.mat | 7 +
Effects/UI/E_tongyong/ZX_jiesuo/Effect_Z_01.prefab | 16 ++--
Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat | 28 +++++++
Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat.meta | 9 ++
Role/Fb/Fb_Rz_014/Effects/Effect_Fb_Rz_014.prefab | 80 +------------------
12 files changed, 81 insertions(+), 113 deletions(-)
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Jiesuo_ZX.prefab b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Jiesuo_ZX.prefab
index 4da0ec2..70a69a4 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Jiesuo_ZX.prefab
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Jiesuo_ZX.prefab
@@ -3589,7 +3589,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -2035764827
+ randomSeed: 89882125
InitialModule:
serializedVersion: 3
enabled: 1
@@ -6734,8 +6734,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
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Tz_idle.prefab b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Tz_idle.prefab
index 16838fd..e8aa13f 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Tz_idle.prefab
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Tz_idle.prefab
@@ -158,7 +158,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 99788568
+ randomSeed: -1208985806
InitialModule:
serializedVersion: 3
enabled: 1
@@ -3290,7 +3290,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 879705625
+ randomSeed: 2142437550
InitialModule:
serializedVersion: 3
enabled: 1
@@ -6424,8 +6424,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
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_X_01.prefab b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_X_01.prefab
index 243f1fa..2b7d9a1 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_X_01.prefab
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_X_01.prefab
@@ -986,7 +986,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
@@ -1306,7 +1306,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
@@ -1338,7 +1338,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
@@ -11878,7 +11878,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 1913896256
+ randomSeed: -898495855
InitialModule:
serializedVersion: 3
enabled: 1
@@ -11967,7 +11967,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
@@ -12539,7 +12539,7 @@
tangentMode: 0
- serializedVersion: 2
time: 0.31248707
- value: 0.96732605
+ value: 0.9673261
inSlope: -1.6904964
outSlope: -1.6904964
tangentMode: 0
@@ -18146,8 +18146,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
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
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Z_01.prefab b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Z_01.prefab
index e344c8b..c84e2cb 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Z_01.prefab
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Effect_Z_01.prefab
@@ -915,14 +915,14 @@
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1321266579829396}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_MotionVectors: 1
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
@@ -1370,7 +1370,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
@@ -11878,7 +11878,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 1419870860
+ randomSeed: 1088511684
InitialModule:
serializedVersion: 3
enabled: 1
@@ -15015,7 +15015,7 @@
moveWithTransform: 1
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 786301968
+ randomSeed: -1144587804
InitialModule:
serializedVersion: 3
enabled: 1
@@ -18197,8 +18197,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
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat
index 9db59b4..6e30ffe 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat
@@ -6,7 +6,7 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Effect_qiandao_06
+ m_Name: 05
m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta
index 018f3d8..e18db01 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/05.mat.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 957c5cd476447e74281d6373c4e1177f
-timeCreated: 1548298930
+guid: ff22e68a3c77411469a1fca9a8e1a078
+timeCreated: 1548741531
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/06.mat b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/06.mat
index 9d8351c..1a2a7ff 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/06.mat
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/06.mat
@@ -6,7 +6,7 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: light_00276
+ m_Name: 06
m_Shader: {fileID: 4800000, guid: 779454293b3b2364cb1c5370833ad5e8, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/09.mat b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/09.mat
index 315c533..061a5aa 100644
--- a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/09.mat
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/09.mat
@@ -6,8 +6,8 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Effect_qiandao_06
- m_Shader: {fileID: 207, guid: 0000000000000000f000000000000000, type: 0}
+ m_Name: 09
+ m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -24,4 +24,5 @@
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- m_Colors: []
+ m_Colors:
+ - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat
new file mode 100644
index 0000000..36af45a
--- /dev/null
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat
@@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_Name: 13
+ m_Shader: {fileID: 4800000, guid: dd7ea8ea212c5084db9f066d3ff49e76, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: cb7cc7074a9f9a241bd07cac854ac74b, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _InvFade: 1
+ m_Colors:
+ - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
diff --git a/Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat.meta b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat.meta
new file mode 100644
index 0000000..c74e78f
--- /dev/null
+++ b/Effects/UI/E_tongyong/ZX_jiesuo/Materials/13.mat.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a67d7f28bf729624c94d213867e0980f
+timeCreated: 1548750954
+licenseType: Pro
+NativeFormatImporter:
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Role/Fb/Fb_Rz_014/Effects/Effect_Fb_Rz_014.prefab b/Role/Fb/Fb_Rz_014/Effects/Effect_Fb_Rz_014.prefab
index 3326f99..e259a61 100644
--- a/Role/Fb/Fb_Rz_014/Effects/Effect_Fb_Rz_014.prefab
+++ b/Role/Fb/Fb_Rz_014/Effects/Effect_Fb_Rz_014.prefab
@@ -61,23 +61,6 @@
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!1 &1587827669074122
-GameObject:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 4723159531386440}
- - component: {fileID: 33805207806579544}
- - component: {fileID: 23568642423993498}
- m_Layer: 5
- m_Name: c
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
--- !u!1 &1633511378089576
GameObject:
m_ObjectHideFlags: 1
@@ -190,7 +173,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4474924839034674}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4474924839034674
Transform:
@@ -206,7 +189,6 @@
- {fileID: 4634566977549446}
- {fileID: 4702627526094194}
- {fileID: 4793282980730782}
- - {fileID: 4723159531386440}
- {fileID: 4193405933970668}
- {fileID: 4632251343287894}
m_Father: {fileID: 4692536726088814}
@@ -237,7 +219,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4474924839034674}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4634566977549446
Transform:
@@ -280,19 +262,6 @@
m_Father: {fileID: 4474924839034674}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4723159531386440
-Transform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1587827669074122}
- m_LocalRotation: {x: 0.05796622, y: 0.0021063378, z: 0.8164426, w: 0.57450587}
- m_LocalPosition: {x: 0.083, y: 0.09, z: -0.707}
- m_LocalScale: {x: 0.007035266, y: 0.007035256, z: 0.00518115}
- m_Children: []
- m_Father: {fileID: 4474924839034674}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: -183.621, y: 185.582, z: -430.089}
--- !u!4 &4793282980730782
Transform:
m_ObjectHideFlags: 1
@@ -352,38 +321,6 @@
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
---- !u!23 &23568642423993498
-MeshRenderer:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1587827669074122}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 0
- m_ReflectionProbeUsage: 0
- m_Materials:
- - {fileID: 2100000, guid: 28775f05a79d3aa42b2c433cfc87c01b, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
--- !u!33 &33112808768945606
MeshFilter:
m_ObjectHideFlags: 1
@@ -391,13 +328,6 @@
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1822695091238106}
m_Mesh: {fileID: 4300000, guid: bce1940d6f2f03e4fba1aeaf08e00b3f, type: 3}
---- !u!33 &33805207806579544
-MeshFilter:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1587827669074122}
- m_Mesh: {fileID: 4300000, guid: cb65593c69de8714280057e8da1eda30, type: 3}
--- !u!95 &95009114290865528
Animator:
serializedVersion: 3
@@ -3630,7 +3560,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -1538626133
+ randomSeed: 29468021
InitialModule:
serializedVersion: 3
enabled: 1
@@ -6756,7 +6686,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: -431123999
+ randomSeed: 1273917591
InitialModule:
serializedVersion: 3
enabled: 1
@@ -13026,7 +12956,7 @@
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
- randomSeed: 2117264448
+ randomSeed: -798657323
InitialModule:
serializedVersion: 3
enabled: 1
--
Gitblit v1.8.0