Updated content overall rewards

2024-12-31 16:29:46 +00:00 · 2024-12-31 16:29:46 +00:00 · 79b50a93e3
commit 79b50a93e3
parent eadceec7ea
23 changed files with 415 additions and 91 deletions
--- a/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab
+++ b/Assets/Resources/Bosses/BossEnemyPrefabTemplate.prefab
@ -336,6 +336,7 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  photonView: {fileID: 0}
+  invulnerable: 0
  OnInvulnerabilityStateChanged:
    m_PersistentCalls:
      m_Calls: []
@ -1241,11 +1242,11 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 320740188261888096, guid: b6c7760f01532fc4a96882ae1816ae05, type: 3}
      propertyPath: coinAmount
-      value: 5
+      value: 150
      objectReference: {fileID: 0}
    - target: {fileID: 320740188261888096, guid: b6c7760f01532fc4a96882ae1816ae05, type: 3}
      propertyPath: extraDropChance
-      value: 8
+      value: 9
      objectReference: {fileID: 0}
    - target: {fileID: 320740188261888096, guid: b6c7760f01532fc4a96882ae1816ae05, type: 3}
      propertyPath: extraDrops.Array.size
--- a/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab
+++ b/Assets/Resources/Enemies/BasicEnemyPrefabTemplate.prefab
@ -428,6 +428,7 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  photonView: {fileID: 0}
+  invulnerable: 0
  OnInvulnerabilityStateChanged:
    m_PersistentCalls:
      m_Calls: []
@ -5885,7 +5886,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  interactableDropPrefab: {fileID: 7187375229850072788, guid: 6067f5d34154eb3498e9a5fdfcee4b00, type: 3}
  coinPrefab: {fileID: 7706952695029526538, guid: b0bce3e9bc0755445abb649e0c306c79, type: 3}
-  coinAmount: 2
+  coinAmount: 12
  extraDropChance: 5
  onCoinDrop: {fileID: 11400000, guid: 48da3b1185c086c4c81a2b97ab7685fc, type: 2}
  guaranteedItemDrop: []
--- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Naturalist
+++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Naturalist
@ -47,6 +47,34 @@ PrefabInstance:
      propertyPath: abilityPriorityList.Array.data[0].castConditions.Array.data[3].conditionType
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1500358051}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnFish
+      objectReference: {fileID: 0}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: CharacterAnimatorController, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
    - target: {fileID: 4847227750113470832, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
      propertyPath: ability
      value: 
@ -95,6 +123,14 @@ PrefabInstance:
      propertyPath: classTag
      value: 
      objectReference: {fileID: 11400000, guid: 334f27400a4a01e4caceed2c6b63bee9, type: 2}
+    - target: {fileID: 8268627081631403086, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: weapons.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8268627081631403086, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
+      propertyPath: weapons.Array.data[0]
+      value: 
+      objectReference: {fileID: 1362499111226863775}
    - target: {fileID: 8273564744905798527, guid: 9c432d220280f704684a6d5b9354c782, type: 3}
      propertyPath: Spirit.BaseValue
      value: 4
@ -253,6 +289,17 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: af5fddb774a0f724c92b801e22ea7965, type: 3}
+--- !u!114 &1500358051 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3288727660570033578, guid: af5fddb774a0f724c92b801e22ea7965, type: 3}
+  m_PrefabInstance: {fileID: 3288727662027773961}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 75ba268000bc14f4287a8a1f8c3dabd6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &1500358052 stripped
 MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 3288727660570033581, guid: af5fddb774a0f724c92b801e22ea7965, type: 3}
@ -264,3 +311,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9b8c4a61274f60b4ea5fb4299cfdbf14, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &1362499111226863775 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4560873030512601238, guid: af5fddb774a0f724c92b801e22ea7965, type: 3}
+  m_PrefabInstance: {fileID: 3288727662027773961}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_01.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_01.asset
@ -30,9 +30,9 @@ MonoBehaviour:
  zoneName: Dayard
  levelName: 4-Dayard
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 200
+  baseCoinReward: 750
+  baseExperienceFinalReward: 1000
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_02.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_02.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: Dayard
  levelName: 4-Dayard
  isHostileZone: 1
-  baseCoinReward: 500
-  baseExperienceFinalReward: 200
+  baseCoinReward: 2250
+  baseExperienceFinalReward: 1000
  baseReputationFinalReward: 1
-  percentCoinReward: 0.75
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_03.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_03.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: Dayard
  levelName: 4-Dayard
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 200
-  baseReputationFinalReward: 5
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  baseCoinReward: 750
+  baseExperienceFinalReward: 1000
+  baseReputationFinalReward: 3
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_04.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Dayard/DaynvasionCleanupCrew_Template_04.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: Dayard
  levelName: 4-Dayard
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 1000
+  baseCoinReward: 750
+  baseExperienceFinalReward: 3000
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/MultiJobTemplate/MultiJob_Template_01.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/MultiJobTemplate/MultiJob_Template_01.asset
@ -18,9 +18,9 @@ MonoBehaviour:
  zoneName: 
  levelName: 
  isHostileZone: 0
-  baseCoinReward: 550
-  baseExperienceFinalReward: 1200
-  baseReputationFinalReward: 6
-  percentCoinReward: 0.75
-  percentExperienceFinalReward: 0.75
-  percentReputationFinalReward: 0.25
+  baseCoinReward: 2250
+  baseExperienceFinalReward: 5250
+  baseReputationFinalReward: 4
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_01.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_01.asset
@ -30,9 +30,9 @@ MonoBehaviour:
  zoneName: Skellyard
  levelName: 4-Skellyard
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 200
+  baseCoinReward: 600
+  baseExperienceFinalReward: 1250
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_02.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_02.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: Skellyard
  levelName: 4-Skellyard
  isHostileZone: 1
-  baseCoinReward: 250
-  baseExperienceFinalReward: 200
+  baseCoinReward: 2100
+  baseExperienceFinalReward: 1250
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_03.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_03.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: Skellyard
  levelName: 4-Skellyard
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 200
-  baseReputationFinalReward: 5
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  baseCoinReward: 600
+  baseExperienceFinalReward: 1250
+  baseReputationFinalReward: 3
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_04.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/Skellyard/SkellynvasionCleanupCrew_Template_04.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: Skellyard
  levelName: 4-Skellyard
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 1000
+  baseCoinReward: 600
+  baseExperienceFinalReward: 4250
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_01.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_01.asset
@ -29,9 +29,9 @@ MonoBehaviour:
  zoneName: VampsDen
  levelName: 4-VampsDen
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 200
+  baseCoinReward: 500
+  baseExperienceFinalReward: 2200
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_02.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_02.asset
@ -30,9 +30,9 @@ MonoBehaviour:
  zoneName: VampsDen
  levelName: 4-VampsDen
  isHostileZone: 1
-  baseCoinReward: 250
-  baseExperienceFinalReward: 200
+  baseCoinReward: 1500
+  baseExperienceFinalReward: 2200
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_03.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_03.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: VampsDen
  levelName: 4-VampsDen
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 200
-  baseReputationFinalReward: 5
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.5
-  percentReputationFinalReward: 0.2
+  baseCoinReward: 500
+  baseExperienceFinalReward: 2200
+  baseReputationFinalReward: 3
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_04.asset
+++ b/Assets/Scriptables/Data/2-Jobs/JobTemplates/VampsDen/VampsDenExploration_Template_04.asset
@ -31,9 +31,9 @@ MonoBehaviour:
  zoneName: VampsDen
  levelName: 4-VampsDen
  isHostileZone: 1
-  baseCoinReward: 50
-  baseExperienceFinalReward: 1500
+  baseCoinReward: 500
+  baseExperienceFinalReward: 5250
  baseReputationFinalReward: 1
-  percentCoinReward: 0.5
-  percentExperienceFinalReward: 0.75
-  percentReputationFinalReward: 0.2
+  percentCoinReward: 1.1
+  percentExperienceFinalReward: 1.1
+  percentReputationFinalReward: 0.5
--- a/Assets/Scriptables/Data/DifficultySettings/RiftRaiding.meta
+++ b/Assets/Scriptables/Data/DifficultySettings/RiftRaiding.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5d64d3f0476b4d74eb4b4cde5df7d87e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Game/GameConstants.cs
+++ b/Assets/Scripts/Game/GameConstants.cs
@ -145,7 +145,7 @@ public static class GameConstants
    }
    public static class GameBalancing
    {
-        public const float IncreasedCoinDropBasedOnDifficultyMultiplier = 1.1f;
+        public const float IncreasedCoinDropBasedOnDifficultyMultiplier = 2.38f;
        public const float IncreasedItemDropBasedOnDifficultyMultiplier = 1f;

        public const float MinimumFindFishWaitTime = 2.5f;
--- a/Assets/Scripts/RiftSystem/RiftRaiding.meta
+++ b/Assets/Scripts/RiftSystem/RiftRaiding.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58f95e5f2d0f4ed4f8eb1c5b8d7482e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidLevelSettings.cs
+++ b/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidLevelSettings.cs
@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using static GameConstants.EnemySpawning;
+
+[System.Serializable]
+public class RiftRaidLevelSettings
+{
+    public List<EnemyID> possibleEnemies = new List<EnemyID>();
+    public List<Transform> spawnPoints = new List<Transform>();
+    public Transform playerBaseSpawnPoint;
+}
--- a/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidLevelSettings.cs.meta
+++ b/Assets/Scripts/RiftSystem/RiftRaiding/RiftRaidLevelSettings.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e0168c0da811e1b42926c4e1c461d5f0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Skybox/Skybox.mat
+++ b/Skybox/Skybox.mat
@ -94,7 +94,7 @@ Material:
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
-    - _Rotation: 6.2489886
+    - _Rotation: 6.9323797
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans