diff --git a/Assets/Scenes/ArtStaging.unity b/Assets/Scenes/ArtStaging.unity index 209b59871..e7c21cf8a 100644 --- a/Assets/Scenes/ArtStaging.unity +++ b/Assets/Scenes/ArtStaging.unity @@ -133,7 +133,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: d5b0d8874a645024d8b89281923e866c, type: 2} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalPosition.x - value: -1 + value: -1.2 objectReference: {fileID: 0} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalPosition.y @@ -141,11 +141,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalPosition.z - value: 0.1 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9816272 objectReference: {fileID: 0} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalRotation.x @@ -153,7 +153,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.19080901 objectReference: {fileID: 0} - target: {fileID: 7132199456815364022, guid: 65035eeeb35aa364da6924fa7a0df99a, type: 3} propertyPath: m_LocalRotation.z @@ -190,7 +190,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -3910990755373119420, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} propertyPath: m_LocalPosition.x - value: 0.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} propertyPath: m_LocalPosition.y @@ -198,7 +198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} propertyPath: m_LocalPosition.z - value: 1 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} propertyPath: m_LocalRotation.w @@ -228,6 +228,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -3338210741881423877, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7ff8bc60434d46f40bf665cf9c3f99a9, type: 2} + - target: {fileID: 3612702511639466466, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7ff8bc60434d46f40bf665cf9c3f99a9, type: 2} + - target: {fileID: 8142364256664115256, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 7ff8bc60434d46f40bf665cf9c3f99a9, type: 2} - target: {fileID: 8771091787928289351, guid: 85e48543edab7bd46a01b4215abfe3ad, type: 3} propertyPath: m_Name value: Hero_Bathynaut @@ -294,9 +306,13 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -5268440976927218973, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 513aef3fd3a4a004fa330eb8069e6f88, type: 2} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalPosition.x - value: -0.3 + value: 1.55 objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalPosition.y @@ -304,11 +320,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalPosition.z - value: -1.15 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalRotation.w - value: 0.9848078 + value: -0.17364821 objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalRotation.x @@ -316,7 +332,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalRotation.y - value: 0.1736482 + value: 0.9848078 objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_LocalRotation.z @@ -334,6 +350,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 193629860113833883, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 513aef3fd3a4a004fa330eb8069e6f88, type: 2} - target: {fileID: 8771091787928289351, guid: c00fb48df2b9d4942be61c78f056a7e4, type: 3} propertyPath: m_Name value: Hero_Drowner @@ -612,10 +632,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2483575604775340231, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_LocalPosition.x + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 2483575604775340231, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_LocalPosition.y + value: 3.6 + objectReference: {fileID: 0} + - target: {fileID: 2483575604775340231, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2483575604775340231, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2483575604775340231, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} - target: {fileID: 2928058104465648685, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} propertyPath: m_Name value: Env_SeabedKit objectReference: {fileID: 0} + - target: {fileID: 3746036557242884362, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3746036557242884362, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_Range + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3746036557242884362, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_Intensity + value: 85 + objectReference: {fileID: 0} + - target: {fileID: 3746036557242884362, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_SpotAngle + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3746036557242884362, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_InnerSpotAngle + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4458646397483401264, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_Intensity + value: 0.22 + objectReference: {fileID: 0} + - target: {fileID: 4548773710126222555, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_Intensity + value: 0.15 + objectReference: {fileID: 0} - target: {fileID: 6513448254367613169, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -656,6 +724,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8554292043064524098, guid: a56e554160baf224282f9467d6a5dfa0, type: 3} + propertyPath: m_Intensity + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_Project/Art/Materials/M_Drowner_GloamAccent_Staging.mat b/Assets/_Project/Art/Materials/M_Drowner_GloamAccent_Staging.mat new file mode 100644 index 000000000..760f4cfa1 --- /dev/null +++ b/Assets/_Project/Art/Materials/M_Drowner_GloamAccent_Staging.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5691453841600242283 +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: 639247ca83abc874e893eb93af2b5e44, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.ShaderGraph.Editor::UnityEditor.Rendering.BuiltIn.AssetVersion + version: 0 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_Drowner_GloamAccent_Staging + m_Shader: {fileID: -6465566751694194690, guid: b9d29dfa1474148e792ac720cbd45122, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSIVE + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2000 + stringTagMap: + MotionVector: User + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - baseColorTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - emissiveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - metallicRoughnessTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - normalTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - occlusionTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - transmissionTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BUILTIN_AlphaClip: 0 + - _BUILTIN_Blend: 0 + - _BUILTIN_CullMode: 2 + - _BUILTIN_DstBlend: 0 + - _BUILTIN_QueueControl: 1 + - _BUILTIN_QueueOffset: 0 + - _BUILTIN_SrcBlend: 1 + - _BUILTIN_Surface: 0 + - _BUILTIN_ZTest: 4 + - _BUILTIN_ZWrite: 1 + - _BUILTIN_ZWriteControl: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _CastShadows: 1 + - _Cull: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _QueueControl: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + - alphaCutoff: 0 + - baseColorTexture_texCoord: 0 + - emissiveExposureWeight: 0 + - emissiveTexture_texCoord: 0 + - metallicFactor: 1 + - metallicRoughnessTexture_texCoord: 0 + - normalTexture_scale: 1 + - normalTexture_texCoord: 0 + - occlusionTexture_strength: 1 + - occlusionTexture_texCoord: 0 + - roughnessFactor: 1 + - transmissionFactor: 0 + m_Colors: + - baseColorFactor: {r: 0, g: 0, b: 0, a: 1} + - baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - emissiveFactor: {r: 0.45, g: 1.3, b: 0.75, a: 1} + - emissiveTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - metallicRoughnessTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - normalTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - occlusionTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6778650400600927351 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/_Project/Art/Materials/M_Drowner_GloamAccent_Staging.mat.meta b/Assets/_Project/Art/Materials/M_Drowner_GloamAccent_Staging.mat.meta new file mode 100644 index 000000000..d1cd5ded8 --- /dev/null +++ b/Assets/_Project/Art/Materials/M_Drowner_GloamAccent_Staging.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 513aef3fd3a4a004fa330eb8069e6f88 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Project/Art/Materials/M_Suit_LampWarm_Staging.mat b/Assets/_Project/Art/Materials/M_Suit_LampWarm_Staging.mat new file mode 100644 index 000000000..6b1f4c1c0 --- /dev/null +++ b/Assets/_Project/Art/Materials/M_Suit_LampWarm_Staging.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2160766091790440590 +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: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_Suit_LampWarm_Staging + m_Shader: {fileID: -6465566751694194690, guid: b9d29dfa1474148e792ac720cbd45122, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSIVE + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2000 + stringTagMap: + MotionVector: User + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - baseColorTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - emissiveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - metallicRoughnessTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - normalTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - occlusionTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - transmissionTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BUILTIN_AlphaClip: 0 + - _BUILTIN_Blend: 0 + - _BUILTIN_CullMode: 2 + - _BUILTIN_DstBlend: 0 + - _BUILTIN_QueueControl: 1 + - _BUILTIN_QueueOffset: 0 + - _BUILTIN_SrcBlend: 1 + - _BUILTIN_Surface: 0 + - _BUILTIN_ZTest: 4 + - _BUILTIN_ZWrite: 1 + - _BUILTIN_ZWriteControl: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _CastShadows: 1 + - _Cull: 0 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _QueueControl: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + - alphaCutoff: 0 + - baseColorTexture_texCoord: 0 + - emissiveExposureWeight: 0 + - emissiveTexture_texCoord: 0 + - metallicFactor: 1 + - metallicRoughnessTexture_texCoord: 0 + - normalTexture_scale: 1 + - normalTexture_texCoord: 0 + - occlusionTexture_strength: 1 + - occlusionTexture_texCoord: 0 + - roughnessFactor: 1 + - transmissionFactor: 0 + m_Colors: + - baseColorFactor: {r: 0, g: 0, b: 0, a: 1} + - baseColorTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - emissiveFactor: {r: 0.62, g: 0.37, b: 0.09, a: 1} + - emissiveTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - metallicRoughnessTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - normalTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + - occlusionTexture_Rotation: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &5623188850432362556 +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: 639247ca83abc874e893eb93af2b5e44, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.ShaderGraph.Editor::UnityEditor.Rendering.BuiltIn.AssetVersion + version: 0 diff --git a/Assets/_Project/Art/Materials/M_Suit_LampWarm_Staging.mat.meta b/Assets/_Project/Art/Materials/M_Suit_LampWarm_Staging.mat.meta new file mode 100644 index 000000000..af5091392 --- /dev/null +++ b/Assets/_Project/Art/Materials/M_Suit_LampWarm_Staging.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ff8bc60434d46f40bf665cf9c3f99a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: