Merge branch 'ShaoNv' of http://192.168.1.21:3000/root/miduo_client into ShaoNv
commit
05fc6b1307
|
|
@ -80,5 +80,5 @@ Material:
|
|||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Offset_WH: {r: 0.06, g: 0, b: 0.5096, a: 0.26}
|
||||
- _Offset_WH: {r: 0.04, g: 0, b: 0.5096, a: 0.26}
|
||||
- _Speed_Tilling: {r: 0.155, g: 0, b: 3, a: 1}
|
||||
|
|
|
|||
|
|
@ -75,10 +75,10 @@ Material:
|
|||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
- _time: 0
|
||||
- _timeAdd: 0.44
|
||||
- _timeAdd: -6.91
|
||||
- _timeTest: 0
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Offset_WH: {r: 0, g: 0.37, b: 0.98, a: 0.58}
|
||||
- _Speed_Tilling: {r: 0.05, g: 0, b: 4, a: 1.2}
|
||||
- _Offset_WH: {r: 0.06, g: 0.36, b: 0.91, a: 0.58}
|
||||
- _Speed_Tilling: {r: 0.05, g: 0, b: 4.03, a: 1}
|
||||
|
|
|
|||
|
|
@ -75,10 +75,10 @@ Material:
|
|||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
- _time: 0
|
||||
- _timeAdd: 2.11
|
||||
- _timeAdd: 3.22
|
||||
- _timeTest: 0
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Offset_WH: {r: -0.03, g: 0.28, b: 0.97, a: 0.36}
|
||||
- _Offset_WH: {r: 0, g: 0.28, b: 1, a: 0.35}
|
||||
- _Speed_Tilling: {r: 0.155, g: 0, b: 4, a: 1.2}
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ Material:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Scene001_04
|
||||
m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
m_CustomRenderQueue: 980
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
|
|
@ -23,6 +23,10 @@ Material:
|
|||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BackTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
|
|
@ -39,14 +43,26 @@ Material:
|
|||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _DownTex:
|
||||
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}
|
||||
- _FrontTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _GradientTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _LeftTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 4834055f9eb0ca94ebb01a92530ef13f, type: 3}
|
||||
m_Scale: {x: 1, y: 0.12}
|
||||
|
|
@ -75,6 +91,18 @@ Material:
|
|||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _RightTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _UpTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _raodongwenli:
|
||||
m_Texture: {fileID: 2800000, guid: 6c3c04ab7b87e7c4599ff68cf810f179, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _texcoord:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
|
|
@ -83,14 +111,21 @@ Material:
|
|||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _xingzhuang:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- PixelSnap: 0
|
||||
- _Billboard: 0
|
||||
- _Bottom_Y: 0
|
||||
- _BumpScale: 1
|
||||
- _ColorMask: 15
|
||||
- _CullMode: 0
|
||||
- _Cutoff: 0.5
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _EnableExternalAlpha: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
|
|
@ -101,11 +136,20 @@ Material:
|
|||
- _Move_Y: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _Rotator_copy: 0
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _Stencil: 0
|
||||
- _StencilComp: 8
|
||||
- _StencilOp: 0
|
||||
- _StencilReadMask: 255
|
||||
- _StencilWriteMask: 255
|
||||
- _Top_Y: 0
|
||||
- _UVSec: 0
|
||||
- _U_Speed_copy: -0.5
|
||||
- _UseUIAlphaClip: 0
|
||||
- _V_Speed_copy: -0.5
|
||||
- _ZWrite: 1
|
||||
- _rotate: 0
|
||||
- _time: 0
|
||||
|
|
@ -116,7 +160,9 @@ Material:
|
|||
- _Color1: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color2: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Flip: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _NoiseSpeed: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _Noise_Tiling_Offset: {r: 1, g: 1, b: 0, a: 0}
|
||||
- _Offset_WH: {r: 0, g: 0.9, b: 1, a: 1}
|
||||
- _Speed_Tilling: {r: 0, g: 0, b: 9.84, a: 1}
|
||||
- _Offset_WH: {r: 0, g: 0, b: 1.55, a: 146.98}
|
||||
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Speed_Tilling: {r: 0, g: 0.51, b: 0, a: 1}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Material:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Scene001_05
|
||||
m_Shader: {fileID: 4800000, guid: 4ed79c171eb2b6a47877cba5b0a1f35a, type: 3}
|
||||
m_ShaderKeywords: _BILLBOARD_ON _ISLOOP_ON
|
||||
m_ShaderKeywords: _BILLBOARD_ON
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
|
|
@ -40,7 +40,7 @@ Material:
|
|||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: 314b3991243d1df43b9a519344ad38ad, type: 3}
|
||||
m_Texture: {fileID: 2800000, guid: 4834055f9eb0ca94ebb01a92530ef13f, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MetallicGlossMap:
|
||||
|
|
@ -64,7 +64,7 @@ Material:
|
|||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.5
|
||||
- _GlossyReflections: 1
|
||||
- _ISLoop: 1
|
||||
- _ISLoop: 0
|
||||
- _Metallic: 0
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
|
|
@ -74,11 +74,11 @@ Material:
|
|||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 1
|
||||
- _time: 0
|
||||
- _time: -4.96
|
||||
- _timeAdd: 0
|
||||
- _timeTest: 0
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _Offset_WH: {r: 0.413, g: 0.54, b: 0.969, a: 0.86}
|
||||
- _Offset_WH: {r: 0, g: 0.8, b: 0.95, a: 0.86}
|
||||
- _Speed_Tilling: {r: 0.04, g: 0, b: 3, a: 1}
|
||||
|
|
|
|||
|
|
@ -4715,7 +4715,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3066785958172314603
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4724,8 +4724,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3066785958172314607}
|
||||
m_LocalRotation: {x: 0.08804693, y: -0, z: -0, w: 0.9961164}
|
||||
m_LocalPosition: {x: 0, y: 3.4899998, z: 6.850002}
|
||||
m_LocalScale: {x: 31.869398, y: 6.1044626, z: 11.447266}
|
||||
m_LocalPosition: {x: 0, y: 3.93, z: 7.38}
|
||||
m_LocalScale: {x: 28.682457, y: 1.5898153, z: 11.447266}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7064588598017826166}
|
||||
m_RootOrder: 4
|
||||
|
|
@ -4801,8 +4801,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3066785958559253650}
|
||||
m_LocalRotation: {x: 0.08804693, y: -0, z: -0, w: 0.9961164}
|
||||
m_LocalPosition: {x: 0, y: 9.91, z: 3.61}
|
||||
m_LocalScale: {x: 49.182575, y: 8.715325, z: 2.180538}
|
||||
m_LocalPosition: {x: 0, y: 4.66, z: 5.59}
|
||||
m_LocalScale: {x: 42.17996, y: 7.474437, z: 1.870073}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7064588598017826166}
|
||||
m_RootOrder: 3
|
||||
|
|
@ -4878,8 +4878,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3066785958571888090}
|
||||
m_LocalRotation: {x: 0.08804693, y: -0, z: -0, w: 0.9961164}
|
||||
m_LocalPosition: {x: 0, y: 8.29, z: 3.47}
|
||||
m_LocalScale: {x: 113.2, y: 11.670672, z: 5.3919}
|
||||
m_LocalPosition: {x: 0, y: 4.6, z: 2.991}
|
||||
m_LocalScale: {x: 55.875652, y: 6.7550993, z: 0}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7064588598017826166}
|
||||
m_RootOrder: 2
|
||||
|
|
@ -5032,8 +5032,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3066785958658542066}
|
||||
m_LocalRotation: {x: 0.08804693, y: -0, z: -0, w: 0.9961164}
|
||||
m_LocalPosition: {x: 0, y: 3.93, z: 2.21}
|
||||
m_LocalScale: {x: 37.1, y: 3.26, z: 5.3919}
|
||||
m_LocalPosition: {x: 0, y: 3.45, z: 2.19}
|
||||
m_LocalScale: {x: 65.13715, y: 4.331338, z: 6.0553966}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7064588598017826166}
|
||||
m_RootOrder: 1
|
||||
|
|
@ -5100,7 +5100,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3066785959919920070
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5109,7 +5109,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3066785959919920074}
|
||||
m_LocalRotation: {x: 0.08804693, y: -0, z: -0, w: 0.9961164}
|
||||
m_LocalPosition: {x: 0, y: 16.37, z: 25.79}
|
||||
m_LocalPosition: {x: 0, y: 10.3, z: 24.7}
|
||||
m_LocalScale: {x: 34.8, y: 26.110092, z: 23.26913}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7064588598017826166}
|
||||
|
|
@ -5186,8 +5186,8 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4311803956719228985}
|
||||
m_LocalRotation: {x: 0.00000002266255, y: 0.85509294, z: 0.51847476, w: -0.000000037376875}
|
||||
m_LocalPosition: {x: 0, y: -0.969, z: -3.379}
|
||||
m_LocalScale: {x: 2.5, y: 0.9307578, z: 1}
|
||||
m_LocalPosition: {x: -0, y: -1.091, z: -3.612}
|
||||
m_LocalScale: {x: 2.5, y: 0.8786354, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7064588598017826166}
|
||||
m_RootOrder: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue