Merge and material conversion
This commit is contained in:
joonasp
@@ -38,12 +38,12 @@ RenderSettings:
|
||||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 553039437}
|
||||
m_IndirectSpecularColor: {r: 0.18317622, g: 0.22883566, b: 0.30652434, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 11
|
||||
serializedVersion: 12
|
||||
m_GIWorkflowMode: 0
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
@@ -98,7 +98,8 @@ LightmapSettings:
|
||||
m_TrainingDataDestination: TrainingData
|
||||
m_LightProbeSampleCountMultiplier: 4
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_UseShadowmask: 1
|
||||
m_LightingSettings: {fileID: 4890085278179872738, guid: 152956c2d5febcd4cbafbdbc79b66b9e,
|
||||
type: 2}
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
@@ -118,6 +119,8 @@ NavMeshSettings:
|
||||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
maxJobWorkers: 0
|
||||
preserveTilesOutsideBounds: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
@@ -128,8 +131,8 @@ Material:
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Poseidon/Default/WaterAdvanced
|
||||
m_Shader: {fileID: 4800000, guid: 37dec5e07a1bac64d8c5bb87acf7a26e, type: 3}
|
||||
m_Name: Poseidon/URP/WaterAdvancedURP
|
||||
m_Shader: {fileID: 4800000, guid: 3834a7d55ad9ff24b839d7d0de8bb057, type: 3}
|
||||
m_ShaderKeywords: FLAT_LIGHTING FOAM FOAM_CREST FOAM_HQ LIGHTING_PHYSICAL_BASED
|
||||
LIGHT_ABSORPTION MESH_NOISE REFLECTION REFRACTION WAVE
|
||||
m_LightmapFlags: 4
|
||||
@@ -157,6 +160,7 @@ Material:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AuraLightingFactor: 0
|
||||
- _CausticDistortionStrength: 0.9
|
||||
@@ -191,6 +195,7 @@ Material:
|
||||
- _Specular: {r: 0.40784314, g: 0.34509805, b: 0.29803923, a: 1}
|
||||
- _WaveDirection: {r: -0.82114923, g: 0.5707136, b: 0, a: 0}
|
||||
- _WaveMaskBounds: {r: -100, g: -100, b: 200, a: 200}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!21 &22736577
|
||||
Material:
|
||||
serializedVersion: 6
|
||||
@@ -215,6 +220,7 @@ Material:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AuraLightingFactor: 1
|
||||
- _CrestFoamStrength: 0.275
|
||||
@@ -242,6 +248,7 @@ Material:
|
||||
- _Specular: {r: 0.40784314, g: 0.34509805, b: 0.29803923, a: 1}
|
||||
- _WaveDirection: {r: -0.82114923, g: 0.5707136, b: 0, a: 0}
|
||||
- _WaveMaskBounds: {r: -100, g: -100, b: 200, a: 200}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!1 &23626017
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -268,6 +275,7 @@ Transform:
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 50, y: 0, z: 50}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 553039438}
|
||||
- {fileID: 1790320830}
|
||||
@@ -304,10 +312,12 @@ MeshRenderer:
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 0
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 4294967295
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -332,6 +342,7 @@ MeshRenderer:
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &52288430
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -350,6 +361,7 @@ Transform:
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 100, y: 100, z: 100}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 99225187}
|
||||
m_RootOrder: 0
|
||||
@@ -394,6 +406,7 @@ Transform:
|
||||
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:
|
||||
- {fileID: 52288431}
|
||||
- {fileID: 845338333}
|
||||
@@ -462,6 +475,7 @@ Transform:
|
||||
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: 3
|
||||
@@ -543,6 +557,7 @@ Light:
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 9.36e-43, y: 0, z: 0, w: 3.923636e-39}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!4 &553039438
|
||||
@@ -555,6 +570,7 @@ Transform:
|
||||
m_LocalRotation: {x: -0.2166434, y: 0.69025606, z: -0.23176138, w: -0.6503069}
|
||||
m_LocalPosition: {x: 27.379997, y: 19.65, z: 48.6}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 23626018}
|
||||
m_RootOrder: 0
|
||||
@@ -571,7 +587,14 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Version: 1
|
||||
m_UsePipelineSettings: 1
|
||||
m_AdditionalLightsShadowResolutionTier: 2
|
||||
m_LightLayerMask: 1
|
||||
m_CustomShadowLayers: 0
|
||||
m_ShadowLayerMask: 1
|
||||
m_LightCookieSize: {x: 1, y: 1}
|
||||
m_LightCookieOffset: {x: 0, y: 0}
|
||||
--- !u!1 &655232144
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -601,6 +624,7 @@ RectTransform:
|
||||
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: 1341781997}
|
||||
m_RootOrder: 0
|
||||
@@ -637,6 +661,7 @@ MonoBehaviour:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
@@ -693,10 +718,12 @@ MeshRenderer:
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
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: []
|
||||
@@ -720,6 +747,7 @@ MeshRenderer:
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &845338331
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 2
|
||||
@@ -804,6 +832,7 @@ Transform:
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 24.67, y: 9, z: 12.63}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 99225187}
|
||||
m_RootOrder: 1
|
||||
@@ -968,6 +997,7 @@ Mesh:
|
||||
m_MeshMetrics[1]: 1
|
||||
m_MeshOptimizationFlags: 1
|
||||
m_StreamData:
|
||||
serializedVersion: 2
|
||||
offset: 0
|
||||
size: 0
|
||||
path:
|
||||
@@ -1029,6 +1059,7 @@ MonoBehaviour:
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &1341781996
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1060,6 +1091,7 @@ RectTransform:
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 655232145}
|
||||
m_Father: {fileID: 0}
|
||||
@@ -1151,6 +1183,7 @@ Transform:
|
||||
m_LocalRotation: {x: -0.21777263, y: 0.72700083, z: -0.26645622, w: -0.5941767}
|
||||
m_LocalPosition: {x: 64.891335, y: 22.065334, z: 25.216988}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
@@ -1192,12 +1225,14 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
m_Bits: 1
|
||||
m_VolumeTrigger: {fileID: 0}
|
||||
m_VolumeFrameworkUpdateModeOption: 2
|
||||
m_RenderPostProcessing: 1
|
||||
m_Antialiasing: 2
|
||||
m_AntialiasingQuality: 2
|
||||
m_StopNaN: 0
|
||||
m_Dithering: 0
|
||||
m_ClearDepth: 1
|
||||
m_AllowXRRendering: 1
|
||||
m_RequiresDepthTexture: 0
|
||||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
@@ -1361,6 +1396,7 @@ Mesh:
|
||||
m_MeshMetrics[1]: 1
|
||||
m_MeshOptimizationFlags: 1
|
||||
m_StreamData:
|
||||
serializedVersion: 2
|
||||
offset: 0
|
||||
size: 0
|
||||
path:
|
||||
@@ -1391,6 +1427,7 @@ Transform:
|
||||
m_LocalRotation: {x: -0.28753963, y: 0.030706517, z: 0.02548575, w: -0.95693713}
|
||||
m_LocalPosition: {x: 27.379997, y: 19.65, z: 48.6}
|
||||
m_LocalScale: {x: 0.9999999, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 23626018}
|
||||
m_RootOrder: 1
|
||||
@@ -1454,6 +1491,7 @@ Light:
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!1001 &9192680915151482118
|
||||
@@ -1477,17 +1515,17 @@ PrefabInstance:
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
- target: {fileID: 9192680914491985801, guid: ebbcdb061ebffba498623c61410eed90,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
- target: {fileID: 9192680914828567796, guid: ebbcdb061ebffba498623c61410eed90,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
- target: {fileID: 9192680915017311778, guid: ebbcdb061ebffba498623c61410eed90,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@@ -1552,11 +1590,11 @@ PrefabInstance:
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
- target: {fileID: 9192680915146646153, guid: ebbcdb061ebffba498623c61410eed90,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
objectReference: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ebbcdb061ebffba498623c61410eed90, type: 3}
|
||||
|
||||
Reference in New Issue
Block a user