my HEAD hurts and the SFX is TOO LOUD
This commit is contained in:
parent
a3321d361c
commit
d4ebf0ca61
41 changed files with 1465 additions and 123 deletions
8
Assets/Audio/SFX.meta
Normal file
8
Assets/Audio/SFX.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 493b69db5c1f799dca5e5741de06b37c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Audio/SFX/Abilities.meta
Normal file
8
Assets/Audio/SFX/Abilities.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d81693fc678b649a7b277a21684478e0
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Audio/SFX/Abilities/MasterSparkCharge.mp3
Normal file
BIN
Assets/Audio/SFX/Abilities/MasterSparkCharge.mp3
Normal file
Binary file not shown.
23
Assets/Audio/SFX/Abilities/MasterSparkCharge.mp3.meta
Normal file
23
Assets/Audio/SFX/Abilities/MasterSparkCharge.mp3.meta
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2d976ba0af5ffa6929b10bfb6dbd72b8
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Audio/SFX/Abilities/MasterSparkFire.mp3
Normal file
BIN
Assets/Audio/SFX/Abilities/MasterSparkFire.mp3
Normal file
Binary file not shown.
23
Assets/Audio/SFX/Abilities/MasterSparkFire.mp3.meta
Normal file
23
Assets/Audio/SFX/Abilities/MasterSparkFire.mp3.meta
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 98b56e23a087f0bd2b68e54e40802115
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Audio/SFX/Abilities/PlaceholderMagicMissile.wav
Normal file
BIN
Assets/Audio/SFX/Abilities/PlaceholderMagicMissile.wav
Normal file
Binary file not shown.
23
Assets/Audio/SFX/Abilities/PlaceholderMagicMissile.wav.meta
Normal file
23
Assets/Audio/SFX/Abilities/PlaceholderMagicMissile.wav.meta
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 84f1208168bd8e751890fe269b802fde
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Audio/SFX/Abilities/placeholderStardust.wav
Normal file
BIN
Assets/Audio/SFX/Abilities/placeholderStardust.wav
Normal file
Binary file not shown.
23
Assets/Audio/SFX/Abilities/placeholderStardust.wav.meta
Normal file
23
Assets/Audio/SFX/Abilities/placeholderStardust.wav.meta
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0d7904a0c813242a498a3e829028c43d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Audio/SFX/Entity.meta
Normal file
8
Assets/Audio/SFX/Entity.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 403195ad990ae79f7a938a0c8abe941a
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Audio/SFX/Entity/EnemyDead.wav
Normal file
BIN
Assets/Audio/SFX/Entity/EnemyDead.wav
Normal file
Binary file not shown.
23
Assets/Audio/SFX/Entity/EnemyDead.wav.meta
Normal file
23
Assets/Audio/SFX/Entity/EnemyDead.wav.meta
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 42fee9b5915c28eb6b61c9a6afbab06a
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 8
|
||||
defaultSettings:
|
||||
serializedVersion: 2
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
preloadAudioData: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -77,7 +77,7 @@ SpriteRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_SortingOrder: 1
|
||||
m_Sprite: {fileID: -7312781290140997224, guid: 422cf2b841091f2878beffe6b9721e13, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_FlipX: 0
|
||||
|
|
@ -127,7 +127,7 @@ BoxCollider2D:
|
|||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
oldSize: {x: 0.32, y: 0.32}
|
||||
oldSize: {x: 1, y: 1}
|
||||
newSize: {x: 1, y: 1}
|
||||
adaptiveTilingThreshold: 0.5
|
||||
drawMode: 0
|
||||
|
|
|
|||
|
|
@ -281,13 +281,19 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
entityName: EnemyTest
|
||||
sprite: {fileID: 2925441294215993266}
|
||||
entityAS: {fileID: 0}
|
||||
stalled: 0
|
||||
invincible: 0
|
||||
health: 1000
|
||||
baseMaxHealth: 0
|
||||
maxHealth: 1000
|
||||
isFacingRight: 0
|
||||
rb: {fileID: 3678290925386274447}
|
||||
speed: 6
|
||||
speedMultiplier: 1
|
||||
deathObject: {fileID: 7303428460411016157, guid: 3c1f9bcbc2b3bdb988edfc7c42bb88c5, type: 3}
|
||||
deathSound: {fileID: 8300000, guid: 42fee9b5915c28eb6b61c9a6afbab06a, type: 3}
|
||||
deathVolume: 1
|
||||
closestTarget: {fileID: 0}
|
||||
engagementRange: 10
|
||||
detectedPlayer: 0
|
||||
|
|
@ -318,6 +324,9 @@ MonoBehaviour:
|
|||
allAbilities:
|
||||
- ability: {fileID: 11400000, guid: cf00f0064fc50ceb488768a65d7e1c60, type: 2}
|
||||
currentCooldown: 2
|
||||
levelHealthBuff: 1.25
|
||||
levelPowerBuff: 1.25
|
||||
powerBuffAmount: 0
|
||||
--- !u!1 &7992963443241331386
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
145
Assets/Prefabs/DeathSFXObject.prefab
Normal file
145
Assets/Prefabs/DeathSFXObject.prefab
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3708577634512909349
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4244881444485726721}
|
||||
- component: {fileID: 8925392394598708954}
|
||||
- component: {fileID: 7303428460411016157}
|
||||
m_Layer: 0
|
||||
m_Name: DeathSFXObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4244881444485726721
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3708577634512909349}
|
||||
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: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &8925392394598708954
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3708577634512909349}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!114 &7303428460411016157
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3708577634512909349}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ffa63eeffdadeda86b3db6f9f6b15cde, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
AS: {fileID: 8925392394598708954}
|
||||
7
Assets/Prefabs/DeathSFXObject.prefab.meta
Normal file
7
Assets/Prefabs/DeathSFXObject.prefab.meta
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3c1f9bcbc2b3bdb988edfc7c42bb88c5
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -115,6 +115,7 @@ GameObject:
|
|||
- component: {fileID: 4212479499813186278}
|
||||
- component: {fileID: 3678290925386274447}
|
||||
- component: {fileID: 2525771944862034798}
|
||||
- component: {fileID: -2539275798830170281}
|
||||
m_Layer: 6
|
||||
m_Name: Enemy
|
||||
m_TagString: Enemy
|
||||
|
|
@ -281,13 +282,19 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
entityName: EnemyTest
|
||||
sprite: {fileID: 2925441294215993266}
|
||||
entityAS: {fileID: -2539275798830170281}
|
||||
stalled: 0
|
||||
invincible: 0
|
||||
health: 100
|
||||
baseMaxHealth: 100
|
||||
maxHealth: 100
|
||||
isFacingRight: 0
|
||||
rb: {fileID: 3678290925386274447}
|
||||
speed: 6
|
||||
speedMultiplier: 1
|
||||
deathObject: {fileID: 7303428460411016157, guid: 3c1f9bcbc2b3bdb988edfc7c42bb88c5, type: 3}
|
||||
deathSound: {fileID: 8300000, guid: 42fee9b5915c28eb6b61c9a6afbab06a, type: 3}
|
||||
deathVolume: 0.2
|
||||
closestTarget: {fileID: 0}
|
||||
engagementRange: 10
|
||||
detectedPlayer: 0
|
||||
|
|
@ -320,6 +327,106 @@ MonoBehaviour:
|
|||
allAbilities:
|
||||
- ability: {fileID: 11400000, guid: cf00f0064fc50ceb488768a65d7e1c60, type: 2}
|
||||
currentCooldown: 2
|
||||
levelHealthBuff: 1.25
|
||||
levelPowerBuff: 1.25
|
||||
powerBuffAmount: 0
|
||||
--- !u!82 &-2539275798830170281
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7987017199152692169}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &7992963443241331386
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -47,14 +47,18 @@ MonoBehaviour:
|
|||
abilityName: Magic Missile
|
||||
abilityIcon: {fileID: 0}
|
||||
thisPlayer: {fileID: 0}
|
||||
thisHotbarIcon: {fileID: 0}
|
||||
canCooldown: 1
|
||||
baseCooldown: 0.2
|
||||
cooldown: 0.2
|
||||
currentCooldown: 0
|
||||
basePower: 10
|
||||
power: 10
|
||||
powerMultiplier: 0
|
||||
baseProjectileCount: 1
|
||||
projectileCount: 1
|
||||
useAbilitySFX: {fileID: 8300000, guid: 84f1208168bd8e751890fe269b802fde, type: 3}
|
||||
volume: 0.5
|
||||
pierceAmount: 0
|
||||
accuracy: 1
|
||||
bulletLifetime: 3
|
||||
|
|
|
|||
|
|
@ -604,18 +604,17 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
inputHandler: {fileID: 4421559795750709312}
|
||||
thisPlayer: {fileID: 5275979051295637757}
|
||||
mainAttack: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3}
|
||||
secondaryAttack: {fileID: 8579369158027197764, guid: fc8f0e7853997c463b72085306621f40, type: 3}
|
||||
spellA: {fileID: 2212103048918046095, guid: 2d849b52879286a90a56fa3955e0adb6, type: 3}
|
||||
spellB: {fileID: 2202756030888818067, guid: 91297fef450704432837e8de1bda05d7, type: 3}
|
||||
mainAttackInstance: {fileID: 0}
|
||||
secondaryAttackInstance: {fileID: 0}
|
||||
spellAInstance: {fileID: 0}
|
||||
spellBInstance: {fileID: 0}
|
||||
mainIcon: {fileID: 0}
|
||||
secondaryIcon: {fileID: 0}
|
||||
spellAIcon: {fileID: 0}
|
||||
spellBIcon: {fileID: 0}
|
||||
abilities:
|
||||
- {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3}
|
||||
- {fileID: 8579369158027197764, guid: fc8f0e7853997c463b72085306621f40, type: 3}
|
||||
- {fileID: 2212103048918046095, guid: 2d849b52879286a90a56fa3955e0adb6, type: 3}
|
||||
- {fileID: 2202756030888818067, guid: 91297fef450704432837e8de1bda05d7, type: 3}
|
||||
abilityInstances: []
|
||||
hotbarIcons:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
--- !u!114 &4421559795750709312
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -659,6 +658,7 @@ GameObject:
|
|||
- component: {fileID: -8972317287717925794}
|
||||
- component: {fileID: 8848001517495504165}
|
||||
- component: {fileID: 5275979051295637757}
|
||||
- component: {fileID: 8444515972077679594}
|
||||
m_Layer: 6
|
||||
m_Name: Marisa
|
||||
m_TagString: Friendly
|
||||
|
|
@ -826,19 +826,122 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
entityName: Marisa
|
||||
sprite: {fileID: 8885222195297553295}
|
||||
entityAS: {fileID: 8444515972077679594}
|
||||
stalled: 0
|
||||
invincible: 0
|
||||
health: 100
|
||||
baseMaxHealth: 0
|
||||
maxHealth: 100
|
||||
isFacingRight: 0
|
||||
isFacingRight: 1
|
||||
rb: {fileID: -8972317287717925794}
|
||||
speed: 8
|
||||
speedMultiplier: 1
|
||||
deathObject: {fileID: 7303428460411016157, guid: 3c1f9bcbc2b3bdb988edfc7c42bb88c5, type: 3}
|
||||
deathSound: {fileID: 0}
|
||||
deathVolume: 1
|
||||
cam: {fileID: 0}
|
||||
mouseWorldPos: {x: 0, y: 0}
|
||||
firingPointBase: {fileID: 1955417614592701310}
|
||||
firingPoint: {fileID: 6266582235186827771}
|
||||
hpBarUI: {fileID: 0}
|
||||
healthText: {fileID: 0}
|
||||
--- !u!82 &8444515972077679594
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5080576259360811646}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &6049904439364741944
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 6210518781829362723}
|
||||
- component: {fileID: 2212103048918046095}
|
||||
- component: {fileID: 8053567446013947764}
|
||||
- component: {fileID: -8332228528591785767}
|
||||
m_Layer: 0
|
||||
m_Name: MasterSpark
|
||||
m_TagString: Untagged
|
||||
|
|
@ -47,19 +49,94 @@ MonoBehaviour:
|
|||
abilityName: Master Spark
|
||||
abilityIcon: {fileID: 0}
|
||||
thisPlayer: {fileID: 0}
|
||||
thisHotbarIcon: {fileID: 0}
|
||||
canCooldown: 1
|
||||
baseCooldown: 60
|
||||
cooldown: 60
|
||||
currentCooldown: 0
|
||||
basePower: 10
|
||||
power: 10
|
||||
powerMultiplier: 0
|
||||
baseProjectileCount: 0
|
||||
projectileCount: 0
|
||||
useAbilitySFX: {fileID: 8300000, guid: 2d976ba0af5ffa6929b10bfb6dbd72b8, type: 3}
|
||||
volume: 0.1
|
||||
length: 100
|
||||
width: 2
|
||||
duration: 4
|
||||
beamObject: {fileID: 9142983110258810315, guid: 5c95f1061d0b0a13694b57cb8a14866c, type: 3}
|
||||
turnSpeed: 10
|
||||
turnSpeed: 20
|
||||
offset: 0.5
|
||||
beamSFX: {fileID: 8300000, guid: 98b56e23a087f0bd2b68e54e40802115, type: 3}
|
||||
beamVolume: 0.1
|
||||
enemyList: []
|
||||
damageDebounceTime: 0.5
|
||||
damageDebounceTime: 0.2
|
||||
chargeTime: 2.2
|
||||
camShakeScript: {fileID: -8332228528591785767}
|
||||
--- !u!114 &8053567446013947764
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3204262992054338593}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 180ecf9b41d478f468eb3e9083753217, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ImpulseDefinition:
|
||||
ImpulseChannel: 1
|
||||
ImpulseShape: 2
|
||||
CustomImpulseShape:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
ImpulseDuration: 0.2
|
||||
ImpulseType: 0
|
||||
DissipationRate: 0.25
|
||||
RawSignal: {fileID: 0}
|
||||
AmplitudeGain: 1
|
||||
FrequencyGain: 1
|
||||
RepeatMode: 0
|
||||
Randomize: 1
|
||||
TimeEnvelope:
|
||||
AttackShape:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
DecayShape:
|
||||
serializedVersion: 2
|
||||
m_Curve: []
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
AttackTime: 0
|
||||
SustainTime: 0.2
|
||||
DecayTime: 0.7
|
||||
ScaleWithImpact: 1
|
||||
HoldForever: 0
|
||||
ImpactRadius: 100
|
||||
DirectionMode: 0
|
||||
DissipationMode: 2
|
||||
DissipationDistance: 100
|
||||
PropagationSpeed: 343
|
||||
DefaultVelocity: {x: 0, y: -1, z: 0}
|
||||
--- !u!114 &-8332228528591785767
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3204262992054338593}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1451ffc8332d519f59ce36448e28604a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
impulseSource: {fileID: 8053567446013947764}
|
||||
cameraShakeForce: 0.5
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@ GameObject:
|
|||
- component: {fileID: 4212479499813186278}
|
||||
- component: {fileID: 3678290925386274447}
|
||||
- component: {fileID: 3967664051888947817}
|
||||
- component: {fileID: 582066013624105601}
|
||||
m_Layer: 6
|
||||
m_Name: RusherEnemy
|
||||
m_TagString: Enemy
|
||||
|
|
@ -281,16 +282,21 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
entityName: Rusher Enemy (PLACEHOLDER NAME)
|
||||
sprite: {fileID: 2925441294215993266}
|
||||
entityAS: {fileID: 582066013624105601}
|
||||
stalled: 0
|
||||
invincible: 0
|
||||
health: 100
|
||||
baseMaxHealth: 100
|
||||
maxHealth: 100
|
||||
isFacingRight: 0
|
||||
rb: {fileID: 3678290925386274447}
|
||||
speed: 3
|
||||
speedMultiplier: 1
|
||||
deathObject: {fileID: 7303428460411016157, guid: 3c1f9bcbc2b3bdb988edfc7c42bb88c5, type: 3}
|
||||
deathSound: {fileID: 8300000, guid: 42fee9b5915c28eb6b61c9a6afbab06a, type: 3}
|
||||
deathVolume: 0.2
|
||||
closestTarget: {fileID: 0}
|
||||
engagementRange: 2
|
||||
engagementRange: 10
|
||||
detectedPlayer: 0
|
||||
acceleration: 1000
|
||||
possibleDirections:
|
||||
|
|
@ -319,8 +325,108 @@ MonoBehaviour:
|
|||
currentCooldown: 2
|
||||
- ability: {fileID: 11400000, guid: 8ec13bfc95f128a91a66d9ae8c820783, type: 2}
|
||||
currentCooldown: 2
|
||||
levelHealthBuff: 1.25
|
||||
levelPowerBuff: 1.25
|
||||
powerBuffAmount: 0
|
||||
lastTargetLocation: {x: 0, y: 0}
|
||||
lastTargetDirection: {x: 0, y: 0}
|
||||
--- !u!82 &582066013624105601
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7987017199152692169}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 0}
|
||||
m_Resource: {fileID: 0}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &7992963443241331386
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -47,14 +47,18 @@ MonoBehaviour:
|
|||
abilityName: Stardust
|
||||
abilityIcon: {fileID: 0}
|
||||
thisPlayer: {fileID: 0}
|
||||
thisHotbarIcon: {fileID: 0}
|
||||
canCooldown: 1
|
||||
baseCooldown: 0.1
|
||||
cooldown: 0.1
|
||||
currentCooldown: 0
|
||||
basePower: 10
|
||||
power: 10
|
||||
powerMultiplier: 0
|
||||
baseProjectileCount: 3
|
||||
projectileCount: 3
|
||||
useAbilitySFX: {fileID: 8300000, guid: 0d7904a0c813242a498a3e829028c43d, type: 3}
|
||||
volume: 0.5
|
||||
pierceAmount: 0
|
||||
accuracy: 60
|
||||
bulletLifetime: 3
|
||||
|
|
|
|||
|
|
@ -541,7 +541,7 @@ TilemapRenderer:
|
|||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 1
|
||||
m_SortingOrder: 0
|
||||
m_ChunkSize: {x: 32, y: 32, z: 32}
|
||||
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
|
||||
m_MaxChunkCount: 16
|
||||
|
|
@ -21387,10 +21387,6 @@ PrefabInstance:
|
|||
propertyPath: healthText
|
||||
value:
|
||||
objectReference: {fileID: 1264758721}
|
||||
- target: {fileID: 5275979051295637757, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: isFacingRight
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5661264056639479186, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
|
|
@ -21431,46 +21427,6 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: mainIcon
|
||||
value:
|
||||
objectReference: {fileID: 8557355471054574495}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: spellAIcon
|
||||
value:
|
||||
objectReference: {fileID: 2040234423}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: spellBIcon
|
||||
value:
|
||||
objectReference: {fileID: 2065550206}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: secondaryIcon
|
||||
value:
|
||||
objectReference: {fileID: 1509689679}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: abilities.Array.size
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: hotbarIcons.Array.size
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: 'abilities.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: 8579369158027197764, guid: d695e39a8ed83e67aa09d75b33cf7bb3, type: 3}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: 'abilities.Array.data[1]'
|
||||
value:
|
||||
objectReference: {fileID: 8579369158027197764, guid: fc8f0e7853997c463b72085306621f40, type: 3}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: 'abilities.Array.data[2]'
|
||||
value:
|
||||
objectReference: {fileID: 2212103048918046095, guid: 2d849b52879286a90a56fa3955e0adb6, type: 3}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: 'abilities.Array.data[3]'
|
||||
value:
|
||||
objectReference: {fileID: 2202756030888818067, guid: 91297fef450704432837e8de1bda05d7, type: 3}
|
||||
- target: {fileID: 7002501187268097541, guid: 8764555a5fdde3428903d7ac06f8ff7f, type: 3}
|
||||
propertyPath: 'hotbarIcons.Array.data[0]'
|
||||
value:
|
||||
|
|
@ -21972,6 +21928,7 @@ GameObject:
|
|||
- component: {fileID: 583397146}
|
||||
- component: {fileID: 583397145}
|
||||
- component: {fileID: 583397147}
|
||||
- component: {fileID: 583397148}
|
||||
m_Layer: 0
|
||||
m_Name: CinemachineCamera
|
||||
m_TagString: Untagged
|
||||
|
|
@ -22056,6 +22013,30 @@ MonoBehaviour:
|
|||
RotationDamping: {x: 1, y: 1, z: 1}
|
||||
QuaternionDamping: 1
|
||||
FollowOffset: {x: 0, y: 0, z: -10}
|
||||
--- !u!114 &583397148
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 583397144}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ApplyAfter: 2
|
||||
ChannelMask: 1
|
||||
Gain: 1
|
||||
Use2DDistance: 0
|
||||
UseCameraSpace: 1
|
||||
SignalCombinationMode: 0
|
||||
ReactionSettings:
|
||||
m_SecondaryNoise: {fileID: 0}
|
||||
AmplitudeGain: 1
|
||||
FrequencyGain: 1
|
||||
Duration: 1
|
||||
m_NoiseOffsets: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &619394800
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -27937,6 +27918,8 @@ MonoBehaviour:
|
|||
canSpawn: 1
|
||||
enemiesToSpawn:
|
||||
- {fileID: 3967664051888947817, guid: dca3334ce8d502431a2ec8584bd4573d, type: 3}
|
||||
- {fileID: 2525771944862034798, guid: 063e01ce3891d882e88d10b67e7f9f7b, type: 3}
|
||||
- {fileID: 2525771944862034798, guid: 063e01ce3891d882e88d10b67e7f9f7b, type: 3}
|
||||
spawnPoints:
|
||||
- {fileID: 1606209485}
|
||||
- {fileID: 2000423408}
|
||||
|
|
@ -27948,6 +27931,8 @@ MonoBehaviour:
|
|||
bossHealthBar: {fileID: 1923631094}
|
||||
bossHealthText: {fileID: 879588202}
|
||||
bossNameText: {fileID: 17999211}
|
||||
levelUpIntervals: 60
|
||||
enemyLevel: 0
|
||||
enemyFolder: {fileID: 1319590957}
|
||||
player: {fileID: 1582287016}
|
||||
--- !u!4 &1972076835
|
||||
|
|
|
|||
|
|
@ -1287,7 +1287,6 @@ MonoBehaviour:
|
|||
- {fileID: 588354828}
|
||||
- {fileID: 421902372}
|
||||
- {fileID: 467074700}
|
||||
playerAbilityHandler: {fileID: 0}
|
||||
abilityUI: {fileID: 1335305514}
|
||||
upgradeGrid: {fileID: 695931117}
|
||||
templateStoredUpgradeUI: {fileID: 7904669694422582500, guid: 4af6aa94cacc76b58b61e239461992e0, type: 3}
|
||||
|
|
@ -1534,6 +1533,17 @@ RectTransform:
|
|||
m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 427031505}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &427031507 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 427031505}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &437012235
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2315,6 +2325,17 @@ RectTransform:
|
|||
m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 625772757}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &625772759 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 625772757}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &645026919
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6133,6 +6154,55 @@ MonoBehaviour:
|
|||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &1851158897
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1851158899}
|
||||
- component: {fileID: 1851158898}
|
||||
m_Layer: 0
|
||||
m_Name: UILoader
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1851158898
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1851158897}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: c72ac6493c39161ddb1a803266ecd7ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
hotbarIcons:
|
||||
- {fileID: 2130705435}
|
||||
- {fileID: 427031507}
|
||||
- {fileID: 1939950043}
|
||||
- {fileID: 625772759}
|
||||
--- !u!4 &1851158899
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1851158897}
|
||||
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: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1851550684
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6534,6 +6604,17 @@ RectTransform:
|
|||
m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 1939950041}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1939950043 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 1939950041}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1960450809
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6996,9 +7077,21 @@ RectTransform:
|
|||
m_CorrespondingSourceObject: {fileID: 3595604515381026928, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 2130705433}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2130705435 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 3967213263405647408, guid: 76fcc84ad57e7fa44a8b2ea9c59842ed, type: 3}
|
||||
m_PrefabInstance: {fileID: 2130705433}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 18d0774d0a3b11b43858ef778057d6fe, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 1185067170}
|
||||
- {fileID: 1068812598}
|
||||
- {fileID: 1851158899}
|
||||
|
|
|
|||
|
|
@ -636,9 +636,9 @@ RectTransform:
|
|||
- {fileID: 231019631}
|
||||
m_Father: {fileID: 739276196}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 165, y: -30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &290866877
|
||||
|
|
@ -798,6 +798,128 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 373046505}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &605888219
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 605888220}
|
||||
- component: {fileID: 605888223}
|
||||
- component: {fileID: 605888222}
|
||||
- component: {fileID: 605888221}
|
||||
m_Layer: 5
|
||||
m_Name: UpgradeBoxTemplate
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &605888220
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 605888219}
|
||||
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: 1096260513}
|
||||
- {fileID: 1558772061}
|
||||
m_Father: {fileID: 2005823101}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &605888221
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 605888219}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 605888222}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &605888222
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 605888219}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &605888223
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 605888219}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &627902899
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1254,9 +1376,9 @@ RectTransform:
|
|||
- {fileID: 52826879}
|
||||
m_Father: {fileID: 739276196}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 1155, y: -30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &798394621
|
||||
|
|
@ -1353,6 +1475,142 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 798394619}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1096260512
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1096260513}
|
||||
- component: {fileID: 1096260515}
|
||||
- component: {fileID: 1096260514}
|
||||
m_Layer: 5
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1096260513
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1096260512}
|
||||
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: 605888220}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -20}
|
||||
m_SizeDelta: {x: 180, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1096260514
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1096260512}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Upgrade
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 24
|
||||
m_fontSizeBase: 24
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1096260515
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1096260512}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1111463682
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1470,9 +1728,9 @@ RectTransform:
|
|||
- {fileID: 1571556089}
|
||||
m_Father: {fileID: 739276196}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 495, y: -30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1189515496
|
||||
|
|
@ -1816,6 +2074,81 @@ MonoBehaviour:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
CustomBlends: {fileID: 0}
|
||||
--- !u!1 &1558772060
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1558772061}
|
||||
- component: {fileID: 1558772063}
|
||||
- component: {fileID: 1558772062}
|
||||
m_Layer: 5
|
||||
m_Name: Icon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1558772061
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1558772060}
|
||||
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: 605888220}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 55, y: -55}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1558772062
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1558772060}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.2830189, g: 0.2830189, b: 0.2830189, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &1558772063
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1558772060}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1571556088
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1964,7 +2297,7 @@ GameObject:
|
|||
- component: {fileID: 1592069713}
|
||||
- component: {fileID: 1592069712}
|
||||
m_Layer: 5
|
||||
m_Name: UpgradesList
|
||||
m_Name: Sidebar
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -1981,7 +2314,8 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 2005823101}
|
||||
m_Father: {fileID: 1878154676}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
|
@ -2002,7 +2336,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
|
||||
m_Color: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -2360,9 +2694,9 @@ RectTransform:
|
|||
- {fileID: 80340017}
|
||||
m_Father: {fileID: 739276196}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 825, y: -30}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1848525859
|
||||
|
|
@ -2465,7 +2799,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1878154673
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2597,9 +2931,12 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
buyableUpgrades: []
|
||||
maxBuyables: 0
|
||||
currency: 0
|
||||
shopUIObject: {fileID: 1878154672}
|
||||
player: {fileID: 1952728176}
|
||||
upgradeListUI: {fileID: 0}
|
||||
templateUpgradeButton: {fileID: 0}
|
||||
--- !u!1001 &1952728174
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2705,6 +3042,76 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 52bda12b42435d197a10a340f8608249, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2005823100
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2005823101}
|
||||
- component: {fileID: 2005823103}
|
||||
- component: {fileID: 2005823102}
|
||||
m_Layer: 5
|
||||
m_Name: UpgradeGrid
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2005823101
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2005823100}
|
||||
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: 605888220}
|
||||
m_Father: {fileID: 1592069711}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2005823102
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2005823100}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 300, y: 200}
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!222 &2005823103
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2005823100}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2037854643
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -7,27 +7,14 @@ public class AbilityHotbarIcon : MonoBehaviour, IPointerEnterHandler, IPointerEx
|
|||
{
|
||||
public Transform cooldownBar;
|
||||
[SerializeField] private TextMeshProUGUI text;
|
||||
private bool onCooldown;
|
||||
private PlayerAbility thisAbility;
|
||||
[SerializeField] private FloatingAbilityInfo infoUI;
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (onCooldown)
|
||||
if (thisAbility.currentCooldown > 0f || cooldownBar.localScale.x < 1f)
|
||||
{
|
||||
cooldownBar.localScale = new Vector3(Math.Clamp(1 - thisAbility.currentCooldown/thisAbility.cooldown, 0, 1), 1, 1);
|
||||
if (thisAbility.currentCooldown <= 0)
|
||||
{
|
||||
onCooldown = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void UpdateCooldown()
|
||||
{
|
||||
if (thisAbility.currentCooldown > 0)
|
||||
{
|
||||
onCooldown = true;
|
||||
cooldownBar.localScale = new Vector3(Math.Clamp(1f - thisAbility.currentCooldown/thisAbility.cooldown, 0f, 1f), 1f, 1f);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,19 @@ public class Laser : PlayerAbility
|
|||
private BeamCollider beamObjectInstance;
|
||||
public float turnSpeed;
|
||||
public float offset;
|
||||
[SerializeField] private AudioClip beamSFX;
|
||||
[SerializeField] private float beamVolume = 1;
|
||||
|
||||
[Header("Weapon Properties")]
|
||||
[HideInInspector] public List<Entity> enemyList = new();
|
||||
public float damageDebounceTime;
|
||||
protected float currentDebounce;
|
||||
[Header("Charge")]
|
||||
public float chargeTime;
|
||||
protected float currentCharge;
|
||||
[Header("Effects")]
|
||||
[SerializeField] private CameraShake camShakeScript; //optional
|
||||
|
||||
private void Start()
|
||||
{
|
||||
CreateBeam();
|
||||
|
|
@ -30,13 +39,30 @@ public class Laser : PlayerAbility
|
|||
currentDuration = duration;
|
||||
currentCooldown = cooldown;
|
||||
currentDebounce = damageDebounceTime;
|
||||
beamObjectInstance.gameObject.SetActive(true);
|
||||
transform.Lookat2D(thisPlayer.mouseWorldPos);
|
||||
currentCharge = chargeTime;
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
if (currentCharge >= 0 && currentDuration > 0)
|
||||
{
|
||||
currentCharge -= Time.deltaTime;
|
||||
if (currentCharge < 0)
|
||||
{
|
||||
AbilityManager.instance.player.thisPlayer.entityAS.PlayOneShot(beamSFX, beamVolume);
|
||||
beamObjectInstance.gameObject.SetActive(true);
|
||||
transform.Lookat2D(thisPlayer.mouseWorldPos);
|
||||
if (camShakeScript)
|
||||
{
|
||||
camShakeScript.ShakeCamera(currentDuration);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (currentDuration > 0)
|
||||
{
|
||||
Vector3 direction = (thisPlayer.mouseWorldPos - (Vector2)transform.position).normalized;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,9 @@ public class PlayerAbility : MonoBehaviour
|
|||
public int baseProjectileCount;
|
||||
public int projectileCount;
|
||||
public Dictionary<AbilityUpgrade, int> attachedUpgrades = new();
|
||||
[Header("SFX")]
|
||||
[SerializeField] private AudioClip useAbilitySFX;
|
||||
[SerializeField] private float volume = 1;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
|
|
@ -34,6 +37,7 @@ public class PlayerAbility : MonoBehaviour
|
|||
if (currentCooldown <= 0 && canCooldown)
|
||||
{
|
||||
currentCooldown = cooldown;
|
||||
AbilityManager.instance.player.thisPlayer.entityAS.PlayOneShot(useAbilitySFX, volume);
|
||||
AbilityEffects();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
24
Assets/Scripts/CameraShake.cs
Normal file
24
Assets/Scripts/CameraShake.cs
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
using Unity.Cinemachine;
|
||||
using UnityEngine;
|
||||
|
||||
public class CameraShake : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private CinemachineImpulseSource impulseSource;
|
||||
[SerializeField] private float cameraShakeForce;
|
||||
private float currentDuration;
|
||||
|
||||
public void ShakeCamera(float duration)
|
||||
{
|
||||
currentDuration = duration;
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (currentDuration > 0)
|
||||
{
|
||||
currentDuration -= Time.deltaTime;
|
||||
impulseSource.DefaultVelocity = new Vector3(Random.Range(-1f, 1f), Random.Range(-1f, 1f), 0f);
|
||||
impulseSource.GenerateImpulse(cameraShakeForce);
|
||||
}
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/CameraShake.cs.meta
Normal file
2
Assets/Scripts/CameraShake.cs.meta
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1451ffc8332d519f59ce36448e28604a
|
||||
|
|
@ -118,6 +118,7 @@ public class Enemy : Entity
|
|||
protected override void OnKillEffects()
|
||||
{
|
||||
Destroy(gameObject);
|
||||
OnKill?.Invoke();
|
||||
foreach (UpgradeDrop drop in possibleDrops)
|
||||
{
|
||||
DropUpgrade(drop);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,8 @@ public class EnemySpawner : MonoBehaviour
|
|||
public List<Transform> spawnPoints;
|
||||
public float spawnRate;
|
||||
[SerializeField] private float currentSpawnTime;
|
||||
[Header("Boss")]
|
||||
[Header("Boss")]
|
||||
private bool bossSpawned = false;
|
||||
public Enemy bossEnemy;
|
||||
private Enemy bossEnemyInstance;
|
||||
public Transform bossSpawnPoint;
|
||||
|
|
@ -54,14 +55,14 @@ public class EnemySpawner : MonoBehaviour
|
|||
SpawnEnemy(enemiesToSpawn[Random.Range(0, enemiesToSpawn.Length)], spawnPoints[Random.Range(0, spawnPoints.Count)].position);
|
||||
}
|
||||
}
|
||||
else if (!canSpawn && bossEnemy.health < 0)
|
||||
else if (bossSpawned && !bossEnemyInstance)
|
||||
{
|
||||
if (Input.GetKey(KeyCode.E))
|
||||
{
|
||||
LevelSwitcher.instance.LoadShop();
|
||||
}
|
||||
}
|
||||
enemyLevel = (int)(Time.time / levelUpIntervals); //figure out the time.time thing because that's not gonna work here
|
||||
enemyLevel = (int)(Time.time / levelUpIntervals) + 1; //figure out the time.time thing because that's not gonna work here
|
||||
}
|
||||
|
||||
public Enemy SpawnEnemy(Enemy enemy, Vector3 location)
|
||||
|
|
@ -79,6 +80,7 @@ public class EnemySpawner : MonoBehaviour
|
|||
canSpawn = false;
|
||||
Enemy.OnDamaged += UpdateBossHealthBar; //this kinda sucks but it technically works??
|
||||
bossNameText.text = bossEnemyInstance.entityName;
|
||||
bossSpawned = true;
|
||||
}
|
||||
|
||||
private void UpdateBossHealthBar()
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ public class Entity : MonoBehaviour
|
|||
[Header("Identification")]
|
||||
public string entityName;
|
||||
public SpriteRenderer sprite;
|
||||
public AudioSource entityAS;
|
||||
[Header("Flags")]
|
||||
public bool stalled;
|
||||
public bool invincible;
|
||||
|
|
@ -20,6 +21,10 @@ public class Entity : MonoBehaviour
|
|||
protected Vector2 moveDirection;
|
||||
public float speed;
|
||||
public float speedMultiplier = 1f;
|
||||
[Header("FX")]
|
||||
[SerializeField] private EntityDeathSFX deathObject;
|
||||
[SerializeField] private AudioClip deathSound;
|
||||
[SerializeField] private float deathVolume = 1;
|
||||
|
||||
protected void FlipSprite(Vector2 lookDirection)
|
||||
{
|
||||
|
|
@ -47,6 +52,8 @@ public class Entity : MonoBehaviour
|
|||
health -= damage;
|
||||
if (health < 0)
|
||||
{
|
||||
EntityDeathSFX newSFX = Instantiate(deathObject, transform.position, transform.rotation);
|
||||
newSFX.PlaySFX(deathSound, deathVolume);
|
||||
OnKillEffects();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
20
Assets/Scripts/Entities/EntityDeathSFX.cs
Normal file
20
Assets/Scripts/Entities/EntityDeathSFX.cs
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
public class EntityDeathSFX : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private AudioSource AS;
|
||||
|
||||
public void PlaySFX(AudioClip audioToPlay, float volume)
|
||||
{
|
||||
AS.PlayOneShot(audioToPlay, volume);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (!AS.isPlaying)
|
||||
{
|
||||
Destroy(gameObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/Entities/EntityDeathSFX.cs.meta
Normal file
2
Assets/Scripts/Entities/EntityDeathSFX.cs.meta
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ffa63eeffdadeda86b3db6f9f6b15cde
|
||||
|
|
@ -6,7 +6,7 @@ using UnityEngine.InputSystem;
|
|||
public class MarisaAbilityHandler : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private PlayerInput inputHandler;
|
||||
[SerializeField] private Marisa thisPlayer;
|
||||
public Marisa thisPlayer;
|
||||
|
||||
[Header("Abilities")] //maybe have to make them public for when you're changing out abilities
|
||||
public List<PlayerAbility> abilities = new();
|
||||
|
|
@ -18,17 +18,11 @@ public class MarisaAbilityHandler : MonoBehaviour
|
|||
public AbilityHotbarIcon[] hotbarIcons;
|
||||
//this is getting ridiculous
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
SetupAbilities();
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
hotbarIcons = FindObjectsByType<AbilityHotbarIcon>(FindObjectsSortMode.InstanceID);
|
||||
if (AbilitySceneTransfer.instance.savedAbilities.Count > 0)
|
||||
if (hotbarIcons[0] != null) //bad
|
||||
{
|
||||
LevelSwitcher.instance.SetupScene();
|
||||
SetupAbilities();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -57,22 +51,18 @@ public class MarisaAbilityHandler : MonoBehaviour
|
|||
if (inputHandler.actions["MainAttack"].inProgress)
|
||||
{
|
||||
abilityInstances[0].TryAbility();
|
||||
hotbarIcons[0].UpdateCooldown();
|
||||
}
|
||||
else if (inputHandler.actions["SecondaryAttack"].inProgress)
|
||||
{
|
||||
abilityInstances[1].TryAbility();
|
||||
hotbarIcons[1].UpdateCooldown();
|
||||
}
|
||||
else if (inputHandler.actions["SpellA"].inProgress)
|
||||
{
|
||||
abilityInstances[2].TryAbility();
|
||||
hotbarIcons[2].UpdateCooldown();
|
||||
}
|
||||
else if (inputHandler.actions["SpellB"].inProgress)
|
||||
{
|
||||
abilityInstances[3].TryAbility();
|
||||
hotbarIcons[3].UpdateCooldown();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ShopManager : MonoBehaviour
|
||||
{
|
||||
|
|
@ -20,12 +22,26 @@ public class ShopManager : MonoBehaviour
|
|||
|
||||
#endregion
|
||||
public List<AbilityUpgrade> buyableUpgrades;
|
||||
[SerializeField] private int maxBuyables;
|
||||
public int currency; //uh. we need to figure out this one lol
|
||||
public GameObject shopUIObject;
|
||||
[SerializeField] private Marisa player;
|
||||
[Header("UI")]
|
||||
public Transform upgradeListUI;
|
||||
public Button templateUpgradeButton;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
GenerateUpgradeList();
|
||||
}
|
||||
|
||||
public void GenerateUpgradeList()
|
||||
{
|
||||
|
||||
foreach (AbilityUpgrade upgrade in buyableUpgrades)
|
||||
{
|
||||
Button newButton = Instantiate(templateUpgradeButton, upgradeListUI);
|
||||
newButton.onClick.AddListener(() => BuyUpgrade(upgrade));
|
||||
}
|
||||
}
|
||||
|
||||
public void BuyUpgrade(AbilityUpgrade abilityToBuy)
|
||||
|
|
@ -55,4 +71,27 @@ public class ShopManager : MonoBehaviour
|
|||
shopUIObject.SetActive(false);
|
||||
player.stalled = false;
|
||||
}
|
||||
|
||||
public void UpgradesMenu()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SellMenu()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void TalkMenu()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void ClearInventoryUI()
|
||||
{
|
||||
foreach (Transform child in upgradeListUI)
|
||||
{
|
||||
Destroy(child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
23
Assets/Scripts/UILoader.cs
Normal file
23
Assets/Scripts/UILoader.cs
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
public class UILoader : MonoBehaviour
|
||||
{
|
||||
private MarisaAbilityHandler marisa;
|
||||
[SerializeField] private AbilityHotbarIcon[] hotbarIcons;
|
||||
private void Awake()
|
||||
{
|
||||
marisa = FindFirstObjectByType<MarisaAbilityHandler>();
|
||||
marisa.hotbarIcons = hotbarIcons;
|
||||
if (AbilitySceneTransfer.instance.savedAbilities.Count > 0)
|
||||
{
|
||||
LevelSwitcher.instance.SetupScene();
|
||||
}
|
||||
marisa.SetupAbilities();
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
Destroy(gameObject);
|
||||
}
|
||||
}
|
||||
2
Assets/Scripts/UILoader.cs.meta
Normal file
2
Assets/Scripts/UILoader.cs.meta
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c72ac6493c39161ddb1a803266ecd7ea
|
||||
Loading…
Add table
Add a link
Reference in a new issue