From 05e0f76d838f2f8097fe7c552a970aa2f1778829 Mon Sep 17 00:00:00 2001 From: Tore Bergebakken Date: Tue, 2 Jul 2024 20:55:08 +0200 Subject: [PATCH] wip --- Assets/LazurController.cs | 5 +- .../Prefabs/GunParts/EnlargerExtension.prefab | 30 ++- Assets/Scenes/Menu.unity | 2 +- .../Hat/MeshProjectileController.cs | 6 +- .../BulletModifiers/ProjectileEnlarger.cs | 26 -- .../ProjectileEnlarger.cs.meta | 11 - Assets/VFX/Lazur.vfx | 241 +++++++++++++++++- 7 files changed, 262 insertions(+), 59 deletions(-) delete mode 100644 Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs delete mode 100644 Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta diff --git a/Assets/LazurController.cs b/Assets/LazurController.cs index 3b37fa51c..1c664fb07 100644 --- a/Assets/LazurController.cs +++ b/Assets/LazurController.cs @@ -79,7 +79,7 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction) direction = direction, maxDistance = MaxDistance, initializationTime = Time.fixedTime, - size = stats.ProjectileSize + size = stats.ProjectileSize * stats.ProjectileScale }; projectile.additionalProperties.Clear(); @@ -136,12 +136,15 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction) protected override void OnInitialize(GunStats gunstats) { + Vfx.SetFloat("Size", gunstats.ProjectileScale); animator.OnInitialize(gunstats); } + protected override void OnReload(GunStats stats) { animator.OnReload(stats); } + public override void InitializeProjectile(GunStats stats, uint shotID) { currentShotID = shotID; diff --git a/Assets/Prefabs/GunParts/EnlargerExtension.prefab b/Assets/Prefabs/GunParts/EnlargerExtension.prefab index 8a104d7e2..337ca13b7 100644 --- a/Assets/Prefabs/GunParts/EnlargerExtension.prefab +++ b/Assets/Prefabs/GunParts/EnlargerExtension.prefab @@ -72,7 +72,6 @@ GameObject: m_Component: - component: {fileID: 8196151136836888530} - component: {fileID: 7575752308601990708} - - component: {fileID: -1314935375335004500} m_Layer: 0 m_Name: EnlargerExtension m_TagString: Untagged @@ -118,23 +117,26 @@ MonoBehaviour: addition: 0.5 multiplier: 0 exponential: 1 + - name: ProjectileScale + addition: 0 + multiplier: 0 + exponential: 3 + - name: ProjectileDamage + addition: 0 + multiplier: 1 + exponential: 1 + - name: ProjectileSpeed + addition: 0 + multiplier: 0 + exponential: 0.5 + - name: FireRate + addition: 0 + multiplier: 0 + exponential: 0.7 outputs: - {fileID: 932626616956480431} midpoint: {fileID: 5729402012261899082} model: {fileID: 993201347869452232} ---- !u!114 &-1314935375335004500 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8350213044137146345} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 586f8df323151294a9220b1f0d464466, type: 3} - m_Name: - m_EditorClassIdentifier: - multiplier: 10 --- !u!1001 &74844362063714969 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 8717fb18c..402f8b972 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 785370674} - m_IndirectSpecularColor: {r: 0.062317036, g: 0.21927114, b: 0.4949812, a: 1} + m_IndirectSpecularColor: {r: 0.06261758, g: 0.21950229, b: 0.49507776, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: diff --git a/Assets/Scripts/Augment/AugmentImplementations/Hat/MeshProjectileController.cs b/Assets/Scripts/Augment/AugmentImplementations/Hat/MeshProjectileController.cs index 285d33fef..bb5cf0034 100644 --- a/Assets/Scripts/Augment/AugmentImplementations/Hat/MeshProjectileController.cs +++ b/Assets/Scripts/Augment/AugmentImplementations/Hat/MeshProjectileController.cs @@ -66,8 +66,6 @@ protected override void Awake() positionActiveBuffer.Initialize(maxProjectiles); vfx.SetGraphicsBuffer("Positions", positionActiveBuffer.Buffer); vfx.SetInt("MaxParticleCount", maxProjectiles); - vfx.SetFloat("Size", visualSize); - vfx.SendEvent(VisualEffectAsset.PlayEventID); if (!gunController || !gunController.Player) return; @@ -76,6 +74,8 @@ protected override void Awake() protected override void OnInitialize(GunStats gunstats) { + vfx.SetFloat("Size", visualSize * gunstats.ProjectileScale); + vfx.SendEvent(VisualEffectAsset.PlayEventID); animator.OnInitialize(gunstats); } @@ -126,7 +126,7 @@ private void RpcFireProjectile(Vector3 output, Vector3 direction, Quaternion rot loadedProjectile.position = output; loadedProjectile.direction = direction; loadedProjectile.rotation = rotation; - loadedProjectile.size = size; + loadedProjectile.size = size * stats.ProjectileScale; loadedProjectile.additionalProperties["lastCollider"] = null; projectiles[currentStateIndex] = loadedProjectile; diff --git a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs deleted file mode 100644 index 3ea7a043d..000000000 --- a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using System.Net.NetworkInformation; -using UnityEngine; - -public class ProjectileEnlarger : MonoBehaviour, ProjectileModifier -{ - public float multiplier = 3f; - - public void Scale(ref ProjectileState state, GunStats stats) - { - float relativeDistance = state.distanceTraveled / state.maxDistance; - state.size = state.size * multiplier * (1-1/(1+relativeDistance)); - Debug.Log(relativeDistance); - - } - public void Attach(ProjectileController projectile) - { - projectile.OnProjectileInit += Scale; - } - - public void Detach(ProjectileController projectile) - { - projectile.OnProjectileInit -= Scale; - } -} diff --git a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta b/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta deleted file mode 100644 index 70020e97b..000000000 --- a/Assets/Scripts/Augment/BulletModifiers/ProjectileEnlarger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 586f8df323151294a9220b1f0d464466 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VFX/Lazur.vfx b/Assets/VFX/Lazur.vfx index eeb996d5d..ba6d2b5e9 100644 --- a/Assets/VFX/Lazur.vfx +++ b/Assets/VFX/Lazur.vfx @@ -20,7 +20,7 @@ MonoBehaviour: x: -3087 y: -236 width: 4453 - height: 3826 + height: 3807 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -71,6 +71,8 @@ MonoBehaviour: - {fileID: 8926484042661615126} - {fileID: 8926484042661615070} - {fileID: 8926484042661615089} + - {fileID: 8926484042661615155} + - {fileID: 8926484042661615157} m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 @@ -117,6 +119,20 @@ MonoBehaviour: max: Infinity enumValues: [] descendantCount: 0 + - name: Size + path: Size + tooltip: + sheetType: m_Float + realType: Single + defaultValue: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + min: -Infinity + max: Infinity + enumValues: [] + descendantCount: 0 m_ImportDependencies: [] m_GraphVersion: 12 m_ResourceVersion: 1 @@ -6343,7 +6359,8 @@ MonoBehaviour: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_Direction: 0 - m_LinkedSlots: [] + m_LinkedSlots: + - {fileID: 8926484042661615160} --- !u!114 &8926484042661615093 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6410,7 +6427,8 @@ MonoBehaviour: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 m_Direction: 0 - m_LinkedSlots: [] + m_LinkedSlots: + - {fileID: 8926484042661615160} --- !u!114 &8926484042661615095 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7751,3 +7769,220 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] +--- !u!114 &8926484042661615155 +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: 330e0fca1717dde4aaa144f48232aa64, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 114350483966674976} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 0 + m_UISuperCollapsed: 0 + m_InputSlots: [] + m_OutputSlots: + - {fileID: 8926484042661615156} + m_ExposedName: Size + m_Exposed: 1 + m_Order: 3 + m_Category: + m_Min: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Max: + m_Type: + m_SerializableType: + m_SerializableObject: + m_IsOutput: 0 + m_EnumValues: [] + m_ValueFilter: 0 + m_Tooltip: + m_Nodes: + - m_Id: 0 + linkedSlots: + - outputSlot: {fileID: 8926484042661615156} + inputSlot: {fileID: 8926484042661615158} + position: {x: 474, y: 2383} + expandedSlots: [] + expanded: 0 +--- !u!114 &8926484042661615156 +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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661615156} + m_MasterData: + m_Owner: {fileID: 8926484042661615155} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_Space: 2147483647 + m_Property: + name: o + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: + - {fileID: 8926484042661615158} +--- !u!114 &8926484042661615157 +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: b8ee8a7543fa09e42a7c8616f60d2ad7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 114350483966674976} + m_Children: [] + m_UIPosition: {x: 643, y: 2325} + m_UICollapsed: 0 + m_UISuperCollapsed: 0 + m_InputSlots: + - {fileID: 8926484042661615158} + - {fileID: 8926484042661615159} + m_OutputSlots: + - {fileID: 8926484042661615160} + m_Operands: + - name: a + type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + - name: b + type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 +--- !u!114 &8926484042661615158 +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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661615158} + m_MasterData: + m_Owner: {fileID: 8926484042661615157} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_Space: 2147483647 + m_Property: + name: a + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: + - {fileID: 8926484042661615156} +--- !u!114 &8926484042661615159 +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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661615159} + m_MasterData: + m_Owner: {fileID: 8926484042661615157} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 0.08 + m_Space: 2147483647 + m_Property: + name: b + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661615160 +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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661615160} + m_MasterData: + m_Owner: {fileID: 8926484042661615157} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: + - {fileID: 8926484042661615092} + - {fileID: 8926484042661615094}