Commit 02d92f97 authored by Tommé Nöll's avatar Tommé Nöll
Browse files

Merge branch 'Yoan'

parents 9a790b3e 03ec520b
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: WindLeaves
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6ccd9b58969a2e34a98ec5ae79a43467, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: ecdb4f8d3a4e35a4eb03def0cb3fb04b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -552,7 +552,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1275695134}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 430293728}
......@@ -811,9 +811,9 @@ ParticleSystem:
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
minScalar: 0.8
maxCurve:
serializedVersion: 2
m_Curve:
......@@ -864,7 +864,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
......@@ -917,7 +917,7 @@ ParticleSystem:
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
minMaxState: 0
minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
......@@ -1889,36 +1889,36 @@ ParticleSystem:
m_NumAlphaKeys: 2
UVModule:
serializedVersion: 2
enabled: 0
enabled: 1
mode: 0
timeMode: 0
fps: 30
frameOverTime:
serializedVersion: 2
minMaxState: 1
minMaxState: 3
scalar: 0.9999
minScalar: 0.9999
minScalar: 0
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
inSlope: 1
outSlope: 1
tangentMode: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 0
tangentMode: 0
outSlope: 1
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
......@@ -2000,7 +2000,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
speedRange: {x: 0, y: 1}
tilesX: 1
tilesX: 11
tilesY: 1
animationType: 0
rowIndex: 0
......@@ -3588,7 +3588,7 @@ ParticleSystem:
rotationAmount:
serializedVersion: 2
minMaxState: 0
scalar: 200
scalar: 800
minScalar: 0
maxCurve:
serializedVersion: 2
......@@ -5238,7 +5238,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: ecdb4f8d3a4e35a4eb03def0cb3fb04b, type: 2}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
......@@ -5293,8 +5293,8 @@ GameObject:
- component: {fileID: 1611726988538008503}
- component: {fileID: 1611726988538008501}
- component: {fileID: 1611726988538008500}
m_Layer: 0
m_Name: Wind Zone
m_Layer: 17
m_Name: WindZone
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......
......@@ -23,7 +23,7 @@ TagManager:
-
-
-
-
- Trigger
-
-
-
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment