Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-24 21:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Weapon animation changes (#134)

Browse source 
* added the correct aim animation for the minigun and the flame thrower

* corrected the aim, idle, walk, run animation for the extinguisher - added a weapon class for it

* corrected animations for the MP5

* corrected the idle, walk, run, aim/fire animation for the spraycan
This commit is contained in:
Aleksejs Sergejevs 2022-07-17 10:08:40 +03:00 committed by GitHub
parent 549922f7b9
commit dbe0220de2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 54 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Assets/Scripts/Behaviours/Weapons/Extinguisher.cs Normal file
View file

@ -0,0 +1,12 @@
using SanAndreasUnity.Importing.Animation;
namespace SanAndreasUnity.Behaviours.Weapons
{
public class Extinguisher : Weapon
{
public override AnimId AimAnim => new AnimId(AnimGroup.Flame, AnimIndex.FLAME_fire);
public override AnimId IdleAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Idle);
public override AnimId WalkAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Walk);
public override AnimId RunAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Run);
}
}

11
Assets/Scripts/Behaviours/Weapons/Extinguisher.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5bd1b589616213542a3be7924dd652cd
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

10
Assets/Scripts/Behaviours/Weapons/FThrower.cs
View file

@ -3,16 +3,8 @@ using SanAndreasUnity.Importing.Animation;
namespace SanAndreasUnity.Behaviours.Weapons namespace SanAndreasUnity.Behaviours.Weapons
{ {
public class FThrower : Weapon public class FThrower : Weapon
{ {
public override AnimId AimAnim => new AnimId(AnimGroup.Flame, AnimIndex.FLAME_fire);
// public override AnimId AimAnim {
// get {
// return new AnimId (AnimGroup.Flame, AnimIndex.FLAME_fire);
// }
// }
} }
} }

13
Assets/Scripts/Behaviours/Weapons/MP5.cs
View file

@ -3,16 +3,11 @@ using SanAndreasUnity.Importing.Animation;
namespace SanAndreasUnity.Behaviours.Weapons namespace SanAndreasUnity.Behaviours.Weapons
{ {
public class MP5 : Weapon public class MP5 : Weapon
{ {
public override AnimId AimAnim => new AnimId (AnimGroup.Uzi, AnimIndex.UZI_fire);
public override AnimId AimAnim { public override AnimId IdleAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Idle);
get { public override AnimId WalkAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Walk);
return new AnimId (AnimGroup.Uzi, AnimIndex.UZI_fire); public override AnimId RunAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Run);
}
}
} }
} }

12
Assets/Scripts/Behaviours/Weapons/Minigun.cs
View file

@ -3,16 +3,8 @@ using SanAndreasUnity.Importing.Animation;
namespace SanAndreasUnity.Behaviours.Weapons namespace SanAndreasUnity.Behaviours.Weapons
{ {
public class Minigun : Weapon public class Minigun : Weapon
{ {
public override AnimId AimAnim => new AnimId(AnimGroup.Flame, AnimIndex.FLAME_fire);
// public override AnimId AimAnim { }
// get {
// return new AnimId (AnimGroup.Flame, AnimIndex.FLAME_fire);
// }
// }
}
} }

13
Assets/Scripts/Behaviours/Weapons/Spraycan.cs Normal file
View file

@ -0,0 +1,13 @@
using UnityEngine;
using SanAndreasUnity.Importing.Animation;
namespace SanAndreasUnity.Behaviours.Weapons
{
public class Spraycan : Weapon
{
public override AnimId AimAnim => new AnimId("SPRAYCAN", "spraycan_fire");
public override AnimId IdleAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Idle);
public override AnimId WalkAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Walk);
public override AnimId RunAnim => new AnimId(AnimGroup.WalkCycle, AnimIndex.Run);
}
}

11
Assets/Scripts/Behaviours/Weapons/Spraycan.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cba9c4fe08b8cce47b5c4717f2ca543f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: