root/BITFALL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
CortexCore
2023-10-20 19:31:12 +08:00
parent 5cd094ed9a
commit a160813262
1878 changed files with 630581 additions and 4485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Artists/Scripts/MeleeService/BITFALL.Melee.asmdef → Assets/Artists/Scripts/MeleeService/BITFALL.Melee.Runtime.asmdef
View File

@@ -1,5 +1,5 @@
{
"name": "BITFALL.Melee",
"name": "BITFALL.Melee.Runtime",
"rootNamespace": "",
"references": [
"GUID:14fe60d984bf9f84eac55c6ea033a8f4",

57
Assets/Artists/Scripts/MeleeService/MeleeService.cs
View File

@@ -43,35 +43,44 @@ namespace BITFALL.Melee
var damaged= new List<IEntity>();
foreach (var x in colliders.Where(x=>x.GetComponent<IDamagable>() is not null))
{
var damageable = x.GetComponent<IDamagable>();
if (damaged.Contains(damageable.Entity) || damageable.Entity.Id == command.PlayerId)
try
{
continue;
}
damaged.Add(damageable.Entity);
damageable.GiveDamage(new DamageMessage()
{
initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity,
damageType = new MeleeDamageMessage
var damageable = x.GetComponent<IDamagable>();
if (damaged.Contains(damageable.Entity) || damageable.Entity.Id == command.PlayerId)
{
},
target = damageable.Entity,
damage = 64,
hit = damageable,
});
var direction = (damageable.Rigidbody.position - (Vector3)command.Position).normalized;
damageable.Rigidbody.AddForceAtPositionAsync(direction * 512 ,command.Position,ForceMode.Impulse).Forget();
continue;
}
if (x.TryGetComponent<ITag>(out var _tag))
{
DI.Get<VFXService>().Spawn(new Location
damaged.Add(damageable.Entity);
damageable.GiveDamage(new DamageMessage()
{
position = x.transform.position,
rotation = Quaternion.identity,
forward = direction
},_tag.GetTags());
initiator = UnityEntitiesService.Get(command.PlayerId) as IEntity,
damageType = new MeleeDamageMessage
{
},
target = damageable.Entity,
damage = command.Damage is 0 ? 64 : command.Damage,
hit = damageable,
});
damageable.Rigidbody.AddForceAtPositionAsync(command.Force, command.Position, ForceMode.Impulse)
.Forget();
if (x.TryGetComponent<ITag>(out var _tag))
{
DI.Get<VFXService>().Spawn(new Location
{
position = x.transform.position,
//rotation = Quaternion.identity,
}, _tag.GetTags());
}
}
catch (UnassignedReferenceException e)
{
Debug.LogWarning(x.name);
Debug.LogException(e);
}
}
}