diff --git a/Assets/ASSETS/Mirza/AERO - Volumetric Fog and Mist/Materials/Volumetric Fog PC (Gradients) 2.mat b/Assets/ASSETS/Mirza/AERO - Volumetric Fog and Mist/Materials/Volumetric Fog PC (Gradients) 2.mat index d50e6d0..5a6a9cb 100644 --- a/Assets/ASSETS/Mirza/AERO - Volumetric Fog and Mist/Materials/Volumetric Fog PC (Gradients) 2.mat +++ b/Assets/ASSETS/Mirza/AERO - Volumetric Fog and Mist/Materials/Volumetric Fog PC (Gradients) 2.mat @@ -184,7 +184,7 @@ Material: - _GlossyReflections: 0 - _Height: 2 - _Height_Falloff: 1 - - _Height_Gradient_Blend: 0.6 + - _Height_Gradient_Blend: 0.684 - _Height_Gradient_Falloff: 2 - _Height_Gradient_LUT_Blend: 1 - _Height_Gradient_Length: 2 @@ -197,8 +197,8 @@ Material: - _Height_Gradient_Texture_Power: 2 - _Height_Mask_Blend: 0.96 - _Height_Mask_Distance: 1 - - _Height_Mask_Falloff: 3 - - _Height_Mask_Length: 1 + - _Height_Mask_Falloff: 5.67 + - _Height_Mask_Length: -7.72 - _Height_Mask_Offset: 0.2 - _Height_Mask_Remap_Max: 0.6 - _Height_Mask_Remap_Min: 0.3 @@ -216,7 +216,7 @@ Material: - _Main_Light_Self_Shadow_Remap_Max: 0.8 - _Main_Light_Self_Shadow_Remap_Min: 0.2 - _Main_Light_Self_Shadow_Steps: 4 - - _Max_Distance: 40 + - _Max_Distance: 96.2 - _Metallic: 0 - _OUTPUT: 0 - _OcclusionStrength: 1 @@ -240,7 +240,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Steps: 12 + - _Steps: 8.6 - _Surface: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 @@ -253,10 +253,10 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Height_Gradient_Bottom_Colour_Tint: {r: 1, g: 1, b: 1, a: 1} - _Height_Gradient_Colour_Bottom: {r: 0, g: 0.73634624, b: 1, a: 1} - - _Height_Gradient_Colour_Top: {r: 1, g: 0, b: 0.72354794, a: 1} + - _Height_Gradient_Colour_Top: {r: 1, g: 0, b: 0.72354794, a: 0} - _Height_Gradient_Texture_Animation: {r: 0.2, g: 0.1, b: 0, a: 0} - _Height_Gradient_Top_Colour_Tint: {r: 1, g: 1, b: 1, a: 1} - - _Height_Mask_Texture_Animation: {r: 0, g: 0, b: 0, a: 0} + - _Height_Mask_Texture_Animation: {r: 0.04, g: 0, b: 0, a: 0} - _Height_Mask_Texture_Offset: {r: 0, g: 0, b: 0, a: 0} - _Height_Mask_Texture_Tiling: {r: 1, g: 1, b: 0, a: 0} - _Self_Shadow_Colour: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/ASSETS/Mirza/_VFXToolkit/_Demo/Materials/Emissive/Emissive 2.mat b/Assets/ASSETS/Mirza/_VFXToolkit/_Demo/Materials/Emissive/Emissive 2.mat index 9a72653..b82392a 100644 --- a/Assets/ASSETS/Mirza/_VFXToolkit/_Demo/Materials/Emissive/Emissive 2.mat +++ b/Assets/ASSETS/Mirza/_VFXToolkit/_Demo/Materials/Emissive/Emissive 2.mat @@ -11,10 +11,9 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -119,7 +118,7 @@ Material: m_Colors: - _BaseColor: {r: 0.6, g: 0.8680851, b: 1, a: 1} - _Color: {r: 0.6, g: 0.8680851, b: 1, a: 1} - - _EmissionColor: {r: 0.06117647, g: 0.08836601, b: 0.101960786, a: 1.5} + - _EmissionColor: {r: 0.000059742648, g: 0.00008629493, b: 0.00009957108, a: 1.5} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 diff --git a/Assets/CONTENT/ART/LVLS/DEV-Game.unity b/Assets/CONTENT/ART/LVLS/DEV-Game.unity index 47cd3b1..b0fc025 100644 --- a/Assets/CONTENT/ART/LVLS/DEV-Game.unity +++ b/Assets/CONTENT/ART/LVLS/DEV-Game.unity @@ -23,7 +23,7 @@ RenderSettings: m_AmbientSkyColor: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 + m_AmbientIntensity: 1.61 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: 11d7e7cf656fa8746a34b9af2b15d59a, type: 2} @@ -135,7 +135,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &449299 MonoBehaviour: m_ObjectHideFlags: 0 @@ -427,111 +427,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c239db36c826a54bb3f30f29bda194b, type: 3} ---- !u!1001 &101590630 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 149248327471132257, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 262780200250670577, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 358431225805014765, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 358431225805014765, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_OcclusionCulling - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalPosition.x - value: 57.62 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalPosition.y - value: -8.14 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalPosition.z - value: -1.08 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7933541 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalRotation.y - value: -0.6087604 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -75 - objectReference: {fileID: 0} - - target: {fileID: 2264751121530880260, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2553183295301017937, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_Name - value: NetworkPlayer - objectReference: {fileID: 0} - - target: {fileID: 2583408192721866257, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_CameraType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3678077479963786265, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_Antialiasing - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3678077479963786265, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_RendererIndex - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 3678077479963786265, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_TaaSettings.m_Quality - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5009018705790251557, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5617290128103056897, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6864163356275009747, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8918138152795257534, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} - propertyPath: GlobalObjectIdHash - value: 2798357611 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4a584a7d7a00d754fb7a6eb84847d496, type: 3} --- !u!1 &126682274 GameObject: m_ObjectHideFlags: 0 @@ -6581,7 +6476,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.038479168, y: 0.93200004} m_AnchorMax: {x: 0.21800001, y: 0.9805928} - m_AnchoredPosition: {x: -1.229126, y: -0.6928711} + m_AnchoredPosition: {x: -1.229248, y: -0.6928711} m_SizeDelta: {x: 0.11999893, y: -1} m_Pivot: {x: 0, y: 1} --- !u!114 &1377064263 @@ -7092,7 +6987,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.013479167, y: 0.93200004} m_AnchorMax: {x: 0.038479168, y: 0.9805928} - m_AnchoredPosition: {x: -0.22912598, y: -0.65270996} + m_AnchoredPosition: {x: -0.22924805, y: -0.65270996} m_SizeDelta: {x: 0, y: -0.52000046} m_Pivot: {x: 0, y: 1} --- !u!114 &1429067988 @@ -7424,7 +7319,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1537634098 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7528,7 +7423,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!135 &1589036058 SphereCollider: m_ObjectHideFlags: 0 @@ -7936,13 +7831,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743962256} serializedVersion: 2 - m_LocalRotation: {x: 0.5091435, y: -0.21994458, z: 0.13642456, w: 0.82084453} - m_LocalPosition: {x: -60, y: 3, z: 0} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -22.5, y: 3, z: 19.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 63.62, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &1743962259 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8349,7 +8244,7 @@ PrefabInstance: - target: {fileID: -7918335002988649766, guid: 4c35dea60786eb44b92851573b19a3a1, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 8acbe5d824541e149bf96b0fd4a955de, type: 2} + objectReference: {fileID: 2100000, guid: d128fa3b5aa813944b9e7d1af5b6f9e3, type: 2} - target: {fileID: -6093592463355912122, guid: 4c35dea60786eb44b92851573b19a3a1, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -8647,7 +8542,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1975708474 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9297,5 +9192,4 @@ SceneRoots: - {fileID: 1537634099} - {fileID: 1975708476} - {fileID: 1589036061} - - {fileID: 101590630} - {fileID: 1761518482} diff --git a/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/GhostPlayer.prefab b/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/GhostPlayer.prefab index 5dbfc9b..58a5a21 100644 --- a/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/GhostPlayer.prefab +++ b/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/GhostPlayer.prefab @@ -600,6 +600,11 @@ MonoBehaviour: playerShoot: {fileID: 0} playerShield: {fileID: 9223372036854775807} playerUIController: {fileID: 0} + thirdPersonVisualRoot: {fileID: 0} + playerCamera: {fileID: 0} + playerHandCamera: {fileID: 0} + fpvHands: {fileID: 0} + tpvHands: {fileID: 0} --- !u!114 &6129752397730442859 MonoBehaviour: m_ObjectHideFlags: 0 @@ -616,8 +621,8 @@ MonoBehaviour: damageAmount: 30 range: 100 hitEffectPrefab: {fileID: 5162910912013668194, guid: cf82839c411151342a7b2337bda9fb34, type: 3} - ownGhostColor: {r: 0.3466981, g: 0.3466981, b: 0.5, a: 1} - enemyGhostColor: {r: 0.5019608, g: 0.35940394, b: 0.35940394, a: 1} + ownGhostColor: {r: 0, g: 0, b: 1, a: 1} + enemyGhostColor: {r: 1, g: 0, b: 0, a: 1} --- !u!114 &4822096153522273678 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/NetworkPlayer.prefab b/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/NetworkPlayer.prefab index 5ff39ff..4d32a70 100644 --- a/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/NetworkPlayer.prefab +++ b/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/NetworkPlayer.prefab @@ -676,11 +676,11 @@ MonoBehaviour: playerShoot: {fileID: 3924378418118045030} playerShield: {fileID: 9223372036854775807} playerUIController: {fileID: 0} - thirdPersonVisualRoot: {fileID: 0} - playerCamera: {fileID: 0} - playerHandCamera: {fileID: 0} - fpvHands: {fileID: 0} - tpvHands: {fileID: 0} + thirdPersonVisualRoot: {fileID: 5017856760505747688} + playerCamera: {fileID: 358431225805014765} + playerHandCamera: {fileID: 5617290128103056897} + fpvHands: {fileID: 149248327471132257} + tpvHands: {fileID: 262780200250670577} --- !u!114 &7845123456789012345 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/PlayerController.cs b/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/PlayerController.cs index c8eeae9..4c43ea1 100644 --- a/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/PlayerController.cs +++ b/Assets/CONTENT/FEATURES/DEV-TEST/Scripts/PlayerController.cs @@ -8,6 +8,10 @@ public class PlayerController : NetworkBehaviour [SerializeField] private GameObject tpvHands; [SerializeField] private GameObject fpvHands; + [Header("Colors")] + [SerializeField] private Color ownerColor = Color.blue; + [SerializeField] private Color otherPlayerColor = Color.red; + public override void OnNetworkSpawn() { if (playerCamera != null) @@ -25,7 +29,7 @@ public class PlayerController : NetworkBehaviour Cursor.visible = false; } - Color playerColor = IsOwner ? Color.blue : Color.red; + Color playerColor = IsOwner ? ownerColor : otherPlayerColor; foreach (MeshRenderer meshRenderer in GetComponentsInChildren()) { meshRenderer.material.color = playerColor; diff --git a/Assets/PROJECT-SETTINGS/PC_Renderer.asset b/Assets/PROJECT-SETTINGS/PC_Renderer.asset index 4b0b042..db97b35 100644 --- a/Assets/PROJECT-SETTINGS/PC_Renderer.asset +++ b/Assets/PROJECT-SETTINGS/PC_Renderer.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b00045f12942b46c698459096c89274e, type: 3} m_Name: FullScreenPassRendererFeature m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 injectionPoint: 550 fetchColorBuffer: 1 requirements: 0 @@ -32,7 +32,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9cc70a8037c1b70499f4123cdac0f2fa, type: 3} m_Name: FullscreenCustomLightingFeature m_EditorClassIdentifier: - m_Active: 1 + m_Active: 0 renderPassEvent: 500 material: {fileID: 2100000, guid: f4629c6b95894dd4486b0e8fb2b5fe73, type: 2} --- !u!114 &11400000