diff --git a/Assets/Prefabs/Characters/Player.prefab b/Assets/Prefabs/Characters/Player.prefab index 949ccfa..14dda20 100644 --- a/Assets/Prefabs/Characters/Player.prefab +++ b/Assets/Prefabs/Characters/Player.prefab @@ -181,6 +181,7 @@ Transform: - {fileID: 6866785369235333201} - {fileID: 4587633499964583152} - {fileID: 5339671386185366077} + - {fileID: 2232351024226081505} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1496229637230917705 @@ -247,9 +248,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7445bbf6e7dae43f5b79872980c8e394, type: 3} m_Name: m_EditorClassIdentifier: - _dartPrefab: {fileID: -1238747304094502698, guid: f4b2f15faddfa43ee9ea450e341989a3, type: 3} - _ravenPrefab: {fileID: 1783361906523289645, guid: 73dffc90c37874381bd50b09415a2c82, type: 3} - _starfishPrefab: {fileID: 4760811041620966471, guid: 33fd1a5d339ac4354ba91c77597adb88, type: 3} + WeaponManager: {fileID: 0} _schnitzelPrefab: {fileID: 8194018987037890526, guid: af50a2a7f0c834ebf90a6f2724b0f298, type: 3} _hitPoints: 100 _maxHitPoints: 100 @@ -700,6 +699,53 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &7554083245618661203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2232351024226081505} + - component: {fileID: 1700775371577408911} + m_Layer: 7 + m_Name: WeaponManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2232351024226081505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7554083245618661203} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 71829853537045655} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1700775371577408911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7554083245618661203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91bd7a4cb211b4c32bfc08d33b3d4ccf, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalDamageModifier: 1 + GlobalCooldownModifier: 1 + GlobalCountModifier: 1 --- !u!1 &7619805629008050898 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Weapons/Dart.prefab b/Assets/Prefabs/Weapons/Dart.prefab index e604924..9ce61aa 100644 --- a/Assets/Prefabs/Weapons/Dart.prefab +++ b/Assets/Prefabs/Weapons/Dart.prefab @@ -45,10 +45,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isEnabled: 0 - _startingCooldown: 1.8 - _baseDamage: 10 + BaseCooldown: 1.8 + BaseDamage: 10 _speed: 10 - _rearFiringDartCount: 0 + RearFiringDartCount: 0 _spawnDistanceOutsidePlayer: 1.25 _shootingInterval: 0.4 _areaOfEffectRadius: 0.25 diff --git a/Assets/Prefabs/Weapons/Raven.prefab b/Assets/Prefabs/Weapons/Raven.prefab index e60de53..4efd85d 100644 --- a/Assets/Prefabs/Weapons/Raven.prefab +++ b/Assets/Prefabs/Weapons/Raven.prefab @@ -45,9 +45,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isEnabled: 0 - _startingCooldown: 6 - _baseDamage: 15 + BaseCooldown: 4 + BaseDamage: 15 _speed: 12 - _areaOfEffectRadius: 1 + AreaOfEffectRadius: 1 _spawnDistanceOutsidePlayer: 1.25 + _detectRadius: 12 _ravenProjectilePrefab: {fileID: 1783361906523289645, guid: 73dffc90c37874381bd50b09415a2c82, type: 3} diff --git a/Assets/Prefabs/Weapons/Schnitzel.prefab b/Assets/Prefabs/Weapons/Schnitzel.prefab index c7cd02f..f182d53 100644 --- a/Assets/Prefabs/Weapons/Schnitzel.prefab +++ b/Assets/Prefabs/Weapons/Schnitzel.prefab @@ -45,10 +45,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isEnabled: 0 - _startingCooldown: 2.9 - _baseDamage: 8 + BaseCooldown: 2.8 + BaseDamage: 8 _speed: 5 _spawnDistanceOutsidePlayer: 1.25 _shootingInterval: 0.25 - _scale: 1 + Scale: 1 _schnitzelProjectilePrefab: {fileID: 8194018987037890526, guid: af50a2a7f0c834ebf90a6f2724b0f298, type: 3} diff --git a/Assets/Prefabs/Weapons/Starfish.prefab b/Assets/Prefabs/Weapons/Starfish.prefab index 9240c8b..7861903 100644 --- a/Assets/Prefabs/Weapons/Starfish.prefab +++ b/Assets/Prefabs/Weapons/Starfish.prefab @@ -45,7 +45,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isEnabled: 0 - _startingCooldown: 5 - _baseDamage: 8 + BaseCooldown: 5 + BaseDamage: 8 _duration: 5 _starfishProjectilePrefab: {fileID: 4760811041620966471, guid: 33fd1a5d339ac4354ba91c77597adb88, type: 3} diff --git a/Assets/Scenes/BattleScene.unity b/Assets/Scenes/BattleScene.unity index 2743cff..1d97a14 100644 --- a/Assets/Scenes/BattleScene.unity +++ b/Assets/Scenes/BattleScene.unity @@ -168,6 +168,61 @@ Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} m_PrefabInstance: {fileID: 5667370415085673742} m_PrefabAsset: {fileID: 0} +--- !u!1 &130893740 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 130893741} + - component: {fileID: 130893742} + m_Layer: 0 + m_Name: RavenUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &130893741 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130893740} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &130893742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 130893740} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a5fe70a105da479ab5c9a1df694ecaf, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: -41011132, guid: 2d1db680ea22a4dd78b6c2918a56aa0e, type: 3} + _title: Raven + _descriptions: + - heat-seeking bomb targets closest enemy + - +33% damage and +20% cooldown! + - +60% area of effect + _weaponPrefab: {fileID: 2205568597176363839, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} + _lvl2DamageMod: 1.33 + _lvl2CooldownMod: 0.8 + _lvl3AreaOfEffectRadiusMod: 1.6 --- !u!1 &170557571 GameObject: m_ObjectHideFlags: 0 @@ -294,6 +349,57 @@ Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: ba9a3fb92cb4b4e8eb4baf75754235a3, type: 3} m_PrefabInstance: {fileID: 1635123374} m_PrefabAsset: {fileID: 0} +--- !u!1 &185777652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 185777653} + - component: {fileID: 185777654} + m_Layer: 0 + m_Name: CooldownUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &185777653 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185777652} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &185777654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 185777652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c98aadd575a3415d91c117258b2d6db, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: 21300000, guid: 8094df7779b004b43b7cc37ee399539b, type: 3} + _title: Cooldown++ + _descriptions: + - -20% cooldown time + - -25% cooldown time + - -50% cooldown time! --- !u!1001 &229857960 PrefabInstance: m_ObjectHideFlags: 0 @@ -805,6 +911,57 @@ Transform: m_CorrespondingSourceObject: {fileID: 5054089494736014737, guid: a52115208a32b485e8a9cf76bda0d02b, type: 3} m_PrefabInstance: {fileID: 1939657792} m_PrefabAsset: {fileID: 0} +--- !u!1 &441343833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 441343834} + - component: {fileID: 441343835} + m_Layer: 0 + m_Name: UpgradeManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &441343834 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441343833} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 784979737} + - {fileID: 1101724734} + - {fileID: 185777653} + - {fileID: 1836248121} + - {fileID: 130893741} + - {fileID: 1721536220} + - {fileID: 1271167823} + m_Father: {fileID: 996256050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &441343835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 441343833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cec38740fd6474f2491077f908d65e1d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &449849008 PrefabInstance: m_ObjectHideFlags: 0 @@ -7567,76 +7724,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce6ca319e4496403782aea5ae869c333, type: 3} +--- !u!1 &784979736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 784979737} + - component: {fileID: 784979738} + m_Layer: 0 + m_Name: ProjectileCountUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &784979737 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784979736} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &784979738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 784979736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9488effa5e03442da4c196d16afdc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: 21300000, guid: d5250e5db3ce642448c7a5c9ffa33af9, type: 3} + _title: Count++ + _descriptions: + - +1 of each projectile + - +1 of each projectile + - +2 of each projectile! + _countModifiersPerLevel: 020000000300000005000000 --- !u!4 &806077992 stripped Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: b5ed0a0f1681f414cb7f4e96615eff9e, type: 3} m_PrefabInstance: {fileID: 449849008} m_PrefabAsset: {fileID: 0} ---- !u!1001 &809693221 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1882345548} - m_Modifications: - - target: {fileID: -2724762005279238218, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: _isEnabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -2724762005279238218, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: _schnitzelProjectilePrefab - value: - objectReference: {fileID: 8194018987037890526, guid: af50a2a7f0c834ebf90a6f2724b0f298, type: 3} - - target: {fileID: 3476222383509152590, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_Name - value: Schnitzel - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} --- !u!1001 &854700013 PrefabInstance: m_ObjectHideFlags: 0 @@ -7962,6 +8106,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955496693} m_CullTransparentMesh: 1 +--- !u!1 &996256049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 996256050} + m_Layer: 0 + m_Name: Managers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &996256050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996256049} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.1822462, y: 5.4911523, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1361049654} + - {fileID: 1872998138} + - {fileID: 1686016597} + - {fileID: 441343834} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1101724733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101724734} + - component: {fileID: 1101724735} + m_Layer: 0 + m_Name: DamageUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1101724734 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101724733} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1101724735 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101724733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3728804885a26419889b13663b87eaa8, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: 21300000, guid: a45e39616891d4a509f1da3f2d7d42aa, type: 3} + _title: Damage++ + _descriptions: + - +30% damage + - +25% damage + - +25% damage + _damageModifiersPerLevel: + - 1.3 + - 1.25 + - 1.25 --- !u!4 &1102877439 stripped Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: 4ab86a383f1ae471d98843b26bdc03cb, type: 3} @@ -8176,22 +8410,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1116665113} m_CullTransparentMesh: 1 ---- !u!4 &1147372094 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - m_PrefabInstance: {fileID: 2106700609} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1147372095 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5358019133310574137, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - m_PrefabInstance: {fileID: 2106700609} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa634c4596c7c42a08aaedd43d7be1d3, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1213143403 GameObject: m_ObjectHideFlags: 0 @@ -8282,6 +8500,60 @@ Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} m_PrefabInstance: {fileID: 366499900} m_PrefabAsset: {fileID: 0} +--- !u!1 &1271167822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1271167823} + - component: {fileID: 1271167824} + m_Layer: 0 + m_Name: StarfishUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1271167823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271167822} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1271167824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271167822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6cefa1fc849046b7b16b19f2897a61b, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: 900386594, guid: f973a0cae040d40648faf1d1eab27ad7, type: 3} + _title: Starfish + _descriptions: + - orbits around you, wreaking havoc + - +20% orbit duration + - +50% orbit duration and -30% cooldown! + _weaponPrefab: {fileID: 5358019133310574137, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} + _lvl2DurationMod: 1.2 + _lvl3DurationMod: 1.5 --- !u!4 &1306705493 stripped Transform: m_CorrespondingSourceObject: {fileID: 3600334310735166755, guid: ce6ca319e4496403782aea5ae869c333, type: 3} @@ -8430,12 +8702,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1361049652} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.88758165, y: -0.30522346, z: 0.045927454} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.0698278, y: -5.7963758, z: 0.045927454} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 996256050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1379408347 GameObject: @@ -29868,95 +30140,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1608051141} m_CullTransparentMesh: 1 ---- !u!1001 &1608604477 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1882345548} - m_Modifications: - - target: {fileID: 3476222383509152590, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_Name - value: Dart - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} ---- !u!4 &1608604478 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4894158285875328385, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - m_PrefabInstance: {fileID: 1608604477} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1608604479 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -801427770401400621, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} - m_PrefabInstance: {fileID: 1608604477} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c84f4f9395044e90875a442a439c87a, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1634516006 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4894158285875328385, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - m_PrefabInstance: {fileID: 809693221} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1634516007 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -2724762005279238218, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} - m_PrefabInstance: {fileID: 809693221} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d279d45005cbf471da3528a6f4e2e03b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1635123374 PrefabInstance: m_ObjectHideFlags: 0 @@ -30065,12 +30248,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1686016595} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.249746, y: -2.8290596, z: -6.6141644} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.431992, y: -8.320211, z: -6.6141644} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 996256050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1686016598 AudioSource: @@ -30390,6 +30573,60 @@ Transform: - {fileID: 527090877} m_Father: {fileID: 1577739326} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1721536219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1721536220} + - component: {fileID: 1721536221} + m_Layer: 0 + m_Name: DartUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1721536220 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721536219} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1721536221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1721536219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a33deb6891a248fdbf845d2c09bf87f, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: 21300000, guid: 7065380beeb504112b67e70f625d51e3, type: 3} + _title: Dart + _descriptions: + - fires in a straight line + - +1 dart firing backwards + - +50% damage + _weaponPrefab: {fileID: -801427770401400621, guid: dccb7313a4fb0404992368741d48aeb0, type: 3} + _lvl2RearFiringDartCount: 1 + _lvl3DamageMod: 1.6 --- !u!1 &1730555519 GameObject: m_ObjectHideFlags: 0 @@ -30763,91 +31000,6 @@ Transform: - {fileID: 806077992} m_Father: {fileID: 1577739326} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1789346430 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1882345548} - m_Modifications: - - target: {fileID: 2205568597176363839, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: _isEnabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2205568597176363839, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: _ravenPrefab - value: - objectReference: {fileID: 1783361906523289645, guid: 73dffc90c37874381bd50b09415a2c82, type: 3} - - target: {fileID: 2205568597176363839, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: _ravenProjectilePrefab - value: - objectReference: {fileID: 1783361906523289645, guid: 73dffc90c37874381bd50b09415a2c82, type: 3} - - target: {fileID: 3476222383509152590, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_Name - value: Raven - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} ---- !u!4 &1789346431 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4894158285875328385, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - m_PrefabInstance: {fileID: 1789346430} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1789346432 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2205568597176363839, guid: 4c3545b2234564ab382559e5e2db585c, type: 3} - m_PrefabInstance: {fileID: 1789346430} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 09b14723eded74f51aa81dacbdbbb280, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1794298694 GameObject: m_ObjectHideFlags: 0 @@ -30900,6 +31052,60 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} +--- !u!1 &1836248120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1836248121} + - component: {fileID: 1836248122} + m_Layer: 0 + m_Name: SchnitzelUpgradePath + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1836248121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836248120} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 441343834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1836248122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836248120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4b581e32dca44837b775e26609bb852, type: 3} + m_Name: + m_EditorClassIdentifier: + _level: 0 + _icon: {fileID: 21300000, guid: acf14ff16f87c4b4db7ad79a39aab264, type: 3} + _title: Schnitzel + _descriptions: + - it's like an axe + - +40% area of effect + - +30% area of effect + _weaponPrefab: {fileID: -2724762005279238218, guid: f29d7771c50b64b0f9a0a54f2a12292a, type: 3} + _lvl2Scale: 1.4 + _lvl3Scale: 1.3 --- !u!1 &1838798710 GameObject: m_ObjectHideFlags: 0 @@ -31071,64 +31277,24 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1872998136} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 17.373299, y: -0.0069208145, z: 10.2654} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 16.191051, y: -5.498073, z: 10.2654} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1882345547 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1882345548} - - component: {fileID: 1882345549} - m_Layer: 7 - m_Name: WeaponManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1882345548 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1882345547} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1608604478} - - {fileID: 1789346431} - - {fileID: 1147372094} - - {fileID: 1634516006} - m_Father: {fileID: 702887974} + m_Father: {fileID: 996256050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1882345549 +--- !u!114 &1882345549 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1700775371577408911, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} + m_PrefabInstance: {fileID: 4086352640654554052} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1882345547} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 91bd7a4cb211b4c32bfc08d33b3d4ccf, type: 3} m_Name: m_EditorClassIdentifier: - BaseDamage: 10 - BaseCooldownPercentage: 1 - BaseCount: 1 --- !u!1 &1932945646 GameObject: m_ObjectHideFlags: 0 @@ -31626,63 +31792,6 @@ Transform: - {fileID: 415351602} m_Father: {fileID: 1577739326} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2106700609 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1882345548} - m_Modifications: - - target: {fileID: 3476222383509152590, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_Name - value: Starfish - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4894158285875328385, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b2fbcc052753c4374a4beea0c77b6ebb, type: 3} --- !u!1 &2111087225 GameObject: m_ObjectHideFlags: 0 @@ -33269,19 +33378,19 @@ PrefabInstance: - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _dart value: - objectReference: {fileID: 1608604479} + objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _raven value: - objectReference: {fileID: 1789346432} + objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _starfish value: - objectReference: {fileID: 1147372095} + objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: _schnitzel value: - objectReference: {fileID: 1634516007} + objectReference: {fileID: 0} - target: {fileID: 292671231893397069, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} propertyPath: WeaponManager value: @@ -33316,10 +33425,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 71829853537045655, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} - insertIndex: -1 - addedObject: {fileID: 1882345548} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e9a239886cdc4f36bd47c7e2ce1f506, type: 3} --- !u!224 &4107652790464639195 @@ -33787,13 +33893,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48b3dd2a3ab2a477faae51ce48d9c4bb, type: 3} m_Name: m_EditorClassIdentifier: - _countSprite: {fileID: 21300000, guid: d5250e5db3ce642448c7a5c9ffa33af9, type: 3} - _speedSprite: {fileID: 21300000, guid: 8094df7779b004b43b7cc37ee399539b, type: 3} - _damageSprite: {fileID: 21300000, guid: 4af40a0e588594a3c9e45068423eb312, type: 3} - _dartSprite: {fileID: 21300000, guid: 7065380beeb504112b67e70f625d51e3, type: 3} - _ravenSprite: {fileID: -41011132, guid: 2d1db680ea22a4dd78b6c2918a56aa0e, type: 3} - _starfishSprite: {fileID: 900386594, guid: f973a0cae040d40648faf1d1eab27ad7, type: 3} - _schnitzelSprite: {fileID: 21300000, guid: acf14ff16f87c4b4db7ad79a39aab264, type: 3} --- !u!224 &6445608978296428708 RectTransform: m_ObjectHideFlags: 0 @@ -33830,13 +33929,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48b3dd2a3ab2a477faae51ce48d9c4bb, type: 3} m_Name: m_EditorClassIdentifier: - _countSprite: {fileID: 21300000, guid: d5250e5db3ce642448c7a5c9ffa33af9, type: 3} - _speedSprite: {fileID: 21300000, guid: 8094df7779b004b43b7cc37ee399539b, type: 3} - _damageSprite: {fileID: 21300000, guid: 4af40a0e588594a3c9e45068423eb312, type: 3} - _dartSprite: {fileID: 21300000, guid: 7065380beeb504112b67e70f625d51e3, type: 3} - _ravenSprite: {fileID: -41011132, guid: 2d1db680ea22a4dd78b6c2918a56aa0e, type: 3} - _starfishSprite: {fileID: 900386594, guid: f973a0cae040d40648faf1d1eab27ad7, type: 3} - _schnitzelSprite: {fileID: 21300000, guid: acf14ff16f87c4b4db7ad79a39aab264, type: 3} --- !u!224 &6699254774424834910 RectTransform: m_ObjectHideFlags: 0 @@ -34479,7 +34571,5 @@ SceneRoots: - {fileID: 4008146429019665031} - {fileID: 715298358} - {fileID: 619394802} - - {fileID: 1361049654} - {fileID: 2022277337} - - {fileID: 1872998138} - - {fileID: 1686016597} + - {fileID: 996256050} diff --git a/Assets/Scripts/Characters/Player.cs b/Assets/Scripts/Characters/Player.cs index 5136f80..a283f95 100644 --- a/Assets/Scripts/Characters/Player.cs +++ b/Assets/Scripts/Characters/Player.cs @@ -1,9 +1,5 @@ using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using Unity.Collections; -using Unity.VisualScripting; using UnityEngine; public class Player : MonoBehaviour diff --git a/Assets/Scripts/SceneManagers/BattleSceneManager.cs b/Assets/Scripts/SceneManagers/BattleSceneManager.cs index 5be113e..e916eaf 100644 --- a/Assets/Scripts/SceneManagers/BattleSceneManager.cs +++ b/Assets/Scripts/SceneManagers/BattleSceneManager.cs @@ -130,8 +130,7 @@ public class BattleSceneManager : MonoBehaviour 25800, 31350, 38000, // level 20 - 46000, - 55600, // level 22 (max) + 46000, // level 21 (max) }; // for testing: {50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600, 650, 700, 750, 800, 850, 900}; private int _nextLevelXpMilestone; @@ -223,8 +222,6 @@ void Start() SetCurrentLevel(_currentLevel); - LevelUpUI.Reset(); - EventManager.AddListener( "EnemyDestroyed", (eventData) => @@ -269,14 +266,6 @@ void Start() OnQuit(); } ); - - EventManager.AddListener( - "UpgradeChosen", - (eventData) => - { - OnUpgradeChosen((UpgradeEventData)eventData.Data); - } - ); } private void OnPickupGrabbed(List eventData) @@ -771,38 +760,4 @@ private void SpawnPickup() pickup.transform.position = GetRandomSpawnPoint(); _pickupsOnScreen++; } - - private void OnUpgradeChosen(UpgradeEventData upgradeEvent) - { - var newLevel = upgradeEvent.Level; - - var weaponManager = Player.Instance.WeaponManager; - - switch (upgradeEvent.UpgradeType) - { - case UpgradeType.CountUp: - weaponManager.UpgradeCount(newLevel); - break; - case UpgradeType.CooldownDown: - weaponManager.UpgradeCooldown(newLevel); - break; - case UpgradeType.DamageUp: - weaponManager.UpgradeDamage(newLevel); - break; - case UpgradeType.Dart: - GameObject.Find("Dart").GetComponent().Upgrade(newLevel); - break; - case UpgradeType.Raven: - GameObject.Find("Raven").GetComponent().Upgrade(newLevel); - break; - case UpgradeType.Starfish: - GameObject.Find("Starfish").GetComponent().Upgrade(newLevel); - break; - case UpgradeType.Schnitzel: - GameObject.Find("Schnitzel").GetComponent().Upgrade(newLevel); - break; - default: - break; - } - } } diff --git a/Assets/Scripts/Upgrades/LevelOption.cs b/Assets/Scripts/Upgrades/LevelOption.cs deleted file mode 100644 index a6d7ba6..0000000 --- a/Assets/Scripts/Upgrades/LevelOption.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public class LevelOption : MonoBehaviour -{ - [SerializeField] - [Tooltip("Sprite for the count++ upgrade")] - private Sprite _countSprite; - - [SerializeField] - [Tooltip("Sprite for the speed++ upgrade")] - private Sprite _speedSprite; - - [SerializeField] - [Tooltip("Sprite for the damage++ upgrade")] - private Sprite _damageSprite; - - [SerializeField] - [Tooltip("Sprite for the dart upgrade")] - private Sprite _dartSprite; - - [SerializeField] - [Tooltip("Sprite for the raven upgrade")] - private Sprite _ravenSprite; - - [SerializeField] - [Tooltip("Sprite for the starfish upgrade")] - private Sprite _starfishSprite; - - [SerializeField] - [Tooltip("Sprite for the schnitzel upgrade")] - private Sprite _schnitzelSprite; - - private TextMeshProUGUI _title; - private TextMeshProUGUI _description; - private TextMeshProUGUI _stats; - private Image _icon; - - void Awake() - { - _title = transform.Find("Title").GetComponent(); - _description = transform.Find("Description").GetComponent(); - _stats = transform.Find("Stats").GetComponent(); - _icon = transform.Find("Border/Icon").GetComponent(); - } - - public void SetMaxedOut() - { - _title.text = "ALL OTHER UPGRADES MAXED OUT"; - _description.text = ""; - _stats.text = ""; - } - - // fyi: title -> upgrade name, description -> level, stats -> description - public void Set(UpgradeType upgradeType, string description, string stats) - { - _description.text = description; - _stats.text = stats; - - switch (upgradeType) - { - case UpgradeType.CountUp: - _title.text = "count++"; - _icon.sprite = _countSprite; - break; - case UpgradeType.CooldownDown: - _title.text = "cooldown++"; // should be minus minus? - _icon.sprite = _speedSprite; - break; - case UpgradeType.DamageUp: - _title.text = "damage++"; - _icon.sprite = _damageSprite; - break; - case UpgradeType.Dart: - _title.text = "dart"; - _icon.sprite = _dartSprite; - break; - case UpgradeType.Raven: - _title.text = "raven"; - _icon.sprite = _ravenSprite; - break; - case UpgradeType.Starfish: - _title.text = "starfish"; - _icon.sprite = _starfishSprite; - break; - case UpgradeType.Schnitzel: - _title.text = "schnitzel"; - _icon.sprite = _schnitzelSprite; - break; - default: - break; - } - } -} diff --git a/Assets/Scripts/Upgrades/LevelOptionUI.cs b/Assets/Scripts/Upgrades/LevelOptionUI.cs new file mode 100644 index 0000000..6cda4d6 --- /dev/null +++ b/Assets/Scripts/Upgrades/LevelOptionUI.cs @@ -0,0 +1,35 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class LevelOptionUI : MonoBehaviour +{ + private TextMeshProUGUI _title; + private TextMeshProUGUI _description; + private TextMeshProUGUI _stats; + private Image _icon; + + void Awake() + { + _title = transform.Find("Title").GetComponent(); + _description = transform.Find("Description").GetComponent(); + _stats = transform.Find("Stats").GetComponent(); + _icon = transform.Find("Border/Icon").GetComponent(); + } + + public void SetMaxedOut() + { + _title.text = "ALL OTHER UPGRADES MAXED OUT"; + _description.text = ""; + _stats.text = ""; + } + + // fyi: title -> upgrade name, description -> level, stats -> description + public void Set(string title, string description, string stats, Sprite icon) + { + _title.text = title; + _description.text = description; + _stats.text = stats; + _icon.sprite = icon; + } +} diff --git a/Assets/Scripts/Upgrades/LevelOption.cs.meta b/Assets/Scripts/Upgrades/LevelOptionUI.cs.meta similarity index 100% rename from Assets/Scripts/Upgrades/LevelOption.cs.meta rename to Assets/Scripts/Upgrades/LevelOptionUI.cs.meta diff --git a/Assets/Scripts/Upgrades/LevelUpUI.cs b/Assets/Scripts/Upgrades/LevelUpUI.cs index a1f2541..c15fe16 100644 --- a/Assets/Scripts/Upgrades/LevelUpUI.cs +++ b/Assets/Scripts/Upgrades/LevelUpUI.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using Sentry; using UnityEngine; using UnityEngine.UI; -using Random = UnityEngine.Random; /** * Encapsulates behavior of LevelUpUI prefab @@ -13,114 +9,15 @@ public class LevelUpUI : MonoBehaviour // fyi: title -> upgrade name, description -> level, stats -> description // leveling up an upgrade, changes the stats to new level, increases the level # - private static List _availableUpgradeTypes; - - private static Dictionary _upgradeData; - - private int MAX_LEVEL = 3; - [SerializeField] - private LevelOption _levelOption1; + private LevelOptionUI _levelOption1; [SerializeField] - private LevelOption _levelOption2; + private LevelOptionUI _levelOption2; private Button _option1Button; private Button _option2Button; - // this is in GameManager.cs, but idk how to access it from here - // [SerializeField] - // [Tooltip("The parent UI element containing the active upgrades")] - // private GameObject _activeUpgradesContainer; - - public static void Reset() - { - _availableUpgradeTypes = new List - { - UpgradeType.CountUp, - UpgradeType.CooldownDown, - UpgradeType.DamageUp, - UpgradeType.Dart, - UpgradeType.Raven, - UpgradeType.Starfish, - UpgradeType.Schnitzel - }; - - _upgradeData = new Dictionary - { - { - UpgradeType.CountUp, - new UpgradePath( - new List - { - "+1 of each projectile", - "+1 of each projectile", - "+2 of each projectile!" - } - ) - }, - { - UpgradeType.CooldownDown, - new UpgradePath( - new List - { - "-20% cooldown time", - "-25% cooldown time", - "-50% cooldown time!" - } - ) - }, - { - UpgradeType.DamageUp, - new UpgradePath(new List { "+30% damage", "+60% damage", "+100% damage!" }) - }, - { - UpgradeType.Dart, - new UpgradePath( - new List - { - "+1 dart that fires behind you", - "+50% damage", - "+2 dart firing behind and +33% damage!" - } - ) - }, - { - UpgradeType.Raven, - new UpgradePath( - new List - { - "heat-seeking bomb targets closest enemy", - "+33% damage and +20% cooldown!", - "+60% area of effect" - } - ) - }, - { - UpgradeType.Starfish, - new UpgradePath( - new List - { - "orbits around you, wreaking havoc", - "+20% orbit duration", - "+50% orbit duration and -30% cooldown!" - } - ) - }, - { - UpgradeType.Schnitzel, - new UpgradePath( - new List - { - "its like an axe", - "+40% area of effect", - "+30% area of effect" - } - ) - } - }; - } - void Awake() { _option1Button = _levelOption1.GetComponent