浏览代码

New tree type

/main
Ciro Continisio 4 年前
当前提交
f588e37a
共有 12 个文件被更改,包括 3618 次插入887 次删除
  1. 80
      UOP1_Project/Assets/Scenes/ArtShowcase.unity
  2. 27
      UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset
  3. 998
      UOP1_Project/Assets/Scenes/ArtShowcase/Lightmap-0_comp_light.exr
  4. 1001
      UOP1_Project/Assets/Scenes/ArtShowcase/Lightmap-1_comp_light.exr
  5. 112
      UOP1_Project/Assets/Art/Nature/Tree/TreeBig.mat
  6. 8
      UOP1_Project/Assets/Art/Nature/Tree/TreeBig.mat.meta
  7. 1001
      UOP1_Project/Assets/Art/Nature/Tree/TreeBig_Albedo.png
  8. 92
      UOP1_Project/Assets/Art/Nature/Tree/TreeBig_Albedo.png.meta
  9. 1001
      UOP1_Project/Assets/Art/Nature/Tree/TreeBig_low.FBX
  10. 97
      UOP1_Project/Assets/Art/Nature/Tree/TreeBig_low.FBX.meta
  11. 81
      UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab
  12. 7
      UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab.meta

80
UOP1_Project/Assets/Scenes/ArtShowcase.unity


m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.12963848, g: 0.3062157, b: 0.59012824, a: 1}
m_IndirectSpecularColor: {r: 0.1296382, g: 0.3062154, b: 0.5901275, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:

m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 1e-45, y: 3.5268e-41, z: 0, w: -1}
m_BoundingSphereOverride: {x: 0, y: 2.3305366e-15, z: 4.5825e-41, w: -1}
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0

m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 64.945, y: 195.012, z: 230.504}
--- !u!1001 &672008926
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1992061465}
m_Modifications:
- target: {fileID: 3985924782578800889, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_Name
value: TreeBig
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalPosition.x
value: 21.25
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.25
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.75
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000021855694
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6408fbad8bbb34ce9a0327ac43ea7c70, type: 3}
--- !u!4 &672008927 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4331066273685914179, guid: 6408fbad8bbb34ce9a0327ac43ea7c70,
type: 3}
m_PrefabInstance: {fileID: 672008926}
m_PrefabAsset: {fileID: 0}
--- !u!1 &674912341
GameObject:
m_ObjectHideFlags: 0

- {fileID: 1906817129924280029}
- {fileID: 3659024205380409935}
- {fileID: 6829223592149183767}
- {fileID: 672008927}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

27
UOP1_Project/Assets/Scenes/ArtShowcase/LightingData.asset
文件差异内容过多而无法显示
查看文件

998
UOP1_Project/Assets/Scenes/ArtShowcase/Lightmap-0_comp_light.exr
文件差异内容过多而无法显示
查看文件

1001
UOP1_Project/Assets/Scenes/ArtShowcase/Lightmap-1_comp_light.exr
文件差异内容过多而无法显示
查看文件

112
UOP1_Project/Assets/Art/Nature/Tree/TreeBig.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: TreeBig
m_Shader: {fileID: -6465566751694194690, guid: 7fdaae2b9572343449616bd7b38bce5a,
type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 8edbda94a99753b47a061e31ad9273b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
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: 8edbda94a99753b47a061e31ad9273b9, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 19448afa1c7df4524a64b4ec5cb34460, 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}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecularMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _LightProbeContribution: 1
- _MainTint_VariationIntensity: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _OutlineDepthSensitivity: 0
- _OutlineNormalsSensitivity: 0
- _OutlineThickness: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _Wind_Density: 0.2
- _Wind_Direction: 0
- _Wind_Speed: 2
- _Wind_Strength: 0.1
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _MainColor: {r: 1, g: 1, b: 1, a: 1}
- _MainTint: {r: 0.7799547, g: 0.8018868, b: 0, a: 0}
- _Offset: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
- _Tiling: {r: 1, g: 1, b: 0, a: 0}
--- !u!114 &5036623952281789401
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 2

8
UOP1_Project/Assets/Art/Nature/Tree/TreeBig.mat.meta


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

1001
UOP1_Project/Assets/Art/Nature/Tree/TreeBig_Albedo.png
文件差异内容过多而无法显示
查看文件

92
UOP1_Project/Assets/Art/Nature/Tree/TreeBig_Albedo.png.meta


fileFormatVersion: 2
guid: 19448afa1c7df4524a64b4ec5cb34460
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
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: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 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:

1001
UOP1_Project/Assets/Art/Nature/Tree/TreeBig_low.FBX
文件差异内容过多而无法显示
查看文件

97
UOP1_Project/Assets/Art/Nature/Tree/TreeBig_low.FBX.meta


fileFormatVersion: 2
guid: ad449e335a49648d592056fd8b67a926
ModelImporter:
serializedVersion: 19301
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 1
useFileUnits: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVPackMargin: 8
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

81
UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4292406161015317928
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000021855694
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: aa5146faf7ff24a39a45d4754d73faac, type: 2}
- target: {fileID: 919132149155446097, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_Name
value: TreeBig
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: ad449e335a49648d592056fd8b67a926,
type: 3}
propertyPath: m_StaticEditorFlags
value: 123
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ad449e335a49648d592056fd8b67a926, type: 3}

7
UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab.meta


fileFormatVersion: 2
guid: 6408fbad8bbb34ce9a0327ac43ea7c70
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存