浏览代码

Merge remote-tracking branch 'origin/demo_brandanddesign' into demo-work

# Conflicts:
#	Assets/Objects/environment/Cliffs/Env_DistantCards.fbx.meta
#	Assets/Objects/environment/Cliffs/Maps/BGcards_Albedo.png.meta
#	Assets/Objects/environment/Cliffs/Maps/BGcards_Normal.png.meta
#	Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat
#	Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat.meta
#	Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat
#	Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat.meta
#	Assets/Objects/environment/Trees/small_tree_A.fbx
#	Assets/Objects/environment/Trees/small_tree_A.fbx.meta
#	ProjectSettings/QualitySettings.asset
/demo-work
André McGrail 5 年前
当前提交
2addac81
共有 24 个文件被更改,包括 2647 次插入1041 次删除
  1. 4
      Assets/Objects/environment/Cliffs/Env_DistantCards.fbx.meta
  2. 8
      Assets/Objects/environment/Cliffs/Maps/BGcards_Albedo.png.meta
  3. 2
      Assets/Objects/environment/Cliffs/Maps/BGcards_Normal.png.meta
  4. 17
      Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat
  5. 2
      Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat.meta
  6. 8
      Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat
  7. 2
      Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat.meta
  8. 5
      Assets/Objects/environment/Trees/Materials/Softvegetation.mat
  9. 2
      Assets/Objects/environment/Trees/Materials/Trees.mat
  10. 1001
      Assets/Objects/environment/Trees/small_tree_A.fbx
  11. 10
      Assets/Objects/environment/Trees/small_tree_A.fbx.meta
  12. 22
      Assets/scenes/Island-kateEdits.unity
  13. 103
      Assets/Objects/environment/Trees/Maps/SmallTree_A_Albedo.png.meta
  14. 103
      Assets/Objects/environment/Trees/Maps/SmallTree_A_Normal.png.meta
  15. 103
      Assets/Objects/environment/Trees/Maps/Trees_variant_Albedo.png.meta
  16. 1001
      Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Color.png
  17. 103
      Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Color.png.meta
  18. 1001
      Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Normal.png
  19. 91
      Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Normal.png.meta
  20. 92
      Assets/Objects/environment/Trees/Materials/SmallTree_A_MAT.mat
  21. 8
      Assets/Objects/environment/Trees/Materials/SmallTree_A_MAT.mat.meta

4
Assets/Objects/environment/Cliffs/Env_DistantCards.fbx.meta


fileFormatVersion: 2
guid: c643b011f5a02d14899b7dd439a62567
guid: 92febf711e39aeb44b89a048e44567d3
ModelImporter:
serializedVersion: 28
internalIDToNameTable: []

assembly: UnityEngine.CoreModule
name: lambert1
second: {fileID: 2100000, guid: ed50f7e5c91218943b29d6ffc23fb27d, type: 2}
second: {fileID: 2100000, guid: 24520a3665efa4b43a01b002ac7691d1, type: 2}
materials:
materialImportMode: 1
materialName: 0

8
Assets/Objects/environment/Cliffs/Maps/BGcards_Albedo.png.meta


fileFormatVersion: 2
guid: 3e5172134615a504899177f506080329
guid: cc51aa767e46ad743b45b885e8038a6b
mipMapMode: 0
mipMapMode: 1
borderMipMap: 0
mipMapsPreserveCoverage: 0
borderMipMap: 1
mipMapsPreserveCoverage: 1
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3

2
Assets/Objects/environment/Cliffs/Maps/BGcards_Normal.png.meta


fileFormatVersion: 2
guid: c781a528765ee404dbfb3d499d3f6f48
guid: 039bc0bfadf2c20439776c3b5c86208e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

17
Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat


m_PrefabAsset: {fileID: 0}
m_Name: Env_DistantCards_MAT
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_ShaderKeywords: _ALPHATEST_ON _ENVIRONMENTREFLECTIONS_OFF _NORMALMAP _SPECULAR_SETUP
m_ShaderKeywords: _ALPHATEST_ON _ENVIRONMENTREFLECTIONS_OFF _NORMALMAP _RECEIVE_SHADOWS_OFF
_SPECULAR_SETUP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 3e5172134615a504899177f506080329, type: 3}
m_Texture: {fileID: 2800000, guid: cc51aa767e46ad743b45b885e8038a6b, type: 3}
m_Texture: {fileID: 2800000, guid: c781a528765ee404dbfb3d499d3f6f48, type: 3}
m_Texture: {fileID: 2800000, guid: 039bc0bfadf2c20439776c3b5c86208e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:

- _MainTex:
m_Texture: {fileID: 2800000, guid: 3e5172134615a504899177f506080329, type: 3}
m_Texture: {fileID: 2800000, guid: cc51aa767e46ad743b45b885e8038a6b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

m_Floats:
- _AlphaClip: 1
- _Blend: 0
- _BumpScale: 1
- _BumpScale: 5
- _Cutoff: 0.5
- _Cutoff: 0.75
- _DstBlend: 0
- _EnvironmentReflections: 0
- _GlossMapScale: 0

- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _ReceiveShadows: 0
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1

- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

2
Assets/Objects/environment/Cliffs/Materials/Env_DistantCards_MAT.mat.meta


fileFormatVersion: 2
guid: ed50f7e5c91218943b29d6ffc23fb27d
guid: 24520a3665efa4b43a01b002ac7691d1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0

8
Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat


m_PrefabAsset: {fileID: 0}
m_Name: SmallTreeA_bilboard_MAT
m_Shader: {fileID: 4800000, guid: 1adca499d9899854aa1b4011854d49fb, type: 3}
m_ShaderKeywords: _CORRECTNORMALS _ENVIRONMENTREFLECTIONS_OFF _VERTEXANIMATION
m_ShaderKeywords: _CORRECTNORMALS _ENVIRONMENTREFLECTIONS_OFF
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0

serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 767f4eb3ba74e7a49b5608c04f06c5b2, type: 3}
m_Texture: {fileID: 2800000, guid: ff5021a132b0ef849ae84ddd7d7bd7e5, type: 3}
m_Texture: {fileID: 2800000, guid: b03e1990ce44d184b9b32a1d71442cf3, type: 3}
m_Texture: {fileID: 2800000, guid: d44ec50c378b09a4db77a3fa32df63e7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:

- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _VertexAnimation: 1
- _VertexAnimation: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:

2
Assets/Objects/environment/Trees/Materials/SmallTreeA_bilboard_MAT.mat.meta


fileFormatVersion: 2
guid: dad76ebc1f8dcc845b3ccbf5d4640ae5
guid: 2cc05b7e8938cbf45b210150d7bf3c9f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0

5
Assets/Objects/environment/Trees/Materials/Softvegetation.mat


serializedVersion: 3
m_TexEnvs:
- Texture2D_B222E8F:
m_Texture: {fileID: 2800000, guid: 8fd1a09f036e77d46a48c04c8d159cb9, type: 3}
m_Texture: {fileID: 2800000, guid: df9440669043d9147bff5a81502c7c1c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_D9BFD5F1:

m_Offset: {x: 0, y: 0}
m_Floats:
- BOOLEAN_D0D03BFD: 0
- Boolean_F799EE7C: 0
- Vector1_4F6BB00E: 0.8
- Vector1_4F6BB00E: 0.875
- _AlphaClip: 1
- _BendStrength: 0
- _Blend: 0

2
Assets/Objects/environment/Trees/Materials/Trees.mat


serializedVersion: 3
m_TexEnvs:
- Texture2D_B222E8F:
m_Texture: {fileID: 2800000, guid: 8fd1a09f036e77d46a48c04c8d159cb9, type: 3}
m_Texture: {fileID: 2800000, guid: df9440669043d9147bff5a81502c7c1c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_D9BFD5F1:

1001
Assets/Objects/environment/Trees/small_tree_A.fbx
文件差异内容过多而无法显示
查看文件

10
Assets/Objects/environment/Trees/small_tree_A.fbx.meta


fileFormatVersion: 2
guid: 3b904783061ac5c43b3f491cba912355
guid: caa8bba7a33d27e4ba0553fa18a652e3
ModelImporter:
serializedVersion: 28
internalIDToNameTable: []

assembly: UnityEngine.CoreModule
name: lambert2
second: {fileID: 2100000, guid: a06ce52c3f606b04db21955abfd0c2ef, type: 2}
name: small_tree_A_Billboard_LOD3
second: {fileID: 2100000, guid: 2cc05b7e8938cbf45b210150d7bf3c9f, type: 2}
name: small_tree_v01_Billboard_LOD3
second: {fileID: 2100000, guid: dad76ebc1f8dcc845b3ccbf5d4640ae5, type: 2}
name: small_tree_MAT
second: {fileID: 2100000, guid: 750f8585391a21648a6dbb7d0c0dfc42, type: 2}
materials:
materialImportMode: 1
materialName: 0

22
Assets/scenes/Island-kateEdits.unity


m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153441711}
m_LocalRotation: {x: 0.16890061, y: -0.81706506, z: 0.3275648, w: 0.44337186}
m_LocalRotation: {x: 0.16921982, y: -0.81662846, z: 0.32738495, w: 0.44418666}
m_LocalPosition: {x: -77.74759, y: 8.297212, z: -21.408878}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

- target: {fileID: 4534517681006197974, guid: bd1a31d6e589d4df7bf401593b7f735a,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4534517681006197974, guid: bd1a31d6e589d4df7bf401593b7f735a,
type: 3}

- {fileID: 1066609277}
- {fileID: 597900507}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 144.093, z: 0}
--- !u!1 &324248880
GameObject:

objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 074aa8ca109924e18baf19f3e26665b6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -50
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 074aa8ca109924e18baf19f3e26665b6, type: 3}
propertyPath: m_LocalPosition.y

propertyPath: m_LocalPosition.z
value: 0
value: -43.75
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 074aa8ca109924e18baf19f3e26665b6, type: 3}
propertyPath: m_LocalRotation.x

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143740434}
m_LocalRotation: {x: -0.0027673417, y: 0.9054671, z: -0.0059040007, w: -0.4243665}
m_LocalRotation: {x: -0.0027653044, y: 0.9056135, z: -0.005904955, w: -0.4240541}
m_LocalPosition: {x: 42, y: 2.51, z: 62.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1376922736}
m_LocalRotation: {x: -0.0132670235, y: 0.9827769, z: -0.16695733, w: -0.078094974}
m_LocalRotation: {x: -0.013267021, y: 0.9827769, z: -0.16695736, w: -0.078094944}
m_LocalPosition: {x: 69.76, y: 3.82, z: 81.16}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

- target: {fileID: 1790745783105967003, guid: baaa45186293644edb4da9d1f4b1fa80,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1790745783105967003, guid: baaa45186293644edb4da9d1f4b1fa80,
type: 3}

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1768035350}
m_LocalRotation: {x: -0.0056329533, y: 0.98484004, z: -0.03257802, w: -0.1702853}
m_LocalRotation: {x: -0.0056329533, y: 0.98484004, z: -0.032578018, w: -0.1702853}
m_LocalPosition: {x: -52.17383, y: 5.022266, z: 35.95739}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1819032313
MonoBehaviour:

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1973407761}
m_LocalRotation: {x: -0.057876512, y: 0.3076704, z: -0.018753057, w: -0.94954604}
m_LocalRotation: {x: -0.05787651, y: 0.3076704, z: -0.018753057, w: -0.94954604}
m_LocalPosition: {x: -78.2276, y: 1.1, z: -34.651066}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:

103
Assets/Objects/environment/Trees/Maps/SmallTree_A_Albedo.png.meta


fileFormatVersion: 2
guid: 423684eaf58fc32468d1e9296178d773
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 1
mipMapsPreserveCoverage: 1
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

103
Assets/Objects/environment/Trees/Maps/SmallTree_A_Normal.png.meta


fileFormatVersion: 2
guid: cc3d36a630041124384adca1eba699b4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 1
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

103
Assets/Objects/environment/Trees/Maps/Trees_variant_Albedo.png.meta


fileFormatVersion: 2
guid: df9440669043d9147bff5a81502c7c1c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 1
mipMapsPreserveCoverage: 1
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

1001
Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Color.png
文件差异内容过多而无法显示
查看文件

103
Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Color.png.meta


fileFormatVersion: 2
guid: ff5021a132b0ef849ae84ddd7d7bd7e5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 1
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 1
mipMapsPreserveCoverage: 1
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

1001
Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Normal.png
文件差异内容过多而无法显示
查看文件

91
Assets/Objects/environment/Trees/Maps/small_tree_A_Billboard_Normal.png.meta


fileFormatVersion: 2
guid: d44ec50c378b09a4db77a3fa32df63e7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 1
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

92
Assets/Objects/environment/Trees/Materials/SmallTree_A_MAT.mat


%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: SmallTree_A_MAT
m_Shader: {fileID: -6465566751694194690, guid: 4003ffa965d444d209561b52e55c61fc,
type: 3}
m_ShaderKeywords: _CORRECTNORMALS
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_B222E8F:
m_Texture: {fileID: 2800000, guid: 423684eaf58fc32468d1e9296178d773, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_D9BFD5F1:
m_Texture: {fileID: 2800000, guid: cc3d36a630041124384adca1eba699b4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 7ff713109066b084d9594d631003996f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: f7026984efc3cea4080048ce1d02f1dc, type: 3}
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: 0}
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}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- Boolean_F799EE7C: 0
- Vector1_19FBDA45: 0.07
- Vector1_4F6BB00E: 0.8
- _AlphaClip: 0
- _BendStrength: 0.0872
- _Blend: 0
- _BumpScale: 1
- _CorrectNormals: 1
- _Cull: 2
- _Cutoff: 0.607
- _DstBlend: 0
- _EnvironmentReflections: 1
- _Gloss: 0.205
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _VertexAnimation: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

8
Assets/Objects/environment/Trees/Materials/SmallTree_A_MAT.mat.meta


fileFormatVersion: 2
guid: 750f8585391a21648a6dbb7d0c0dfc42
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

部分文件因为文件数量过多而无法显示

正在加载...
取消
保存