Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bdbf864934 | |||
| f269caafed |
@@ -31,17 +31,8 @@
|
|||||||
<Components>
|
<Components>
|
||||||
<c:Animation>
|
<c:Animation>
|
||||||
<AnimationName>ActivateShieldU</AnimationName>
|
<AnimationName>ActivateShieldU</AnimationName>
|
||||||
<Loop>false</Loop>
|
|
||||||
</c:Animation>
|
|
||||||
<c:Transform/>
|
|
||||||
</Components>
|
|
||||||
<Children/>
|
|
||||||
</Entity>
|
|
||||||
<Entity name="Idle">
|
|
||||||
<Components>
|
|
||||||
<c:Animation>
|
|
||||||
<AnimationName>ShieldFrontU</AnimationName>
|
|
||||||
<Play>true</Play>
|
<Play>true</Play>
|
||||||
|
<Loop>false</Loop>
|
||||||
</c:Animation>
|
</c:Animation>
|
||||||
<c:Transform/>
|
<c:Transform/>
|
||||||
</Components>
|
</Components>
|
||||||
@@ -74,16 +65,7 @@
|
|||||||
<Components>
|
<Components>
|
||||||
<c:Animation>
|
<c:Animation>
|
||||||
<AnimationName>ActivateShieldU</AnimationName>
|
<AnimationName>ActivateShieldU</AnimationName>
|
||||||
<Loop>false</Loop>
|
<Play>true</Play>
|
||||||
</c:Animation>
|
|
||||||
<c:Transform/>
|
|
||||||
</Components>
|
|
||||||
<Children/>
|
|
||||||
</Entity>
|
|
||||||
<Entity name="Idle">
|
|
||||||
<Components>
|
|
||||||
<c:Animation>
|
|
||||||
<AnimationName>ShieldFrontU</AnimationName>
|
|
||||||
<Loop>false</Loop>
|
<Loop>false</Loop>
|
||||||
</c:Animation>
|
</c:Animation>
|
||||||
<c:Transform/>
|
<c:Transform/>
|
||||||
|
|||||||
@@ -160,9 +160,9 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsServer) {
|
|
||||||
SpawnerSystem::Spawn(attachment, attachment);
|
SpawnerSystem::Spawn(attachment, attachment);
|
||||||
}
|
|
||||||
|
/*
|
||||||
|
|
||||||
EntityWrapper backAttachment = attachment.FirstChildByName("Back");
|
EntityWrapper backAttachment = attachment.FirstChildByName("Back");
|
||||||
if (backAttachment.Valid()) {
|
if (backAttachment.Valid()) {
|
||||||
@@ -172,7 +172,11 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
|
|||||||
eDeployShieldAttachement.Restart = true;
|
eDeployShieldAttachement.Restart = true;
|
||||||
eDeployShieldAttachement.Start = true;
|
eDeployShieldAttachement.Start = true;
|
||||||
m_EventBroker->Publish(eDeployShieldAttachement);
|
m_EventBroker->Publish(eDeployShieldAttachement);
|
||||||
|
} else {
|
||||||
|
LOG_ERROR("back shield invalid");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
EntityWrapper frontAttachment = attachment.FirstChildByName("Front");
|
EntityWrapper frontAttachment = attachment.FirstChildByName("Front");
|
||||||
if (frontAttachment.Valid()) {
|
if (frontAttachment.Valid()) {
|
||||||
Events::AutoAnimationBlend eDeployShieldAttachement;
|
Events::AutoAnimationBlend eDeployShieldAttachement;
|
||||||
@@ -182,7 +186,10 @@ bool DefenderWeaponBehaviour::OnInputCommand(ComponentWrapper cWeapon, WeaponInf
|
|||||||
eDeployShieldAttachement.Start = true;
|
eDeployShieldAttachement.Start = true;
|
||||||
m_EventBroker->Publish(eDeployShieldAttachement);
|
m_EventBroker->Publish(eDeployShieldAttachement);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
LOG_ERROR("front shield invalid");
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
if (IsClient) {
|
if (IsClient) {
|
||||||
EntityWrapper root = wi.FirstPersonEntity;
|
EntityWrapper root = wi.FirstPersonEntity;
|
||||||
|
|||||||
Reference in New Issue
Block a user