diff --git a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab index a2a07a8a..636ff680 100644 --- a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab @@ -232,7 +232,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: projectileRange: 6 - meleeRange: 2.25 + meleeRange: 2.5 distanceToChangePatrolDestination: 1 patrolAgentSpeed: 1.5 chasingAgentSpeed: 2.85 @@ -261,19 +261,19 @@ NavMeshAgent: m_GameObject: {fileID: 2278116590711127943} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.7 + m_Radius: 0.85 m_Speed: 3 m_Acceleration: 45 avoidancePriority: 50 m_AngularSpeed: 3600 - m_StoppingDistance: 1.1 + m_StoppingDistance: 2 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.7 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 + m_ObstacleAvoidanceType: 0 --- !u!54 &457396336866213363 Rigidbody: m_ObjectHideFlags: 0 @@ -330,6 +330,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] photonView: {fileID: 0} + OnInvulnerabilityStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!114 &457396336866213365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -354,6 +357,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] photonView: {fileID: 0} + OnNoManaCostStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!114 &457396336866213367 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1237,6 +1243,10 @@ PrefabInstance: propertyPath: m_text value: Bossy Skelly Mage objectReference: {fileID: 0} + - target: {fileID: 1063629724385205317, guid: 2e56f69e0872f744daa6c9080ecf3040, type: 3} + propertyPath: m_fontSize + value: 294.65 + objectReference: {fileID: 0} - target: {fileID: 4924407620164273521, guid: 2e56f69e0872f744daa6c9080ecf3040, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab index 829db325..0bfca5a7 100644 --- a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab +++ b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab @@ -311,7 +311,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: projectileRange: 5 - meleeRange: 2 + meleeRange: 2.5 distanceToChangePatrolDestination: 0.9 patrolAgentSpeed: 1.5 chasingAgentSpeed: 2.65 @@ -339,19 +339,19 @@ NavMeshAgent: m_GameObject: {fileID: 1040714684719195968} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.5 + m_Radius: 0.65 m_Speed: 2.65 m_Acceleration: 45 avoidancePriority: 50 m_AngularSpeed: 3600 - m_StoppingDistance: 0.8 + m_StoppingDistance: 1.5 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 + m_ObstacleAvoidanceType: 0 --- !u!54 &1708233211970282804 Rigidbody: m_ObjectHideFlags: 0 @@ -408,6 +408,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] photonView: {fileID: 0} + OnInvulnerabilityStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!114 &1708233211970282802 MonoBehaviour: m_ObjectHideFlags: 0 @@ -432,6 +435,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] photonView: {fileID: 0} + OnNoManaCostStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!114 &1708233211970282800 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Nameplate.prefab b/Assets/Resources/Nameplate.prefab index 1fb00a44..9dfd5e21 100644 --- a/Assets/Resources/Nameplate.prefab +++ b/Assets/Resources/Nameplate.prefab @@ -285,7 +285,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 200, z: 0, w: 200} + m_margin: {x: 400, y: 200, z: 400, w: 200} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index bffcba80..c521b46a 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -337,19 +337,19 @@ NavMeshAgent: m_GameObject: {fileID: 480331571121010796} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.5 + m_Radius: 0.65 m_Speed: 4.5 m_Acceleration: 45 avoidancePriority: 50 m_AngularSpeed: 3600 - m_StoppingDistance: 0 + m_StoppingDistance: 0.25 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1 m_BaseOffset: 0 m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 + m_ObstacleAvoidanceType: 0 --- !u!54 &5973121119216927703 Rigidbody: m_ObjectHideFlags: 0 @@ -801,7 +801,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 250} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 1, y: 1} --- !u!222 &3210896877310968208 CanvasRenderer: @@ -1264,7 +1264,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 250} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 1, y: 1} --- !u!222 &7171466268775715571 CanvasRenderer: @@ -1426,7 +1426,7 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5640956464892620433} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.5 @@ -2037,7 +2037,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 250} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 1, y: 1} --- !u!222 &5723889522999370134 CanvasRenderer: @@ -2303,7 +2303,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 250} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 1, y: 0} --- !u!222 &4560164763644961258 CanvasRenderer: diff --git a/Assets/Scripts/Player/PlayerDeathManager.cs b/Assets/Scripts/Player/PlayerDeathManager.cs index 02063d5f..262f58c3 100644 --- a/Assets/Scripts/Player/PlayerDeathManager.cs +++ b/Assets/Scripts/Player/PlayerDeathManager.cs @@ -213,6 +213,7 @@ public class PlayerDeathManager : MonoBehaviour, IPunObservable // Re-enable player movement and abilities // Restore normal player visuals + playersInsideReviveTrigger.Clear(); if (!owner.IsMine) return; diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index e78cf653..8880f289 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 10.946397 + - _Rotation: 13.729687 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1