Combination animation implemented
This commit is contained in:
@@ -444,6 +444,7 @@ public class FollowerController: MonoBehaviour
|
||||
|
||||
public CombinationResult TryCombineItems(Pickup pickupA, out GameObject newItem)
|
||||
{
|
||||
_animator.ResetTrigger("Combine");
|
||||
newItem = null;
|
||||
if (_cachedPickupObject == null)
|
||||
{
|
||||
@@ -466,6 +467,7 @@ public class FollowerController: MonoBehaviour
|
||||
Destroy(pickupA.gameObject);
|
||||
Destroy(pickupB.gameObject);
|
||||
TryPickupItem(newItem, itemData);
|
||||
_animator.SetTrigger("Combine");
|
||||
return CombinationResult.Successful;
|
||||
}
|
||||
|
||||
@@ -539,6 +541,7 @@ public class FollowerController: MonoBehaviour
|
||||
item.transform.SetParent(null);
|
||||
item.SetActive(true);
|
||||
follower.ClearHeldItem();
|
||||
_animator.SetBool("IsCarrying", false);
|
||||
// Optionally: fire event, update UI, etc.
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user