refactor: remove ApplyVertexColourTransparent shader in favor of ApplyVertexColour

refactor: remove mountain shader, as it was broken anyway and we need an alternative
This commit is contained in:
Jo 2024-10-03 15:32:20 +02:00
parent a00d4bf50b
commit 7a2fb907ff
24 changed files with 170 additions and 3174 deletions

View file

@ -35,7 +35,7 @@ MonoBehaviour:
m_CheckForContentUpdateRestrictionsOption: 0
m_MonoScriptBundleCustomNaming: Jokiller230.WuhuIsland
m_RemoteCatalogBuildPath:
m_Id: BuiltPallets/StandaloneWindows64/Jokiller230.WuhuIsland
m_Id: BuiltPallets/Android/Jokiller230.WuhuIsland
m_RemoteCatalogLoadPath:
m_Id: 'PALLET_BARCODE:Jokiller230.WuhuIsland:'
m_ContentStateBuildPathProfileVariableName: <default settings path>

View file

@ -34,7 +34,7 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: BuiltPallets/StandaloneWindows64/Jokiller230.WuhuIsland
m_Id: BuiltPallets/Android/Jokiller230.WuhuIsland
m_LoadPath:
m_Id: 'PALLET_BARCODE:Jokiller230.WuhuIsland:'
m_BundleMode: 0

View file

@ -34,7 +34,7 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: BuiltPallets/StandaloneWindows64/Jokiller230.WuhuIsland
m_Id: BuiltPallets/Android/Jokiller230.WuhuIsland
m_LoadPath:
m_Id: 'PALLET_BARCODE:Jokiller230.WuhuIsland:'
m_BundleMode: 1

View file

@ -34,7 +34,7 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: BuiltPallets/StandaloneWindows64/Jokiller230.WuhuIsland
m_Id: BuiltPallets/Android/Jokiller230.WuhuIsland
m_LoadPath:
m_Id: 'PALLET_BARCODE:Jokiller230.WuhuIsland:'
m_BundleMode: 1

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a120c25cce4c734429f116471a91854f
guid: ea8fd4b1d7903114aa407c963a43e633
folderAsset: yes
DefaultImporter:
externalObjects: {}

View file

@ -0,0 +1,110 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5691235753620968685
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3205766489634966635}
- component: {fileID: 4306030672946319484}
- component: {fileID: 7567109985912252271}
- component: {fileID: 3870217268420576739}
m_Layer: 0
m_Name: Crate Spawner (Template)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3205766489634966635
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5691235753620968685}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4306030672946319484
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5691235753620968685}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7567109985912252271
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5691235753620968685}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5f5d50ce8dbb5b84fb70780a2ccf11c8, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &3870217268420576739
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5691235753620968685}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 380a92c3490d7f240b2abf1a2a24839a, type: 3}
m_Name:
m_EditorClassIdentifier:
spawnableCrateReference:
_barcode:
_id: null.empty.barcode
crateQuery:
_barcode:
_id: null.empty.barcode
tagFilter:
titleFilter:
useQuery: 0
manualMode: 0
onSpawnEvent:
_PersistentCalls: []

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2d08f2a95a8a9df4d9b60e824e489bae
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -352,6 +352,10 @@ PrefabInstance:
propertyPath: m_Name
value: '#### LEVEL'
objectReference: {fileID: 0}
- target: {fileID: 1826830733592224477, guid: c3027737a1bb5524c9b8d5e1505a14e1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3119509921476925438, guid: c3027737a1bb5524c9b8d5e1505a14e1, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
@ -380,6 +384,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7735938356334633436, guid: c3027737a1bb5524c9b8d5e1505a14e1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7911748109119028770, guid: c3027737a1bb5524c9b8d5e1505a14e1, type: 3}
propertyPath: m_LightProbeUsage
value: 0

View file

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 6f6dd7858e105ef44b20d2a73cfbb255
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

View file

@ -174,6 +174,20 @@
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "d02ac296d8af41478b1dc56e64f535b5"
},
"m_SlotId": 7
},
"m_InputSlot": {
"m_Node": {
"m_Id": "a1e1a845970347b3859fd4017024771e"
},
"m_SlotId": 0
}
},
{
"m_OutputSlot": {
"m_Node": {

View file

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 394b468f7176a384f9859fa7a0e188e8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

View file

@ -23,7 +23,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 0be1a7e142868c14f9b7f0ae3851c876, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
@ -39,7 +39,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 0be1a7e142868c14f9b7f0ae3851c876, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bridge_raster
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: hotel_railings
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stadium_fence
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
- _SURFACE_TYPE_TRANSPARENT
@ -16,7 +16,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []

View file

@ -21,8 +21,9 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stadium_text
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _RECEIVE_SHADOWS_OFF
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4
@ -89,7 +90,7 @@ Material:
- _Normals: 0
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _ReceiveShadows: 0
- _SSROff: 0
- _SSRTemporalMul: 1
- _SrcBlend: 5

View file

@ -28,7 +28,8 @@ Material:
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@ -71,20 +72,29 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _BakedMutiplier: 1
- _Blend: 0
- _BlendDst: 0
- _BlendSrc: 1
- _CastShadows: 1
- _Cull: 2
- _Details: 0
- _DstBlend: 0
- _Emission: 0
- _EmissionFalloff: 1
- _Normals: 0
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SSROff: 0
- _SSRTemporalMul: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZTest: 4
- _ZWrite: 1
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

View file

@ -21,7 +21,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: polygon819
m_Shader: {fileID: -6465566751694194690, guid: 6f6dd7858e105ef44b20d2a73cfbb255, type: 3}
m_Shader: {fileID: 4800000, guid: e2bc12b142787a84e95ff4f3ca0bac39, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
@ -34,7 +34,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 0be1a7e142868c14f9b7f0ae3851c876, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseTexture:

View file

@ -21,7 +21,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: treeA
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
- _RECEIVE_SHADOWS_OFF

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: treeB
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
- _RECEIVE_SHADOWS_OFF

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: treeB
m_Shader: {fileID: -6465566751694194690, guid: 394b468f7176a384f9859fa7a0e188e8, type: 3}
m_Shader: {fileID: -6465566751694194690, guid: dfcf13297b3274f479a59a8c290091c1, type: 3}
m_ValidKeywords:
- _ALPHATEST_ON
- _RECEIVE_SHADOWS_OFF

View file

@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 2
m_CurrentQuality: 5
m_QualitySettings:
- serializedVersion: 2
name: PC Low