Skip to content

fix: more responsive actions #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 2, 2022
Merged

fix: more responsive actions #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5596475
Increased speed of base attacks by 1.5
LPLafontaineB Dec 21, 2021
096b683
Reverted increased speed of wrong animation
LPLafontaineB Jan 7, 2022
dc4d484
Change speed increase to 1.67
LPLafontaineB Jan 10, 2022
776fb6c
Increased movement speed of all characters from 4 to 5
LPLafontaineB Jan 10, 2022
04755e1
Further increased attack speed to 2x. Also applied to mage heal and s…
LPLafontaineB Jan 14, 2022
444896e
Increased movement speed to 6
LPLafontaineB Jan 14, 2022
a6904b3
Reduced attack animation to 1.66 and shield buff / heal to 1.2
LPLafontaineB Jan 18, 2022
ae97316
Reverted tank attack particle system start delay
LPLafontaineB Jan 18, 2022
947a8b8
Merge branch 'develop' into fix/more-responsive-actions
LPLafontaineB Jan 18, 2022
f5e73f7
Edited some of the vfx for the rogue and tank to have them better tim…
jilfranco-unity Jan 21, 2022
f207532
Merge branch 'develop' into fix/more-responsive-actions
LPLafontaineB Feb 1, 2022
34d2085
Balancing changes
LPLafontaineB Feb 2, 2022
94d69c2
Reduced movement speed back to 5
LPLafontaineB Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Archer/ArcherBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Boss/BossImpBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Boss/BossImpTrampleAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Imp/ImpBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Mage/MageBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Mage/MageHeal.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Action/Rogue/RogueBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Rogue/RogueDashAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Tank/TankBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Action/Tank/TankShieldBuff.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Character/Archer/Archer.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Character/Imp/Imp.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Character/ImpBoss/ImpBoss.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Character/Mage/Mage.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Character/Rogue/Rogue.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/BossRoom/GameData/Character/Tank/Tank.asset
View file
Open in desktop
Git LFS file not shown
6 changes: 3 additions & 3 deletions Assets/BossRoom/Models/Animation Controllers/CharacterSetController.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SkillHeal
m_Speed: 1
m_Speed: 1.2
m_CycleOffset: 0
m_Transitions:
- {fileID: 7908433373164699421}
Expand Down Expand Up @@ -2229,7 +2229,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TankShieldBuff (start)
m_Speed: 1
m_Speed: 1.2
m_CycleOffset: 0
m_Transitions:
- {fileID: 8849726690194494114}
Expand Down Expand Up @@ -2914,7 +2914,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Attack1
m_Speed: 1
m_Speed: 1.66
m_CycleOffset: 0
m_Transitions:
- {fileID: -3576141394984483750}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Models/Animation Controllers/DoorController.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Closed
m_Speed: -1
m_Speed: -1.5
m_CycleOffset: 0
m_Transitions:
- {fileID: 2526322587758064571}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics_Rogue.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ MonoBehaviour:
- m_AnimatorNodeName: Attack1
m_AnimatorNodeNameHash: -47317214
m_Prefab: {fileID: 2787649059963953560, guid: 5121957b2fabba043a36ec5641e54be7, type: 3}
m_PrefabSpawnDelaySeconds: 0.8
m_PrefabSpawnDelaySeconds: 0.4
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/VFX/Materials/FX_Slash_01.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Slash: {r: 0, g: 0.01, b: 0, a: 0}
- _Slash: {r: -0.3, g: 0.01, b: 0, a: 0}
- _Tint: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
5 changes: 2 additions & 3 deletions Assets/BossRoom/VFX/Prefabs/Rogue/FX_Rogue_attack_1_Slash.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6245,7 +6245,7 @@ ParticleSystem:
maxColor: {r: 1, g: 1, b: 1, a: 1}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0.49019608}
key0: {r: 1, g: 1, b: 1, a: 0}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0.19607843}
key3: {r: 0, g: 0, b: 0, a: 0}
Expand All @@ -6261,7 +6261,7 @@ ParticleSystem:
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime0: 19661
atime1: 32768
atime2: 65346
atime3: 0
Expand Down Expand Up @@ -9761,4 +9761,3 @@ MonoBehaviour:
m_ParticleSystemsToTurnOffOnShutdown: []
m_AutoShutdownTime: 1
m_PostShutdownSelfDestructTime: -1
m_SoundsToTurnOffOnShutdown: []
9 changes: 4 additions & 5 deletions Assets/BossRoom/VFX/Prefabs/Tank/fx_TankAttack1.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,11 +1378,11 @@ ParticleSystem:
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 13107
atime2: 52428
atime0: 14071
atime1: 22359
atime2: 55319
atime3: 65535
atime4: 0
atime4: 65535
atime5: 0
atime6: 0
atime7: 0
Expand Down Expand Up @@ -4878,4 +4878,3 @@ MonoBehaviour:
m_ParticleSystemsToTurnOffOnShutdown: []
m_AutoShutdownTime: 1
m_PostShutdownSelfDestructTime: -1
m_SoundsToTurnOffOnShutdown: []