From 3f8896e6e2511bf9ed70745ed7d46944acb661f0 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Wed, 1 Oct 2025 20:04:35 +0100 Subject: [PATCH] bugfixing --- .../Scripts/PlayerCharacterStats.cs | 6 + .../Panoramics/FS002/FS002_Night.mat | 2 +- .../Bosses/BossEnemyPrefabTemplate.prefab | 14 ++ .../FriendlyNPC/FriendlyNPCPrefab.prefab | 161 +++++------------- .../Effects/DamageOverTimeVFXManager.cs | 12 +- .../New Universal Render Pipeline Asset.asset | 64 +++---- ...niversalRenderPipelineGlobalSettings.asset | 14 +- ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/UnityConnectSettings.asset | 8 +- 9 files changed, 117 insertions(+), 166 deletions(-) diff --git a/Assets/Character Stats/Examples/Items & Inventory/Scripts/PlayerCharacterStats.cs b/Assets/Character Stats/Examples/Items & Inventory/Scripts/PlayerCharacterStats.cs index 2dca4bc3..acfdeaf2 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Scripts/PlayerCharacterStats.cs +++ b/Assets/Character Stats/Examples/Items & Inventory/Scripts/PlayerCharacterStats.cs @@ -154,6 +154,12 @@ namespace Kryz.CharacterStats.Examples PlayerDataHandler.Instance.SaveCharacterData(PlayerDataHandler.Instance.currentPlayerName.Value, PlayerDataHandler.Instance.currentCharacterName.Value, characterData); } + [ContextMenu("Level Up")] + private void DebugLevelUp() + { + level.GainExperience(level.FinalExperienceThreshold); + } + private void OnReputationExperienceChanged() { accountData.currentReputationLevel = reputationLevel.currentLevel; diff --git a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat index a0694764..fc818837 100644 --- a/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat +++ b/Assets/Fantasy Skybox FREE/Panoramics/FS002/FS002_Night.mat @@ -78,7 +78,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 4.9805784 + - _Rotation: 4.8367205 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab index 4941d095..cde4bd5b 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab @@ -132,6 +132,7 @@ GameObject: - component: {fileID: 457396336866213362} - component: {fileID: 457396336866213363} - component: {fileID: 457396336866213364} + - component: {fileID: 8494129080998513209} - component: {fileID: 457396336866213366} - component: {fileID: 457396336866213365} - component: {fileID: 457396336866213367} @@ -277,6 +278,18 @@ MonoBehaviour: targetTag: - {fileID: 11400000, guid: 3ac5bfbf7e1fbdd4baec1c17bd3d874c, type: 2} - {fileID: 11400000, guid: 93dd72cde2a0f904fae3c6ef79d83d65, type: 2} +--- !u!114 &8494129080998513209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2278116590711127943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e09b6617beed447a13265764139f69, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EntityEventBroker --- !u!114 &457396336866213366 MonoBehaviour: m_ObjectHideFlags: 0 @@ -509,6 +522,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::TickingEffectHandler taggable: {fileID: 0} + activeEffects: [] --- !u!114 &1776927755208037906 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/FriendlyNPC/FriendlyNPCPrefab.prefab b/Assets/Resources/FriendlyNPC/FriendlyNPCPrefab.prefab index fc0d7659..2a1680c0 100644 --- a/Assets/Resources/FriendlyNPC/FriendlyNPCPrefab.prefab +++ b/Assets/Resources/FriendlyNPC/FriendlyNPCPrefab.prefab @@ -9912,16 +9912,14 @@ GameObject: - component: {fileID: 163003390564683247} - component: {fileID: 6169164064363286183} - component: {fileID: 8356112358813389262} + - component: {fileID: 51672674781424955} - component: {fileID: 5602509813443640404} - component: {fileID: 3872572517374119927} - component: {fileID: 2084189017646663947} - component: {fileID: 4414166776940121315} - - component: {fileID: 2772664379326230405} - - component: {fileID: 4348534060016890892} - - component: {fileID: 5849382037180318239} - - component: {fileID: 5028005112213033634} - component: {fileID: 3041319524247977821} - - component: {fileID: 2195773339669327384} + - component: {fileID: 2571357476993872027} + - component: {fileID: 9174918939202648222} m_Layer: 0 m_Name: FriendlyNPCPrefab m_TagString: Untagged @@ -10076,6 +10074,18 @@ MonoBehaviour: m_EditorClassIdentifier: targetTag: - {fileID: 11400000, guid: d7e3d821587d6604983c07e30082e1b2, type: 2} +--- !u!114 &51672674781424955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3538551111449850966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e09b6617beed447a13265764139f69, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EntityEventBroker --- !u!114 &5602509813443640404 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10098,14 +10108,12 @@ MonoBehaviour: onResourceChanged: m_PersistentCalls: m_Calls: [] - scrollingTextPrefab: {fileID: 0} onMaxHealthChanged: m_PersistentCalls: m_Calls: [] onDeath: m_PersistentCalls: m_Calls: [] - invulnerable: 0 OnInvulnerabilityStateChanged: m_PersistentCalls: m_Calls: [] @@ -10256,115 +10264,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &2772664379326230405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3538551111449850966} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca852ea491ac9f340b2f34820a262d84, type: 3} - m_Name: - m_EditorClassIdentifier: - canStack: 1 - canRefresh: 1 - taggable: {fileID: 0} - endEffectTime: 0 - activeStacks: [] - OnEffectStackAddedEvent: - m_PersistentCalls: - m_Calls: [] - OnEffectEnded: - m_PersistentCalls: - m_Calls: [] - startingIncomeModifierPercent: 0 - currentIncomeModifierPercent: 0 ---- !u!114 &4348534060016890892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3538551111449850966} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d56bc7037aecb344b6d896e7094980f, type: 3} - m_Name: - m_EditorClassIdentifier: - canStack: 1 - canRefresh: 1 - taggable: {fileID: 0} - endEffectTime: 0 - activeStacks: [] - OnEffectStackAddedEvent: - m_PersistentCalls: - m_Calls: [] - OnEffectEnded: - m_PersistentCalls: - m_Calls: [] - mitigationType: 0 - currentDamagePerTick: 0 - OnEffectTick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &5849382037180318239 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3538551111449850966} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 70248ebe0c4107246bddef82854d8bde, type: 3} - m_Name: - m_EditorClassIdentifier: - canStack: 1 - canRefresh: 1 - taggable: {fileID: 0} - endEffectTime: 0 - activeStacks: [] - OnEffectStackAddedEvent: - m_PersistentCalls: - m_Calls: [] - OnEffectEnded: - m_PersistentCalls: - m_Calls: [] - mitigationType: 0 - currentDamagePerTick: 0 - OnEffectTick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &5028005112213033634 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3538551111449850966} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e47a07abc64d3824fb77261edb5f72e3, type: 3} - m_Name: - m_EditorClassIdentifier: - canStack: 1 - canRefresh: 1 - taggable: {fileID: 0} - endEffectTime: 0 - activeStacks: [] - OnEffectStackAddedEvent: - m_PersistentCalls: - m_Calls: [] - OnEffectEnded: - m_PersistentCalls: - m_Calls: [] - mitigationType: 0 - currentDamagePerTick: 0 - OnEffectTick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &3041319524247977821 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10377,10 +10276,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 88a4c67f5abc6544e83efa5dedd057c1, type: 3} m_Name: m_EditorClassIdentifier: + burningText: {fileID: 0} + poisonedText: {fileID: 0} + bleedingText: {fileID: 0} burnVFX: {fileID: 2881300978580325238} poisonVFX: {fileID: 8848370638683750659} bleedVFX: {fileID: 8069928076054913620} ---- !u!114 &2195773339669327384 +--- !u!114 &2571357476993872027 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10389,11 +10291,25 @@ MonoBehaviour: m_GameObject: {fileID: 3538551111449850966} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 09c47ef573bbd814e980780d8ab97f9f, type: 3} + m_Script: {fileID: 11500000, guid: 118e9e465521b054092a49272a44da7f, type: 3} m_Name: - m_EditorClassIdentifier: - canStack: 1 - canRefresh: 1 + m_EditorClassIdentifier: Assembly-CSharp::TickingEffectHandler + taggable: {fileID: 0} + activeEffects: [] +--- !u!114 &9174918939202648222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3538551111449850966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 560c708d650e7564ba17251a581b01f2, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::MovementSpeedModifierEffectInstance + canStack: 0 + canRefresh: 0 taggable: {fileID: 0} endEffectTime: 0 activeStacks: [] @@ -10403,8 +10319,7 @@ MonoBehaviour: OnEffectEnded: m_PersistentCalls: m_Calls: [] - startingOutputModifierPercent: 0 - currentOutputModifierPercent: 0 + currentSpeedModifierPercent: 0 --- !u!1 &3840422715495025376 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeVFXManager.cs b/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeVFXManager.cs index d76593d7..2b77bd23 100644 --- a/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeVFXManager.cs +++ b/Assets/Scripts/AbilitySystem/Effects/DamageOverTimeVFXManager.cs @@ -22,9 +22,9 @@ public class DamageOverTimeVFXManager : MonoBehaviour private void Update() { - burnVFX.SetActive(effectHandler.IsBurning()); - poisonVFX.SetActive(effectHandler.IsPoisoned()); - bleedVFX.SetActive(effectHandler.IsBleeding()); + burnVFX?.SetActive(effectHandler.IsBurning()); + poisonVFX?.SetActive(effectHandler.IsPoisoned()); + bleedVFX?.SetActive(effectHandler.IsBleeding()); } private void OnAilmentApplied(DamageType type) @@ -32,13 +32,13 @@ public class DamageOverTimeVFXManager : MonoBehaviour switch (type) { case DamageType.Fire: - burningText.Play(); + burningText?.Play(); break; case DamageType.Physical: - bleedingText.Play(); + bleedingText?.Play(); break; case DamageType.Poison: - poisonedText.Play(); + poisonedText?.Play(); break; } } diff --git a/Assets/URP/New Universal Render Pipeline Asset.asset b/Assets/URP/New Universal Render Pipeline Asset.asset index 46af1533..d4093033 100644 --- a/Assets/URP/New Universal Render Pipeline Asset.asset +++ b/Assets/URP/New Universal Render Pipeline Asset.asset @@ -100,40 +100,40 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 - m_PrefilterBicubicLightmapSampling: 0 - m_PrefilterReflectionProbeBlending: 0 - m_PrefilterReflectionProbeBoxProjection: 0 - m_PrefilterReflectionProbeAtlas: 0 + m_PrefilterBicubicLightmapSampling: 1 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 + m_PrefilterReflectionProbeAtlas: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index f422b7b7..e9443d92 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -63,7 +63,19 @@ MonoBehaviour: - rid: 5425721788426092782 - rid: 5425721788426092783 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 5425721788426092757 + - rid: 5425721788426092759 + - rid: 5425721788426092761 + - rid: 5425721788426092763 + - rid: 5425721788426092766 + - rid: 5425721788426092767 + - rid: 5425721788426092768 + - rid: 5425721788426092774 + - rid: 5425721788426092775 + - rid: 5425721788426092779 + - rid: 5425721788426092780 + - rid: 5425721788426092781 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c6d92ca2..3b5c952c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.17.0 + bundleVersion: 0.18.0 preloadedAssets: - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 2d81664b..d4cafe7f 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -11,9 +11,13 @@ UnityConnectSettings: m_ConfigUrl: https://config.uca.cloud.unity3d.com m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 - CrashReportingSettings: - m_EventUrl: https://perf-events.cloud.unity3d.com + InsightsSettings: + m_EngineDiagnosticsEnabled: 0 m_Enabled: 0 + CrashReportingSettings: + serializedVersion: 2 + m_EventUrl: https://perf-events.cloud.unity3d.com + m_EnableCloudDiagnosticsReporting: 0 m_LogBufferSize: 10 m_CaptureEditorExceptions: 1 UnityPurchasingSettings: