diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 550168c9..51dbb443 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -7523,7 +7523,7 @@ MonoBehaviour: isBonusRiftJob: 0 bonusRiftType: 0 availableJobs: [] - multiJobBonus: + currentlyGeneratedRiftRaid: templateIndex: 0 title: description: diff --git a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset index 46b5abc6..2f9d7886 100644 --- a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset +++ b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset @@ -78,6 +78,8 @@ MonoBehaviour: - RPC_SetFishTrigger - RPC_SetPickupTrigger - RPC_ApplyDamageOutputModifierEffect + - RPC_RemoteInitProjectile + - RPC_UpdateTotalEnemies DisableAutoOpenWizard: 1 ShowSettings: 0 DevRegionSetOnce: 1 diff --git a/Assets/Resources/Abilities/BasicMinionPrefab.prefab b/Assets/Resources/Abilities/BasicMinionPrefab.prefab index 8c928daa..00e88056 100644 --- a/Assets/Resources/Abilities/BasicMinionPrefab.prefab +++ b/Assets/Resources/Abilities/BasicMinionPrefab.prefab @@ -4904,6 +4904,8 @@ MonoBehaviour: - {fileID: 11400000, guid: 753401cb84e3c5c4ebaef324c0399eb0, type: 2} - {fileID: 11400000, guid: 60a432442ce35934eb0a7170f0a113f0, type: 2} - {fileID: 11400000, guid: e2c921ce12afad24f8780b0b7555cb0b, type: 2} + nonEquippablesDrops: [] + weightedDropLootTable: [] --- !u!1 &1773925912441182246 GameObject: m_ObjectHideFlags: 0 @@ -5287,6 +5289,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] photonView: {fileID: 0} + invulnerable: 0 OnInvulnerabilityStateChanged: m_PersistentCalls: m_Calls: [] @@ -5656,7 +5659,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ebd865fb7095524c8620113a3e1f40d, type: 3} m_Name: m_EditorClassIdentifier: - sightRange: 6 + sightRangeAfterFirstVisualContact: 8 + initialSightRange: 6 --- !u!1 &4844945595650680567 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab index 5c53d116..9992af5a 100644 --- a/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/RedRift_Interactable.prefab @@ -110,6 +110,7 @@ MonoBehaviour: experienceReward: 0 reputationReward: 0 completed: 0 + isBonusRiftJob: 0 bonusRiftType: 0 --- !u!136 &3743933938050003521 CapsuleCollider: diff --git a/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab b/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab index 655ebb74..67ebe8a4 100644 --- a/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab +++ b/Assets/Resources/Rifts/Interactables/YellowRift_Interactable.prefab @@ -110,6 +110,7 @@ MonoBehaviour: experienceReward: 0 reputationReward: 0 completed: 0 + isBonusRiftJob: 0 bonusRiftType: 0 --- !u!136 &3661901689948753379 CapsuleCollider: diff --git a/Assets/Scenes/0-Splash.unity b/Assets/Scenes/0-Splash.unity index 2b3cc35f..a76baa7b 100644 --- a/Assets/Scenes/0-Splash.unity +++ b/Assets/Scenes/0-Splash.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.025432706, g: 0.05342576, b: 0.05610317, a: 1} + m_IndirectSpecularColor: {r: 0.05706269, g: 0.114712454, b: 0.119711496, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1447,6 +1447,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 559795999353192350, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 559795999353192350, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 559795999353192350, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 559795999353192350, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 952476992021474036, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1491,6 +1507,54 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1937322274624059534, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2363082734463220811, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3015579015349867821, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3015579015349867821, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3015579015349867821, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3015579015349867821, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3044532144327822992, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1559,6 +1623,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818900776374735421, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4759723387849467176, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1583,6 +1663,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4816278797606998762, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4816278797606998762, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4816278797606998762, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4816278797606998762, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5060244164449252146, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1607,6 +1703,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5126747884924751304, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5126747884924751304, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5126747884924751304, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5126747884924751304, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6069245676466788546, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1627,6 +1739,54 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6171305395222225369, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6486262286580599512, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6913262005630981626, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7227319219501551729, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1895,6 +2055,110 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305655975, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305660313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305660313, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305665201, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305758377, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305768383, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7475116342305770233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1919,6 +2183,78 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773047, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305773585, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305774289, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7475116342305783261, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1943,6 +2279,110 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305819235, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305824339, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305825505, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305830465, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305831057, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305831057, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7475116342305832019, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1967,6 +2407,182 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305833455, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305854767, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305856963, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305856963, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305862233, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305863519, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305864677, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305877679, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7475116342305878647, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7840512114539168951, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2011,6 +2627,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8605670301635831021, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8955363189425139936, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9019508352508791564, guid: 7cf303e1116e7fb46ba92e7d73321eeb, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Scenes/5-RiftRaid.unity b/Assets/Scenes/5-RiftRaid.unity index d82cdb48..6431aaf9 100644 --- a/Assets/Scenes/5-RiftRaid.unity +++ b/Assets/Scenes/5-RiftRaid.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.062280517, g: 0.12464172, b: 0.13009483, a: 1} + m_IndirectSpecularColor: {r: 0.05706269, g: 0.114712454, b: 0.119711496, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6666,6 +6666,7 @@ GameObject: m_Component: - component: {fileID: 1258284630} - component: {fileID: 1258284629} + - component: {fileID: 1258284631} m_Layer: 0 m_Name: RiftRaidEnemySpawner m_TagString: Untagged @@ -6724,6 +6725,28 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1258284631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258284628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} + m_Name: + m_EditorClassIdentifier: + ObservedComponentsFoldoutOpen: 1 + Group: 0 + prefixField: -1 + Synchronization: 3 + OwnershipTransfer: 0 + observableSearch: 2 + ObservedComponents: [] + sceneViewId: 2 + InstantiationId: 0 + isRuntimeInstantiated: 0 --- !u!1 &1265395837 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs b/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs index 42f73df2..18d42b6e 100644 --- a/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs +++ b/Assets/Scripts/AbilitySystem/Base/BaseAbility.cs @@ -23,7 +23,7 @@ public class BaseAbility : ScriptableObject public AbilityAnimationType animationType; Mana userMana; - Health userHealth; + protected Health userHealth; private float maxManaCostInValue; private float maxHealthCostInValue; diff --git a/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs b/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs index 074e0c95..614fad70 100644 --- a/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs +++ b/Assets/Scripts/AbilitySystem/Base/PotionAbility.cs @@ -9,7 +9,6 @@ public class PotionAbility : BaseAbility [Header("PotionPercentValue:")] public float healingPercent; - Health userHealth; public override void Execute(PhotonView user, Taggable userTag) { userHealth = userTag.GetComponent(); diff --git a/Assets/Scripts/Drops/EquippableItemDrop.cs b/Assets/Scripts/Drops/EquippableItemDrop.cs index bd4d72b2..c886ae3b 100644 --- a/Assets/Scripts/Drops/EquippableItemDrop.cs +++ b/Assets/Scripts/Drops/EquippableItemDrop.cs @@ -11,9 +11,9 @@ public class EquippableItemDrop : Interactable { base.Interact(melee); - FindObjectOfType().AddItem(itemDrop); + if (FindObjectOfType().AddItem(itemDrop)) + Destroy(this.gameObject); - Destroy(this.gameObject); } } diff --git a/Assets/Scripts/Game/GameConstants.cs b/Assets/Scripts/Game/GameConstants.cs index bd5c1679..487a280c 100644 --- a/Assets/Scripts/Game/GameConstants.cs +++ b/Assets/Scripts/Game/GameConstants.cs @@ -266,6 +266,7 @@ public static class GameConstants public static class NetworkPropertyKeys { public const string AvailableJobsKey = "availableJobs"; + public const string CurrentMultiJobRiftRaid = "currentMultiJobRiftRaid"; } public static class Sizes diff --git a/Assets/Scripts/Networking/JobManager.cs b/Assets/Scripts/Networking/JobManager.cs index 580da82e..845e38ac 100644 --- a/Assets/Scripts/Networking/JobManager.cs +++ b/Assets/Scripts/Networking/JobManager.cs @@ -30,9 +30,10 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks [SerializeField] public List availableJobs = new List(); [SerializeField] - public JobInstance multiJobBonus = new JobInstance(); + public JobInstance currentlyGeneratedRiftRaid = new JobInstance(); private string availableJobsJson; + private string currentRiftRaidJson; #region Singleton private static JobManager _instance; @@ -132,7 +133,7 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks { //onSendMultiJobBonusRewards.Raise(multiJobBonus); JobActive = false; - onJobCompleted.Raise(multiJobBonus); + onJobCompleted.Raise(currentlyGeneratedRiftRaid); } public JobInstance GenerateJobInstance(ZoneData respectiveZone) @@ -147,25 +148,25 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks return generatedJob; } - private JobInstance GenerateMultiJobBonus(JobTemplate template) + /*private JobInstance GenerateMultiJobBonus(JobTemplate template) { JobInstance generatedBonus = new JobInstance(template); generatedBonus.UpdateRewardsBasedOnTemplateAndDifficulty(template); generatedBonus.templateIndex = multiJobBonusTemplates.IndexOf(template); return generatedBonus; - } + }*/ public JobInstance GenerateBonusRiftInstance() { int templateIndex = Random.Range(0, multiJobBonusTemplates.Count); JobInstance generatedBonus = new JobInstance(multiJobBonusTemplates[templateIndex]); generatedBonus.UpdateRewardsBasedOnTemplateAndDifficulty(multiJobBonusTemplates[templateIndex]); generatedBonus.templateIndex = templateIndex; - multiJobBonus = generatedBonus; + currentlyGeneratedRiftRaid = generatedBonus; return generatedBonus; } private void UpdateMultiJobBonusBasedOnDifficulty() { - multiJobBonus.UpdateRewardsBasedOnTemplateAndDifficulty(multiJobBonusTemplates[multiJobBonus.templateIndex]); + currentlyGeneratedRiftRaid.UpdateRewardsBasedOnTemplateAndDifficulty(multiJobBonusTemplates[currentlyGeneratedRiftRaid.templateIndex]); } private void UpdateAvailableJobsRewardsOnDifficultyChanged() @@ -178,7 +179,7 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks public void GenerateJobs() { - GenerateMultiJobBonus(multiJobBonusTemplates[0]); + //GenerateMultiJobBonus(multiJobBonusTemplates[0]); if (!PhotonNetwork.IsMasterClient) { @@ -190,6 +191,8 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks availableJobs.Add(GenerateJobInstance(zones[i])); } + currentlyGeneratedRiftRaid = GenerateBonusRiftInstance(); + UpdatePropertiesWithJobs(); onAvailableJobsUpdated.Raise(); @@ -204,17 +207,32 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks GenerateJobs(); } + currentlyGeneratedRiftRaid = GenerateBonusRiftInstance(); + AvailableJobs jobs = new AvailableJobs(); jobs.availableJobs = availableJobs; availableJobsJson = JsonUtility.ToJson(jobs); Debug.Log("Room Property jobs: " + availableJobsJson); ExitGames.Client.Photon.Hashtable ht = new ExitGames.Client.Photon.Hashtable { { GameConstants.NetworkPropertyKeys.AvailableJobsKey, availableJobsJson } }; PhotonNetwork.CurrentRoom.SetCustomProperties(ht); + + JobInstance currentRiftRaidGenerated = currentlyGeneratedRiftRaid; + currentRiftRaidJson = JsonUtility.ToJson(currentRiftRaidGenerated); + Debug.Log("Room Property riftraid: " + currentRiftRaidJson); + ExitGames.Client.Photon.Hashtable riftraidtable = new ExitGames.Client.Photon.Hashtable { { GameConstants.NetworkPropertyKeys.CurrentMultiJobRiftRaid, currentRiftRaidJson } }; + PhotonNetwork.CurrentRoom.SetCustomProperties(riftraidtable); } private void TryGetAvailableJobsFromRoomProperties() { ExitGames.Client.Photon.Hashtable roomProperties = PhotonNetwork.CurrentRoom.CustomProperties; + + if (roomProperties.ContainsKey(GameConstants.NetworkPropertyKeys.CurrentMultiJobRiftRaid)) + { + currentRiftRaidJson = (string)(string)roomProperties[GameConstants.NetworkPropertyKeys.CurrentMultiJobRiftRaid]; + Debug.Log("Room Property RiftRaid: " + currentRiftRaidJson); + currentlyGeneratedRiftRaid = JsonUtility.FromJson(currentRiftRaidJson); + } if (roomProperties.ContainsKey(GameConstants.NetworkPropertyKeys.AvailableJobsKey)) { availableJobsJson = (string)roomProperties[GameConstants.NetworkPropertyKeys.AvailableJobsKey]; @@ -260,4 +278,10 @@ public class JobManager : MonoBehaviour, IInRoomCallbacks public class AvailableJobs { public List availableJobs = new List(); +} + +[System.Serializable] +public class RiftRaid +{ + public JobInstance riftRaid = new JobInstance(); } \ No newline at end of file diff --git a/Assets/Scripts/Networking/NetworkManager.cs b/Assets/Scripts/Networking/NetworkManager.cs index dd01c7a9..ab4c72bc 100644 --- a/Assets/Scripts/Networking/NetworkManager.cs +++ b/Assets/Scripts/Networking/NetworkManager.cs @@ -106,7 +106,32 @@ public class NetworkManager : MonoBehaviourPunCallbacks, IOnEventCallback public IEnumerator SpawnCharacterWithDelay(ZoneData zoneData) { yield return new WaitUntil(() => PhotonNetwork.InRoom); - PhotonNetwork.Instantiate("PlayableCharacters/" + charSelected.Value, zoneData.playerBaseSpawnPoint.position + new Vector3(3 * (PhotonNetwork.LocalPlayer.ActorNumber % 3), 0, 0), Quaternion.identity); + PhotonNetwork.Instantiate("PlayableCharacters/" + charSelected.Value, GetSpiralPosition(zoneData.playerBaseSpawnPoint.position,PhotonNetwork.LocalPlayer.ActorNumber - 1), Quaternion.identity); + } + + public Vector3 GetSpiralPosition(Vector3 centerPoint, int playerIndex) + { + if (playerIndex == 0) + return centerPoint; + + // Base radius and angle increment settings + float baseRadius = 1.5f; // Base distance between players + float angleIncrement = 30f; // Degrees between each position + float radiusGrowthFactor = 0.25f; // How much to increase radius per rotation + + // Calculate current angle and radius + float angle = angleIncrement * playerIndex; + float rotations = angle / 360f; + float currentRadius = baseRadius * (1f + rotations * radiusGrowthFactor); + + // Convert angle to radians + float rad = angle * Mathf.Deg2Rad; + + // Calculate position + float x = centerPoint.x + currentRadius * Mathf.Cos(rad); + float z = centerPoint.z + currentRadius * Mathf.Sin(rad); + + return new Vector3(x, centerPoint.y, z); } /* private void Update() diff --git a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs index f6c11f25..3ed72cbe 100644 --- a/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs +++ b/Assets/Scripts/Networking/NetworkedAreaOfEffect.cs @@ -110,6 +110,7 @@ public class NetworkedAreaOfEffect : MonoBehaviour, IPunObservable if (target == null) continue; + if (ability == null) continue; if (!target.IsValidTarget(ability.targettingTags)) continue; diff --git a/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs index 63026c30..48f4f631 100644 --- a/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs +++ b/Assets/Scripts/Networking/NetworkedProjectileAreaOfEffectOverTimeWithTickEvent.cs @@ -20,6 +20,14 @@ public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAre protected List processedTargets = new List(); protected List projectileTargets = new List(); + public void InitProjectileStats() + { + if (photonView.IsMine) + { + photonView.RPC(nameof(RPC_RemoteInitProjectile), RpcTarget.Others, AbilityIndexer.Instance.Abilities.IndexOf(projectileAbility)); + } + } + private void Update() { if (!photonView.IsMine) return; @@ -35,6 +43,12 @@ public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAre onTickHappened.Invoke(owner, ownerTag, targets); } + [PunRPC] + protected void RPC_RemoteInitProjectile(int abilityIndex) + { + projectileAbility = (ProjectileAbility)AbilityIndexer.Instance.Abilities[abilityIndex]; + } + private void OnTriggerEnter(Collider other) { if (waitingForDestroy) return; @@ -50,6 +64,8 @@ public class NetworkedProjectileAreaOfEffectOverTimeWithTickEvent : NetworkedAre if (target == null) return; + if (projectileAbility == null) return; + if (!target.IsValidTarget(projectileAbility.targettingTags)) return; //Debug.Log($"TT[{Time.frameCount}] Past validation checks for {target.name}"); diff --git a/Assets/Scripts/RiftSystem/RiftRaiding/InteractableRift.cs b/Assets/Scripts/RiftSystem/RiftRaiding/InteractableRift.cs index a3bb2ee2..3c562725 100644 --- a/Assets/Scripts/RiftSystem/RiftRaiding/InteractableRift.cs +++ b/Assets/Scripts/RiftSystem/RiftRaiding/InteractableRift.cs @@ -15,6 +15,8 @@ public class InteractableRift : Interactable IEnumerator Start() { + bonusRiftInstance = JobManager.Instance.currentlyGeneratedRiftRaid; + SetVisual(0); yield return new WaitForSeconds(0.8f); diff --git a/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidEnemySpawner.cs b/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidEnemySpawner.cs index acd0ce1b..a072b2da 100644 --- a/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidEnemySpawner.cs +++ b/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidEnemySpawner.cs @@ -41,6 +41,8 @@ public class RiftRaidEnemySpawner : MonoBehaviour private void Awake() { + photonView = GetComponent(); + enemyType_Quantity = new Dictionary(); for (int i = 0; i < zoneData.possibleEnemies.Count; i++) @@ -93,9 +95,15 @@ public class RiftRaidEnemySpawner : MonoBehaviour unitDifficultySetter = spawnedEnemy.GetComponentInChildren(true); unitDifficultySetter.InitializeUnitDifficulty(unitDifficultySettings); - yield return null; + yield return new WaitForSeconds(0.5f); + photonView.RPC(nameof(RPC_UpdateTotalEnemies), RpcTarget.Others, totalEnemies); + } + [PunRPC] + private void RPC_UpdateTotalEnemies(int totalEnemies) + { + this.totalEnemies = totalEnemies; } private void CountTowardsCompletion(float exp) diff --git a/Assets/Scripts/UI/WorldJobsListingUI/WorldJobsListingUIController.cs b/Assets/Scripts/UI/WorldJobsListingUI/WorldJobsListingUIController.cs index b1d228d3..12f8b9b3 100644 --- a/Assets/Scripts/UI/WorldJobsListingUI/WorldJobsListingUIController.cs +++ b/Assets/Scripts/UI/WorldJobsListingUI/WorldJobsListingUIController.cs @@ -1,3 +1,4 @@ +using Photon.Pun; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -114,8 +115,8 @@ public class WorldJobsListingUIController : MonoBehaviour if (jobsCompletedCount >= 3 && !jobCompleted.isBonusRiftJob) { //multiJobBonusClaimButton.interactable = true; - - OnMultiJobBonusRiftReadyToSpawn.Raise(JobManager.Instance.GenerateBonusRiftInstance()); + if (PhotonNetwork.IsMasterClient) + OnMultiJobBonusRiftReadyToSpawn.Raise(JobManager.Instance.currentlyGeneratedRiftRaid); jobsCompletedCount = 0; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d0be5d6f..b29ea3ca 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -139,34 +139,97 @@ PlayerSettings: - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - {fileID: 4737951027918891026, guid: cddaf859427e00146bf57a9ec9da9762, type: 3} + - {fileID: 7860705739450478573, guid: d37ff5fcc9b2b67418d3ea2da233a7e0, type: 3} - {fileID: 2740904024514934886, guid: c1f1568424ee50f42854769f3e1ba0b6, type: 3} + - {fileID: 4296156910025484507, guid: faa4fe928f5c2d34280baa419f0819bc, type: 3} + - {fileID: 6321488985172632352, guid: 421cfe4470c6f304b8f30f9451f8467c, type: 3} + - {fileID: 5182193148598858814, guid: 2a1c0c12fb062784899b76ce9fbba591, type: 3} + - {fileID: 5182193148598858814, guid: a23c3bbe3a299bc4fb87a4645ea4a8c2, type: 3} + - {fileID: 3704396325418192251, guid: baa2ee7657d7f4f48b3f5ae8dab11efe, type: 3} + - {fileID: 4457675943992054240, guid: aba296cc1f703a74fb09bb0f6b31e2ba, type: 3} + - {fileID: 5182193148598858814, guid: 445a7ac776d33d9428bc46f073fe3579, type: 3} + - {fileID: 5113932649102621176, guid: 205e3d0d6f1a8b94fb06103f9a47bb27, type: 3} + - {fileID: 7681102451873883169, guid: 873be9a67eca9f34492e05e6045fde4a, type: 3} - {fileID: 7332445597516000773, guid: 49d4c037b88cfc54a9fe2d4a84012145, type: 3} - - {fileID: 758050341675869817, guid: 5245a1dc9755eec42adf1f51b0c52d08, type: 3} + - {fileID: 8966047921959179417, guid: 15b7bc6597eaf3c48a39f36fcb469757, type: 3} + - {fileID: 4772960342460004092, guid: 261989bc4bda3d14eab63b1b4072d1e4, type: 3} + - {fileID: 8042391599351516399, guid: 4343cc0fa85d19f4d803136253b94238, type: 3} + - {fileID: 5268821355948254242, guid: c99d6894fce8883469721499b7647b19, type: 3} + - {fileID: 7687237107928750433, guid: e7044fbd0b009dd47994ea761fd094d8, type: 3} + - {fileID: 7681102451873883169, guid: c164dbafcabacfe44aa66b1084a9f49f, type: 3} - {fileID: 6063651656755616566, guid: a89ee7eec16b2bc44aa4d4e85f9e9e47, type: 3} + - {fileID: 8979840876601850889, guid: 94c757b185e1d1b42a2b283576f6b7b5, type: 3} - {fileID: 8979840876601850889, guid: da5aac032dc71764c851bcd729afd2ff, type: 3} + - {fileID: 8058865113381185808, guid: 992bd86877d93794fa4c04824808f2a7, type: 3} - {fileID: 6684366852784880873, guid: f15e487e3a2d10649b5606f62f5754bf, type: 3} + - {fileID: 3047327856582476134, guid: 8e0bcede9087257488737827f06dad09, type: 3} + - {fileID: 4739689218961410417, guid: 8a435914e6060c34084e5937fce7bc8b, type: 3} - {fileID: 242799163458536464, guid: 1f4bc3f1d82c9554486c4e7e3bde86fc, type: 3} + - {fileID: 7455199422598815824, guid: 9eea5b91b0d9f314bb953bfeb9c35a03, type: 3} + - {fileID: 3230252606085961013, guid: a271255ac112b8045a30dd35334880e3, type: 3} - {fileID: 5409629005393311441, guid: 1cb3e6e45ad6615448f1a968b89c84e8, type: 3} + - {fileID: 1004020196762887022, guid: 8964f299acba9cb4f860c55107b1d973, type: 3} + - {fileID: 4739689218961410417, guid: 73e61ff014ba7e04a86695d37f1eb8ce, type: 3} + - {fileID: 8654493186987980828, guid: 7b00a5e4fcb04994190ef797dfb61e95, type: 3} - {fileID: 7535207197812752309, guid: 263ed363454525d46aefa46b653b419d, type: 3} + - {fileID: 4547055273174472750, guid: 4979f41a1f79dc94682524b11303b49f, type: 3} - {fileID: 6744685881493449327, guid: e8d140a8b81d1a54babce1a327614447, type: 3} - {fileID: 3137079318612183360, guid: 1643126616a6c8846b968fd839416bfe, type: 3} - {fileID: 7455199422598815824, guid: b1f35b67c9e638443a850c78c0f87ac5, type: 3} - {fileID: 4298339421658607672, guid: e2e28eac2a915464284517bc9f1425b0, type: 3} + - {fileID: 7508320818388856469, guid: 48613b5baff23204f81934dfdf802387, type: 3} + - {fileID: 1258072268656374751, guid: a93608f23a604cc4896745809b221ec6, type: 3} + - {fileID: 1898899935370880003, guid: bbbaaefc9ddce094685b896db44b14bb, type: 3} + - {fileID: 8508011497630155766, guid: d0b32894e2e8bea4490edf159cb300d4, type: 3} - {fileID: 2367156134396898723, guid: 93e50ad2ae70b89479572eed104bd198, type: 3} - {fileID: 4737951027918891026, guid: b64ecf6f8c859304f963282fc7771d80, type: 3} + - {fileID: 758050341675869817, guid: 5245a1dc9755eec42adf1f51b0c52d08, type: 3} - {fileID: 4568794013455178372, guid: 40d74aa2e3764cf41b7562c2f9b35399, type: 3} - {fileID: 482914955127851241, guid: d16d48fd289401c44980d410c522b025, type: 3} - {fileID: 1004020196762887022, guid: f9e892cd18bc2de4cb277f7d3459b200, type: 3} + - {fileID: 7332445597516000773, guid: 8ef9f57cf557f2a43bff9ba38a049455, type: 3} + - {fileID: 3230252606085961013, guid: 81f80e448d5c4ed448291a9bacf175c1, type: 3} + - {fileID: 1844807267285195556, guid: cf63080a3060bb8409b45a47842d60e8, type: 3} + - {fileID: 6744685881493449327, guid: fb041e396551aa24fbb45dd641f772fd, type: 3} - {fileID: 7611295262132244940, guid: 85a2162510ed2a74cb6cd8c05187d28b, type: 3} - {fileID: 9043445715802431074, guid: 222e283b3616ff84f9094c92c14fce24, type: 3} + - {fileID: 5451622410603664855, guid: 809a86c29a3c0b44494abd9499db909a, type: 3} - {fileID: 2740904024514934886, guid: 83e773f9d0c689f45a54b8eaf5727aa5, type: 3} - {fileID: 8389547513526139286, guid: b92cdb88e09bf1d47bec31bddd62fe50, type: 3} - - {fileID: 5286231604687820132, guid: e6bc5808d58f0ba4fbe3d5674f60b526, type: 3} + - {fileID: 8389547513526139286, guid: 5f7486bb92c13f348bd565e80594b53f, type: 3} - {fileID: 752672217636848572, guid: 0d6eeddca319b1b4b90000c7ae2779b6, type: 3} - {fileID: 1405724118519419521, guid: 0ccefd8e90a52a847b38fb05414ed6de, type: 3} - - {fileID: 8771972552311404799, guid: bbf9e36a48d6c5648a13889afab076fd, type: 3} - - {fileID: 5642766282230003982, guid: b5c8ca7ed10b61e499cce8ec3b6e2e4c, type: 3} - - {fileID: 5112403345868107898, guid: 6f34ef0d986e9db4199cf75805f79753, type: 3} + - {fileID: 1004020196762887022, guid: fc35e02580dd35d4c8bdda810ecce44c, type: 3} + - {fileID: 5451622410603664855, guid: 5c72fbe97f88f9648af9c7732a00cbbe, type: 3} + - {fileID: 7681102451873883169, guid: 954fe53dfefd6834e901c7aabf4906ad, type: 3} + - {fileID: 3740678194898045934, guid: b347988a444ef2a4aabcc7394add4db2, type: 3} + - {fileID: 5286231604687820132, guid: e6bc5808d58f0ba4fbe3d5674f60b526, type: 3} + - {fileID: 3918030657813494487, guid: 7cc6413b4cb439e4f806ecb6b7ff8223, type: 3} + - {fileID: 4802261089321297624, guid: 4c8bfa1dbb78e2d45a4648b8750382c7, type: 3} + - {fileID: 1857032755411982495, guid: d1606185087224b44a592a9db3362529, type: 3} + - {fileID: 5241804620475976932, guid: bf1e3fcaca0fbe14ab9610edad000d10, type: 3} + - {fileID: 1709828810601626389, guid: c5c770c5cbf5f6641ae72ff2d8d33984, type: 3} + - {fileID: 4960561399765869754, guid: dea9ec2c951615d4497b8c6475a75292, type: 3} + - {fileID: 1119332781400613725, guid: 571331eb308897645819d0ac2d280aee, type: 3} + - {fileID: 1119332781400613725, guid: 46d61d44d12d89348838b0b443c836a0, type: 3} + - {fileID: 2278116590711127943, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + - {fileID: 5909578744954783082, guid: 4d5cd1124d0c47647899411ebcfe8b8a, type: 3} + - {fileID: 2024094060611992148, guid: fe4472aeb3f8bbe488e0acff2135e100, type: 3} + - {fileID: 7612433450915034965, guid: 3adea57b62703684ba053f85a3e874df, type: 3} + - {fileID: 4291276754621478353, guid: ee896970b81a31145bf11df223d0884c, type: 3} + - {fileID: 4139126637208696245, guid: fcb24746f9d91e74589b5326486c15ab, type: 3} + - {fileID: 552434039695226610, guid: fb5a487663bff2847825c24f3d8d1922, type: 3} + - {fileID: 8326105597207312843, guid: 4449a7a312bc04043a1d86bc9df6689f, type: 3} + - {fileID: 8326105597207312843, guid: ea00ae0f757f414478600bb529afe75f, type: 3} + - {fileID: 1040714684719195968, guid: 5e02787002b78154db83a830e460a4a9, type: 3} + - {fileID: 2931298436804964717, guid: 56f35432b57c5e244a26afc9adfc98b6, type: 3} + - {fileID: 5413660362937667468, guid: 55ce24071777a5b429f53775f21b20fe, type: 3} + - {fileID: 6165904497061590054, guid: 6db54345d338aec4c8675e06aba004ee, type: 3} + - {fileID: 2199800881156874266, guid: 8e96f59f29c3e8442867dacd617e70ef, type: 3} + - {fileID: 1774113698235428549, guid: f74378889c8fe164791cad5955c21087, type: 3} + - {fileID: 2374462924831859583, guid: 7ae408e39ee037540820907a6d7cff45, type: 3} + - {fileID: 3247173884719685732, guid: b4680987bc8bc994ba9ce6e1333dad18, type: 3} + - {fileID: 7187375229850072788, guid: 6067f5d34154eb3498e9a5fdfcee4b00, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1