ntr/kaiju
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to 2021.2

Browse Source
This commit is contained in:
ntr committed 2022-03-29 13:45:47 +11:00
1 parent 71368ec095
commit 499ddbd8dc
76 files changed
+16075 -9578
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/NEO_BlockOut/Cube.prefab
+3 -1
View File
@@ -29,6 +29,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 8, z: -2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -52,6 +53,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -60,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 257
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f6d148a411f1de04e98f1215928d0b25, type: 2}
- {fileID: 2100000, guid: 712e6aeaf43e9bb48bd9a92a9724b768, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Scenes/NEO_BlockOut/CubeIllum 1.shadergraph
+1225 -800
View File
File diff suppressed because it is too large. Load diff
Assets/Scenes/NEO_BlockOut/CubeLight.mat
+6 -1
View File
@@ -116,6 +116,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
@@ -147,6 +148,7 @@ Material:
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
- _DstBlend: 0
- _EmissiveColorMode: 1
@@ -255,4 +257,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 11
version: 12
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
Assets/Scenes/NEO_BlockOut/CubeLightMat.mat
+15 -4
View File
@@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: CubeLightMat
m_Shader: {fileID: -6465566751694194690, guid: 8862ddd8dd0fa844d91970681528f982, type: 3}
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2225
@@ -29,6 +29,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AudioTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -117,6 +121,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
@@ -135,6 +140,7 @@ Material:
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
- _ConservativeDepthOffsetEnable: 0
- _CullMode: 2
- _CullModeForward: 2
- _Cutoff: 0.5
@@ -148,6 +154,7 @@ Material:
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
- _DstBlend: 0
- _EmissiveColorMode: 1
@@ -193,6 +200,7 @@ Material:
- _Smoothness: 0.5
- _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0
- _SpectrumIndex: 0
- _SpecularAAScreenSpaceVariance: 0.1
- _SpecularAAThreshold: 0.2
- _SpecularOcclusionMode: 1
@@ -233,7 +241,7 @@ Material:
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.023584902, g: 1, b: 0.22806269, a: 1}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
@@ -260,4 +268,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 11
version: 12
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
Assets/Scenes/NEO_BlockOut/CubePlain.mat
+17 -5
View File
@@ -8,13 +8,14 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CubePlain
m_Shader: {fileID: -6465566751694194690, guid: 8862ddd8dd0fa844d91970681528f982, type: 3}
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2225
stringTagMap: {}
stringTagMap:
MotionVector: User
disabledShaderPasses:
- TransparentDepthPrepass
- TransparentDepthPostpass
@@ -28,6 +29,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AudioTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -116,6 +121,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AORemapMax: 1
- _AORemapMin: 0
@@ -134,6 +140,7 @@ Material:
- _Anisotropy: 0
- _BlendMode: 0
- _CoatMask: 0
- _ConservativeDepthOffsetEnable: 0
- _CullMode: 2
- _CullModeForward: 2
- _Cutoff: 0.5
@@ -147,6 +154,7 @@ Material:
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
- _DstBlend: 0
- _EmissiveColorMode: 1
@@ -192,6 +200,7 @@ Material:
- _Smoothness: 0.325
- _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0
- _SpectrumIndex: 0
- _SpecularAAScreenSpaceVariance: 0.1
- _SpecularAAThreshold: 0.2
- _SpecularOcclusionMode: 1
@@ -230,9 +239,9 @@ Material:
- _ZTestTransparent: 4
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _BaseColor: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
@@ -259,4 +268,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 11
version: 12
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
Assets/Scenes/NEO_BlockOut/Global Volume Profile.asset
+214
View File
@@ -0,0 +1,214 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8731140283968585025
MonoBehaviour:
m_ObjectHideFlags: 3
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: 2d08ce26990eb1a4a9177b860541e702, type: 3}
m_Name: Exposure
m_EditorClassIdentifier:
active: 1
mode:
m_OverrideState: 1
m_Value: 0
meteringMode:
m_OverrideState: 0
m_Value: 2
luminanceSource:
m_OverrideState: 0
m_Value: 1
fixedExposure:
m_OverrideState: 1
m_Value: 1.2024494
compensation:
m_OverrideState: 0
m_Value: 0
limitMin:
m_OverrideState: 0
m_Value: -1
limitMax:
m_OverrideState: 0
m_Value: 14
curveMap:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: -10
value: -10
inSlope: 0
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 20
value: 20
inSlope: 1
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
limitMinCurveMap:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: -10
value: -12
inSlope: 0
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 20
value: 18
inSlope: 1
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
limitMaxCurveMap:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: -10
value: -8
inSlope: 0
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 20
value: 22
inSlope: 1
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
adaptationMode:
m_OverrideState: 0
m_Value: 1
adaptationSpeedDarkToLight:
m_OverrideState: 0
m_Value: 3
adaptationSpeedLightToDark:
m_OverrideState: 0
m_Value: 1
weightTextureMask:
m_OverrideState: 0
m_Value: {fileID: 0}
histogramPercentages:
m_OverrideState: 0
m_Value: {x: 40, y: 90}
histogramUseCurveRemapping:
m_OverrideState: 0
m_Value: 0
targetMidGray:
m_OverrideState: 0
m_Value: 0
centerAroundExposureTarget:
m_OverrideState: 0
m_Value: 0
proceduralCenter:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}
proceduralRadii:
m_OverrideState: 0
m_Value: {x: 0.3, y: 0.3}
maskMinIntensity:
m_OverrideState: 0
m_Value: -30
maskMaxIntensity:
m_OverrideState: 0
m_Value: 30
proceduralSoftness:
m_OverrideState: 0
m_Value: 0.5
--- !u!114 &-5669056054225382645
MonoBehaviour:
m_ObjectHideFlags: 3
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: 24f077503be6ae942a1e1245dbd53ea9, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
quality:
m_OverrideState: 1
m_Value: 1
threshold:
m_OverrideState: 0
m_Value: 0
intensity:
m_OverrideState: 1
m_Value: 0.603
scatter:
m_OverrideState: 0
m_Value: 0.7
tint:
m_OverrideState: 1
m_Value: {r: 1, g: 1, b: 1, a: 1}
dirtTexture:
m_OverrideState: 0
m_Value: {fileID: 0}
dirtIntensity:
m_OverrideState: 0
m_Value: 0
anamorphic:
m_OverrideState: 0
m_Value: 1
m_Resolution:
m_OverrideState: 1
m_Value: 2
m_HighQualityPrefiltering:
m_OverrideState: 1
m_Value: 0
m_HighQualityFiltering:
m_OverrideState: 1
m_Value: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: Global Volume Profile
m_EditorClassIdentifier:
components:
- {fileID: -5669056054225382645}
- {fileID: -8731140283968585025}
Assets/Scenes/NEO_BlockOut/Global Volume Profile.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e42b2ea264dea2c4fb272d79faf53dba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/NEO_BlockOut/SkySettings Profile.asset
+15 -46
View File
@@ -13,12 +13,9 @@ MonoBehaviour:
m_Name: GradientSky
m_EditorClassIdentifier:
active: 0
m_AdvancedMode: 0
rotation:
m_OverrideState: 0
m_Value: 0
min: 0
max: 360
skyIntensityMode:
m_OverrideState: 1
m_Value: 0
@@ -28,11 +25,9 @@ MonoBehaviour:
multiplier:
m_OverrideState: 0
m_Value: 1
min: 0
upperHemisphereLuxValue:
m_OverrideState: 0
m_Value: 1
min: 0
upperHemisphereLuxColor:
m_OverrideState: 0
m_Value: {x: 0, y: 0, z: 0}
@@ -45,28 +40,18 @@ MonoBehaviour:
updatePeriod:
m_OverrideState: 0
m_Value: 0
min: 0
includeSunInBaking:
m_OverrideState: 0
m_Value: 0
top:
m_OverrideState: 1
m_Value: {r: 0.7735849, g: 0, b: 0.45406327, a: 1}
hdr: 1
showAlpha: 0
showEyeDropper: 1
middle:
m_OverrideState: 1
m_Value: {r: 0.3773585, g: 0.25453898, b: 0.25834155, a: 1}
hdr: 1
showAlpha: 0
showEyeDropper: 1
bottom:
m_OverrideState: 1
m_Value: {r: 0.3768871, g: 0.34109113, b: 0.6886792, a: 1}
hdr: 1
showAlpha: 0
showEyeDropper: 1
gradientDiffusion:
m_OverrideState: 0
m_Value: 1
@@ -83,7 +68,6 @@ MonoBehaviour:
m_Name: AmbientOcclusion
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
quality:
m_OverrideState: 1
m_Value: 2
@@ -93,79 +77,62 @@ MonoBehaviour:
intensity:
m_OverrideState: 1
m_Value: 1.11
min: 0
max: 4
directLightingStrength:
m_OverrideState: 0
m_Value: 0
min: 0
max: 1
radius:
m_OverrideState: 1
m_Value: 2
min: 0.25
max: 5
spatialBilateralAggressiveness:
m_OverrideState: 0
m_Value: 0.15
min: 0
max: 1
temporalAccumulation:
m_OverrideState: 0
m_Value: 1
ghostingReduction:
m_OverrideState: 0
m_Value: 0.5
min: 0
max: 1
blurSharpness:
m_OverrideState: 0
m_Value: 0.1
min: 0
max: 1
layerMask:
m_OverrideState: 0
m_Value:
serializedVersion: 2
m_Bits: 4294967295
occluderMotionRejection:
m_OverrideState: 0
m_Value: 1
receiverMotionRejection:
m_OverrideState: 0
m_Value: 1
m_StepCount:
m_OverrideState: 1
m_Value: 16
min: 2
max: 32
m_FullResolution:
m_OverrideState: 1
m_Value: 1
m_MaximumRadiusInPixels:
m_OverrideState: 1
m_Value: 80
min: 16
max: 256
m_BilateralUpsample:
m_OverrideState: 1
m_Value: 1
m_DirectionCount:
m_OverrideState: 1
m_Value: 4
min: 1
max: 6
m_RayLength:
m_OverrideState: 1
m_Value: 20
min: 0.01
m_SampleCount:
m_OverrideState: 1
m_Value: 8
min: 1
max: 64
m_Denoise:
m_OverrideState: 1
m_Value: 1
m_DenoiserRadius:
m_OverrideState: 1
m_Value: 0.65
min: 0.001
max: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -196,21 +163,15 @@ MonoBehaviour:
m_Name: HDShadowSettings
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
maxShadowDistance:
m_OverrideState: 0
m_Value: 500
min: 0
directionalTransmissionMultiplier:
m_OverrideState: 0
m_Value: 1
min: 0
max: 1
cascadeShadowSplitCount:
m_OverrideState: 0
m_Value: 4
min: 1
max: 4
cascadeShadowSplit0:
m_OverrideState: 0
m_Value: 0.05
@@ -245,13 +206,21 @@ MonoBehaviour:
m_Name: VisualEnvironment
m_EditorClassIdentifier:
active: 1
m_AdvancedMode: 0
skyType:
m_OverrideState: 1
m_Value: 1
cloudType:
m_OverrideState: 0
m_Value: 0
skyAmbientMode:
m_OverrideState: 0
m_Value: 0
windOrientation:
m_OverrideState: 0
m_Value: 0
windSpeed:
m_OverrideState: 0
m_Value: 100
fogType:
m_OverrideState: 0
m_Value: 0