浏览代码

Updating sand and Water

/main
John OReilly 6 年前
当前提交
6853000e
共有 13 个文件被更改,包括 3220 次插入1337 次删除
  1. 1000
      Assets/IslandScene/Sand/Fbx_IslandSand.FBX
  2. 3
      Assets/IslandScene/Sand/Fbx_IslandSand.FBX.meta
  3. 2
      Assets/IslandScene/Sand/Material_Sand.mat
  4. 740
      Assets/IslandScene/Scene_Island.unity
  5. 979
      Assets/IslandScene/Water/Fbx_IslandWater.FBX
  6. 18
      Assets/IslandScene/Water/Fbx_IslandWater.FBX.meta
  7. 6
      Assets/IslandScene/Water/Material_IslandWater.mat
  8. 250
      Assets/IslandScene/Water/Preset_IslandWater-1.preset
  9. 2
      Assets/ProCore/Polybrush/Color Palettes/Default.asset
  10. 413
      Assets/ProCore/Polybrush/Shader/z_TextureBlendHeight.shader
  11. 421
      Assets/ProCore/Polybrush/Shader/z_TriPlanarBlend.shader
  12. 629
      Assets/IslandScene/Sand/Fbx_IslandSand - Copy.FBX
  13. 94
      Assets/IslandScene/Sand/Fbx_IslandSand - Copy.FBX.meta

1000
Assets/IslandScene/Sand/Fbx_IslandSand.FBX
文件差异内容过多而无法显示
查看文件

3
Assets/IslandScene/Sand/Fbx_IslandSand.FBX.meta


3300000: //RootNode
4300000: SandDome003
4300002: WaterDomeDoubleTurboTessMore
4300004: WaterDomeCopy003
4300006: WaterDomeCopy004
4300008: WaterDomeCopy005
externalObjects: {}
materials:
importMaterials: 1

2
Assets/IslandScene/Sand/Material_Sand.mat


m_Floats:
- Boolean_3F48562E: 0
- Vector1_94D5305: 2.78
- Vector1_D6ACAC2D: 4.99
- Vector1_D6ACAC2D: 10.96
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1

740
Assets/IslandScene/Scene_Island.unity
文件差异内容过多而无法显示
查看文件

979
Assets/IslandScene/Water/Fbx_IslandWater.FBX
文件差异内容过多而无法显示
查看文件

18
Assets/IslandScene/Water/Fbx_IslandWater.FBX.meta


fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2100000: Material_WaterBase
2100002: Material_WaterSurface
2100004: No Name
2100000: No Name
4300000: Capsule002Bool1
4300002: WaterDome
4300004: WaterDomeSmooth002
4300006: WaterDomeDoubleTurbo
4300008: WaterDomeDoubleTurboTess
4300010: WaterDomeDoubleTurboTessMore
4300000: WaterNew002
4300002: WaterDomeSquash
externalObjects: {}
materials:
importMaterials: 1

previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 88
normalSmoothAngle: 60
tangentImportMode: 0
normalCalculationMode: 1
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 1
copyAvatar: 0
humanDescription:

6
Assets/IslandScene/Water/Material_IslandWater.mat


- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- Color_120283E2: {r: 0.29369885, g: 0.35512605, b: 0.8301887, a: 1}
- Color_120283E2: {r: 0.29369882, g: 0.35512602, b: 0.8301887, a: 1}
- Color_3974F997: {r: 0.14509791, g: 0.9490196, b: 1, a: 1}
- Color_ACACFC30: {r: 0.6127626, g: 0.92731404, b: 0.9622642, a: 1}
- Color_3974F997: {r: 0.14509788, g: 0.9490196, b: 1, a: 1}
- Color_ACACFC30: {r: 0.6127626, g: 0.92731404, b: 0.9622641, a: 1}
- Vector2_1000B2F1: {r: 0, g: 1, b: 0, a: 0}
- Vector2_113ECD47: {r: 0.2, g: 0.2, b: 0, a: 0}
- Vector2_7922229F: {r: 0.38, g: 1, b: 0, a: 0}

250
Assets/IslandScene/Water/Preset_IslandWater-1.preset


objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_CustomRenderQueue
value: -1
value: 3000
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: stringTagMap.Array.size

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.size
value: 58
value: 62
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[0].first

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[4].second
value: 14
value: 2.65
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[5].first

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[6].first
value: Vector1_3B6C6CA7
value: Vector1_3170A691
value: 0.04
value: 0.663
value: Vector1_40E2F0ED
value: Vector1_361B5521
value: 0.5
value: 5.2
value: Vector1_4735D5E2
value: Vector1_3B6C6CA7
value: 0.42
value: 0.04
value: Vector1_503C980E
value: Vector1_40E2F0ED
value: 0.6
value: 0.5
value: Vector1_5685904E
value: Vector1_4735D5E2
value: 1.22
value: 0.42
value: Vector1_5721F4C2
value: Vector1_503C980E
value: 0.63
value: 0.406
value: Vector1_5D17CBA2
value: Vector1_5685904E
value: 0.3
value: 1.464
value: Vector1_608CA392
value: Vector1_5721F4C2
value: 1
value: 0.63
value: Vector1_632F7C2E
value: Vector1_5D17CBA2
value: 1.54
value: 0.3
value: Vector1_6EF52C6
value: Vector1_608CA392
value: 2
value: 1
value: Vector1_72D9B0C5
value: Vector1_632F7C2E
value: 1.5
value: 1.54
value: Vector1_72F0D5FC
value: Vector1_6D0F772
value: 0
value: 0.476
value: Vector1_730BBE62
value: Vector1_6EF52C6
value: 0.799
value: 1.98
value: Vector1_770B5A60
value: Vector1_72D9B0C5
value: 1.67
value: 1.5
value: Vector1_7FD4B9D0
value: Vector1_72F0D5FC
value: 1
value: 0.013
value: Vector1_8403193C
value: Vector1_730BBE62
value: 1.01
value: 0.799
value: Vector1_8D2F509D
value: Vector1_770B5A60
value: 1.64
value: 1.67
value: Vector1_95BDBEC1
value: Vector1_7FD4B9D0
value: 8
value: 1
value: Vector1_961065ED
value: Vector1_8403193C
value: 0.028
value: 1.01
value: Vector1_9872C2E5
value: Vector1_8D2F509D
value: 0
value: 1.64
value: Vector1_A04E5E21
value: Vector1_95BDBEC1
value: 1.67
value: 5
value: Vector1_A6C44B0B
value: Vector1_961065ED
value: 0.25
value: 0.028
value: Vector1_B4A117B7
value: Vector1_9872C2E5
value: 0.3
value: 8.65
value: Vector1_B9797993
value: Vector1_A04E5E21
value: 0.5
value: 1.67
value: Vector1_C800E0A4
value: Vector1_A6C44B0B
value: 0.4
value: 0.25
value: Vector1_E58F6327
value: Vector1_B4A117B7
value: 1
value: 0.36
value: Vector1_F1BE6F9F
value: Vector1_B9797993
value: 0.253
value: 0.5
value: Vector1_F44D25A0
value: Vector1_C800E0A4
value: 0.411
value: 0.48
value: Vector1_F68B8AAF
value: Vector1_E58F6327
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[34].second

propertyPath: m_SavedProperties.m_Floats.Array.data[35].first
value: Vector1_F9DF03AF
value: Vector1_F1BE6F9F
value: 35
value: 0.378
value: Vector1_FA3225CB
value: Vector1_F44D25A0
value: 6
value: 0.411
value: Vector1_FF940B40
value: Vector1_F68B8AAF
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[37].second

propertyPath: m_SavedProperties.m_Floats.Array.data[38].first
value: _AlphaClip
value: Vector1_F8EFDF11
value: 0
value: 17.82
value: _Blend
value: Vector1_F9DF03AF
value: 0
value: 35
value: _BumpScale
value: Vector1_FA3225CB
value: 1
value: 4.99
value: _Cull
value: Vector1_FF940B40
value: 2
value: 1
value: _Cutoff
value: _AlphaClip
value: 0.5
value: 0
value: _DetailNormalMapScale
value: _Blend
value: 1
value: 0
value: _DstBlend
value: _BumpScale
value: 0
value: 1
value: _GlossMapScale
value: _Cull
value: 1
value: 2
value: _Glossiness
value: _Cutoff
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[46].second

propertyPath: m_SavedProperties.m_Floats.Array.data[47].first
value: _GlossyReflections
value: _DetailNormalMapScale
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[47].second

propertyPath: m_SavedProperties.m_Floats.Array.data[48].first
value: _Metallic
value: _DstBlend
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[48].second

propertyPath: m_SavedProperties.m_Floats.Array.data[49].first
value: _OcclusionStrength
value: _GlossMapScale
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[49].second

propertyPath: m_SavedProperties.m_Floats.Array.data[50].first
value: _Parallax
value: _Glossiness
value: 0.02
value: 0.5
value: _SmoothnessTextureChannel
value: _GlossyReflections
value: 0
value: 1
value: _SpecularHighlights
value: _Metallic
value: 1
value: 0
value: _SrcBlend
value: _OcclusionStrength
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[53].second

propertyPath: m_SavedProperties.m_Floats.Array.data[54].first
value: _Surface
value: _Parallax
value: 0
value: 0.02
value: _UVSec
value: _SmoothnessTextureChannel
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[55].second

propertyPath: m_SavedProperties.m_Floats.Array.data[56].first
value: _WorkflowMode
value: _SpecularHighlights
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[56].second

propertyPath: m_SavedProperties.m_Floats.Array.data[57].first
value: _ZWrite
value: _SrcBlend
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[57].second

propertyPath: m_SavedProperties.m_Floats.Array.data[58].first
value: _Surface
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[58].second
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[59].first
value: _UVSec
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[59].second
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[60].first
value: _WorkflowMode
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[60].second
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[61].first
value: _ZWrite
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Floats.Array.data[61].second
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.size
value: 12
objectReference: {fileID: 0}

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[0].second.r
value: 0.21960783
value: 0.29369882
value: 0.35294116
value: 0.35512602
value: 0.50980395
value: 0.8301887
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[0].second.a

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.r
value: 0.14509797
value: 1
value: 0.9490196
value: 1
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.b

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[2].second.r
value: 0.14509794
value: 0.14509788
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[2].second.g

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[3].second.r
value: 0.14509785
value: 0.6127626
value: 0.9490196
value: 0.92731404
value: 1
value: 0.9622641
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[3].second.a

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.r
value: 0.5
value: 0.2
value: 0.5
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.b

objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.r
value: 0.25
value: 0.38
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.g

2
Assets/ProCore/Polybrush/Color Palettes/Default.asset


m_Script: {fileID: 11500000, guid: faf7db05d259ffb47b2b158a2e462d2a, type: 3}
m_Name: Default
m_EditorClassIdentifier:
current: {r: 0, g: 0, b: 0, a: 1}
current: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
colors:
- {r: 0, g: 0.122, b: 0.247, a: 1}
- {r: 0, g: 0.455, b: 0.851, a: 1}

413
Assets/ProCore/Polybrush/Shader/z_TextureBlendHeight.shader


// Upgrade NOTE: replaced '_Object2World' with 'unity_ObjectToWorld'
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
// define Z_TEXTURE_CHANNELS 2
// define Z_MESH_ATTRIBUTES Color
// Important! This is a generated file, any changes will be overwritten

421
Assets/ProCore/Polybrush/Shader/z_TriPlanarBlend.shader


// when the _SfSrc suffixed version of this shader is modified.

629
Assets/IslandScene/Sand/Fbx_IslandSand - Copy.FBX
文件差异内容过多而无法显示
查看文件

94
Assets/IslandScene/Sand/Fbx_IslandSand - Copy.FBX.meta


fileFormatVersion: 2
guid: 0f71124fe9224564daa365842f35c4c5
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2100000: No Name
2300000: //RootNode
3300000: //RootNode
4300000: SandDome003
externalObjects: {}
materials:
importMaterials: 1
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: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存