RR/jelito
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on charging system

Browse Source
This commit is contained in:
Brajanowski
2025-07-30 08:26:07 +02:00
parent 61a42bdf10
commit 407454555f
13 changed files with 544 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/RebootKit

Submodule Assets/RebootKit updated: 159e9adcd7...363b20a067

53
Assets/jelycho/Code/Items/EggChargeAction.cs Normal file
View File

@@ -0,0 +1,53 @@
using RebootKit.Engine.Foundation;
using RebootKit.Engine.Simulation;
using RebootReality.jelycho.Player;
namespace RebootReality.jelycho.Items {
public class EggChargeAction : IItemChargeAction {
static readonly Logger s_Logger = new Logger(nameof(EggChargeAction));
public bool OnChargeStart(Actor user, ItemActor itemActor) {
PlayerActor player = user as PlayerActor;
if (player == null) {
return false;
}
if (itemActor.Config.itemType != ItemType.Egg) {
s_Logger.Error($"Item {itemActor.name} is not an egg, cannot charge.");
return false;
}
s_Logger.Info($"Begin charging egg: {itemActor.name} by {user.name}");
return true;
}
public void OnChargeUpdate(Actor user, ItemActor itemActor, float chargeProgress) {
PlayerActor player = user as PlayerActor;
if (player == null) {
return;
}
// Here you can implement the logic for updating the charge progress, e.g. visual effects
s_Logger.Info($"Charging egg: {itemActor.name} by {user.name}, progress: {chargeProgress * 100}%");
}
public void OnChargeEnd(Actor user, ItemActor itemActor, float chargeProgress) {
PlayerActor player = user as PlayerActor;
if (player == null) {
return;
}
s_Logger.Info($"Finished charging egg: {itemActor.name} by {user.name}, final progress: {chargeProgress * 100}%");
}
public void OnChargeCancel(Actor user, ItemActor itemActor) {
PlayerActor player = user as PlayerActor;
if (player == null) {
return;
}
s_Logger.Info($"Charging egg: {itemActor.name} by {user.name} was cancelled.");
}
}
}

3
Assets/jelycho/Code/Items/EggChargeAction.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 4db1d041795f44c3bbecefd644337773
timeCreated: 1753850307

111
Assets/jelycho/Code/Items/Inventory.cs
View File

@@ -6,11 +6,17 @@ namespace RebootReality.jelycho.Items {
public class Inventory {
static readonly Logger s_Logger = new Logger(nameof(Inventory));
class ItemState {
public List<ItemActor> Actors = new List<ItemActor>();
class SlotState {
public ushort ActorID;
public ItemActor Actor;
public void EmptySlot() {
ActorID = 0;
Actor = null;
}
}
readonly ItemState[] m_Items;
readonly SlotState[] m_Slots;
public event Action<ItemActor> OnItemPickedUp = delegate { };
public event Action<ItemActor> OnItemDropped = delegate { };
@@ -18,103 +24,114 @@ namespace RebootReality.jelycho.Items {
public int SlotsCount {
get {
return m_Items.Length;
return m_Slots.Length;
}
}
public Inventory(int slotsCount) {
m_Items = new ItemState[slotsCount];
m_Slots = new SlotState[slotsCount];
for (int i = 0; i < slotsCount; i++) {
m_Items[i] = new ItemState();
m_Slots[i] = new SlotState();
}
}
//
// @MARK: Server API
//
public bool TryPickup(ItemActor actor) {
if (Contains(actor)) {
s_Logger.Error($"Item {actor.name} is already in the inventory.");
return false;
}
(int slotIndex, ItemState freeItemState) = FindFreeItemState();
(int slotIndex, SlotState freeItemState) = FindFreeItemState();
if (freeItemState == null) {
s_Logger.Error("Inventory is full, cannot pick up item.");
return false;
}
freeItemState.Actors.Add(actor);
freeItemState.Actor = actor;
OnItemPickedUp?.Invoke(actor);
OnSlotUpdated?.Invoke(slotIndex);
return true;
}
public bool TryDrop(ItemActor actor) {
for (int i = 0; i < m_Items.Length; i++) {
if (m_Items[i].Actors.Remove(actor)) {
OnItemDropped?.Invoke(actor);
OnSlotUpdated?.Invoke(i);
return true;
}
}
s_Logger.Error($"Item {actor.name} is not in the inventory.");
return false;
}
public ItemActor TryDropOne(int slotIndex) {
if (slotIndex < 0 || slotIndex >= m_Items.Length) {
public bool TryDrop(int slotIndex, out ItemActor actor) {
if (slotIndex < 0 || slotIndex >= m_Slots.Length) {
s_Logger.Error($"Slot index {slotIndex} is out of range.");
return null;
actor = null;
return false;
}
if (m_Items[slotIndex].Actors.Count == 0) {
if (m_Slots[slotIndex].Actor == null) {
s_Logger.Error($"No items in slot {slotIndex} to drop.");
return null;
actor = null;
return false;
}
ItemActor actor = m_Items[slotIndex].Actors[0];
m_Items[slotIndex].Actors.RemoveAt(0);
actor = m_Slots[slotIndex].Actor;
m_Slots[slotIndex].Actor = null;
OnItemDropped?.Invoke(actor);
OnSlotUpdated?.Invoke(slotIndex);
return actor;
}
public int GetQuantity(int slotIndex) {
if (slotIndex < 0 || slotIndex >= m_Items.Length) {
//
// @MARK: Common API
//
public void SetItem(int slotIndex, ItemActor actor) {
if (slotIndex < 0 || slotIndex >= m_Slots.Length) {
throw new ArgumentOutOfRangeException(nameof(slotIndex), "Slot index is out of range.");
}
return m_Items[slotIndex].Actors.Count;
if (actor == null) {
m_Slots[slotIndex].EmptySlot();
OnSlotUpdated?.Invoke(slotIndex);
return;
}
if (Contains(actor)) {
s_Logger.Error($"Item {actor.name} is already in the inventory.");
return;
}
m_Slots[slotIndex].Actor = actor;
m_Slots[slotIndex].ActorID = actor.ActorID;
OnSlotUpdated?.Invoke(slotIndex);
}
public ItemActor GetFirstItem(int slotIndex) {
if (slotIndex < 0 || slotIndex >= m_Items.Length) {
public ItemActor GetItem(int slotIndex) {
if (slotIndex < 0 || slotIndex >= m_Slots.Length) {
throw new ArgumentOutOfRangeException(nameof(slotIndex), "Slot index is out of range.");
}
if (m_Items[slotIndex].Actors.Count > 0) {
return m_Items[slotIndex].Actors[0];
}
return null;
return m_Slots[slotIndex].Actor;
}
public bool Contains(ItemActor actor) {
for (int i = 0; i < m_Items.Length; i++) {
if (m_Items[i].Actors.Contains(actor)) {
for (int i = 0; i < m_Slots.Length; i++) {
if (m_Slots[i].Actor == actor) {
return true;
}
}
return false;
}
(int, ItemState) FindFreeItemState() {
for (int i = 0; i < m_Items.Length; i++) {
if (m_Items[i].Actors.Count == 0) {
return (i, m_Items[i]);
(int slot, SlotState state) FindFreeItemState() {
for (int i = 0; i < m_Slots.Length; i++) {
if (m_Slots[i].Actor == null) {
return (i, m_Slots[i]);
}
}
return (-1, null);
}
//
// @MARK: Client API
//
}
}

12
Assets/jelycho/Code/Items/ItemConfig.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.ComponentModel.DataAnnotations;
using RebootKit.Engine.Simulation;
using UnityEngine;
namespace RebootReality.jelycho.Items {
@@ -9,6 +10,13 @@ namespace RebootReality.jelycho.Items {
Sword = 2,
}
public interface IItemChargeAction {
bool OnChargeStart(Actor user, ItemActor itemActor);
void OnChargeUpdate(Actor user, ItemActor itemActor, float chargeProgress);
void OnChargeEnd(Actor user, ItemActor itemActor, float chargeProgress);
void OnChargeCancel(Actor user, ItemActor itemActor);
}
[Serializable]
public class ItemConfig {
public ItemType itemType = ItemType.Neutral;
@@ -18,7 +26,9 @@ namespace RebootReality.jelycho.Items {
[Header("Chargeable")]
public bool isChargeable = false;
public float chargeDuration = 0.5f;
public float minChargeDuration = 0.1f;
public float maxChargeDuration = 1.0f;
public float chargeCooldown = 1.0f;
[SerializeReference] public IItemChargeAction chargeAction;
}
}

25
Assets/jelycho/Code/Player/HUD/PlayerInventoryUI.cs
View File

@@ -19,7 +19,6 @@ namespace RebootReality.jelycho.Player.HUD {
public VisualElement Root;
public VisualElement Slot;
public VisualElement Icon;
public Label QuantityLabel;
}
readonly List<InventorySlot> m_InventorySlots = new List<InventorySlot>();
@@ -43,13 +42,11 @@ namespace RebootReality.jelycho.Player.HUD {
InventorySlot slot = new InventorySlot {
Root = slotRoot,
Slot = slotRoot.Q<VisualElement>("player-hud__inventory-slot"),
Icon = slotRoot.Q<VisualElement>("player-hud__inventory-slot-icon"),
QuantityLabel = slotRoot.Q<Label>("player-hud__inventory-slot-quantity"),
Icon = slotRoot.Q<VisualElement>("player-hud__inventory-slot-icon")
};
Assert.IsNotNull(slot.Root, "Slot root cannot be null");
Assert.IsNotNull(slot.Slot, "Slot element cannot be null");
Assert.IsNotNull(slot.Icon, "Slot icon cannot be null");
Assert.IsNotNull(slot.QuantityLabel, "Slot quantity label cannot be null");
m_InventorySlots.Add(slot);
OnSlotUpdated(i);
@@ -86,25 +83,15 @@ namespace RebootReality.jelycho.Player.HUD {
s_Logger.Error($"Invalid slot index: {slotIndex}. Inventory has {m_InventorySlots.Count} slots.");
return;
}
int quantity = m_Inventory.GetQuantity(slotIndex);
if (quantity <= 0) {
m_InventorySlots[slotIndex].QuantityLabel.style.display = DisplayStyle.None;
ItemActor itemActor = m_Inventory.GetItem(slotIndex);
if (itemActor == null) {
m_InventorySlots[slotIndex].Icon.style.backgroundImage = null;
m_InventorySlots[slotIndex].Icon.style.display = DisplayStyle.None;
} else {
m_InventorySlots[slotIndex].QuantityLabel.style.display = DisplayStyle.Flex;
m_InventorySlots[slotIndex].QuantityLabel.text = quantity.ToString();
ItemActor itemActor = m_Inventory.GetFirstItem(slotIndex);
if (itemActor != null) {
m_InventorySlots[slotIndex].Icon.style.backgroundImage = new StyleBackground(itemActor.Config.icon);
m_InventorySlots[slotIndex].Icon.style.display = DisplayStyle.Flex;
} else {
m_InventorySlots[slotIndex].Icon.style.backgroundImage = null;
m_InventorySlots[slotIndex].Icon.style.display = DisplayStyle.None;
}
m_InventorySlots[slotIndex].Icon.style.backgroundImage = new StyleBackground(itemActor.Config.icon);
m_InventorySlots[slotIndex].Icon.style.display = DisplayStyle.Flex;
}
}
}

499
Assets/jelycho/Code/Player/PlayerActor.cs
View File

@@ -1,4 +1,5 @@
using R3;
using System;
using R3;
using RebootKit.Engine.Extensions;
using RebootKit.Engine.Foundation;
using RebootKit.Engine.Main;
@@ -11,6 +12,16 @@ using UnityEngine;
using Logger = RebootKit.Engine.Foundation.Logger;
namespace RebootReality.jelycho.Player {
[Serializable]
struct PlayerItemTypeHandsAnimationsConfig {
public ItemType itemType;
// @TODO: Cache hashes for state names
public string idle;
public string charging;
public string chargedUse;
}
public class PlayerActor : Actor {
static readonly Logger s_Logger = new Logger(nameof(PlayerActor));
@@ -48,6 +59,13 @@ namespace RebootReality.jelycho.Player {
float m_CharacterTurnVelocity = 0.0f;
[Header("Animations")]
[SerializeField] int m_HandsLayerIndex;
[SerializeField] PlayerItemTypeHandsAnimationsConfig[] m_ItemTypeHandsAnimations;
[SerializeField] PlayerItemTypeHandsAnimationsConfig m_DefaultItemHandsAnimations;
[SerializeField] string m_HandsIdleStateName = "Hands Locomotion";
[Header("Dragging")]
[SerializeField] Transform m_DragGutStartPosition;
[SerializeField] PhysicsObjectDragger m_PhysicsDragger;
@@ -73,10 +91,12 @@ namespace RebootReality.jelycho.Player {
[SerializeField] int m_InventorySize = 10;
public Inventory Inventory { get; private set; }
public ReactiveProperty<int> SelectedInventorySlot { get; private set; } = new ReactiveProperty<int>(0);
ItemActor m_EquippedItem;
public ReactiveProperty<int> SelectedInventorySlot { get; private set; } = new ReactiveProperty<int>(0);
bool m_IsCharging;
float m_ChargeTimer;
public float3 LookDirection {
get {
@@ -120,142 +140,6 @@ namespace RebootReality.jelycho.Player {
Inventory.OnItemDropped -= OnItemDropped;
}
//
// @MARK: Actor
//
public override void OnServerTick(float deltaTime) {
base.OnServerTick(deltaTime);
NativeArray<byte> remoteStateData = DataSerializationUtils.Serialize(m_RemoteState);
SendActorEvent((byte) PlayerActorEvents.UpdatedRemoteState, remoteStateData);
}
public override void OnClientTick(float deltaTime) {
base.OnClientTick(deltaTime);
if (m_IsSetupAsOwner) {
TickCamera();
UpdateAnimator(m_Locomotion.Velocity);
SenseInteractable();
m_SyncRemoteStateTimer -= deltaTime;
if (m_SyncRemoteStateTimer <= 0.0f) {
m_SyncRemoteStateTimer = 1.0f / NetworkSystem.TickRate.IndexValue;
RemotePlayerActorState remoteState = new RemotePlayerActorState {
Position = transform.position,
Velocity = m_Locomotion.Velocity,
LookPitch = m_Camera.Pitch,
LookYaw = m_Camera.Yaw,
IsGrounded = m_Locomotion.IsGrounded
};
NativeArray<byte> data = DataSerializationUtils.Serialize(remoteState);
SendActorCommand((byte) PlayerActorCommands.UpdateRemoteState, data);
}
} else {
InterpolateActorState(deltaTime);
}
TickCharacterRotation();
}
protected override void OnActorCommandServer(ulong senderID, ActorCommand actorCommand) {
switch ((PlayerActorCommands)actorCommand.CommandID) {
case PlayerActorCommands.UpdateRemoteState: {
RemotePlayerActorState remoteState = new RemotePlayerActorState();
DataSerializationUtils.Deserialize(actorCommand.Data, ref remoteState);
m_RemoteState = remoteState;
break;
}
case PlayerActorCommands.PickupItem: {
PlayerActorPickupItemCommand command = new PlayerActorPickupItemCommand();
DataSerializationUtils.Deserialize(actorCommand.Data, ref command);
Actor itemActor = RR.FindSpawnedActor(command.ItemActorID);
if (itemActor is ItemActor item) {
if (math.distancesq(itemActor.transform.position, m_HeadBoneTransform.position) <=
m_ItemPickupDistance * m_ItemPickupDistance) {
if (Inventory.TryPickup(item)) {
s_Logger.Info($"Item {item.name} picked up successfully by player {name}.");
UpdateEquippedItem();
} else {
s_Logger.Info($"Failed to pick up item {item.name}. Inventory is full.");
}
} else {
s_Logger.Info($"Item actor {item.name} is too far away to pick up.");
}
} else {
s_Logger.Error($"Item actor with ID {command.ItemActorID} not found.");
}
break;
}
case PlayerActorCommands.SelectItemSlot: {
PlayerActorSelectItemSlotCommand command = new PlayerActorSelectItemSlotCommand();
DataSerializationUtils.Deserialize(actorCommand.Data, ref command);
if (command.SlotIndex < 0 || command.SlotIndex >= Inventory.SlotsCount) {
s_Logger.Error($"Invalid slot index {command.SlotIndex}. Must be between 0 and {Inventory.SlotsCount - 1}.");
return;
}
SelectedInventorySlot.Value = command.SlotIndex;
UpdateEquippedItem();
break;
}
case PlayerActorCommands.DropItem: {
PlayerActorDropItemCommand command = new PlayerActorDropItemCommand();
DataSerializationUtils.Deserialize(actorCommand.Data, ref command);
if (command.Count == 1) {
Inventory.TryDropOne(command.InventorySlotIndex);
} else {
s_Logger.Error("DropItem command with count != 1 is not supported yet.");
}
break;
}
}
}
protected override void OnActorEventClient(ActorEvent actorEvent) {
base.OnActorEventClient(actorEvent);
switch ((PlayerActorEvents)actorEvent.EventID) {
case PlayerActorEvents.UpdatedRemoteState: {
RemotePlayerActorState remoteState = new RemotePlayerActorState();
DataSerializationUtils.Deserialize(actorEvent.Data, ref remoteState);
m_RemoteState = remoteState;
break;
}
case PlayerActorEvents.PrimaryEquippedItemChanged: {
PlayerActorPrimaryEquippedItemChangedEvent itemChangedEvent =
new PlayerActorPrimaryEquippedItemChangedEvent();
DataSerializationUtils.Deserialize(actorEvent.Data, ref itemChangedEvent);
if (itemChangedEvent.ItemActorID == 0) {
m_EquippedItem = null;
} else {
Actor itemActor = RR.FindSpawnedActor(itemChangedEvent.ItemActorID);
if (itemActor is ItemActor item) {
s_Logger.Info($"Primary equipped item changed to {item.name} for player {name}.");
m_EquippedItem = item;
} else {
s_Logger.Error($"Primary equipped item with ID {itemChangedEvent.ItemActorID} not found.");
}
}
break;
}
default:
s_Logger.Error("Invalid actor event received: " + actorEvent.EventID);
break;
}
}
//
// @MARK: Controller API
//
@@ -314,7 +198,7 @@ namespace RebootReality.jelycho.Player {
m_PhysicsDragger.Drop();
}
public void DropItem() {
if (!m_IsSetupAsOwner) {
s_Logger.Error("Cannot drop item when not set up as owner.");
@@ -323,30 +207,98 @@ namespace RebootReality.jelycho.Player {
if (m_EquippedItem != null) {
PlayerActorDropItemCommand command = new PlayerActorDropItemCommand {
InventorySlotIndex = SelectedInventorySlot.Value,
Count = 1
InventorySlotIndex = (byte) SelectedInventorySlot.Value
};
SendActorCommand((byte) PlayerActorCommands.DropItem, ref command);
}
}
public void PrimaryAction() {
PlayerItemTypeHandsAnimationsConfig GetHandsAnimationsConfig(ItemType itemType) {
foreach (PlayerItemTypeHandsAnimationsConfig config in m_ItemTypeHandsAnimations) {
if (config.itemType == itemType) {
return config;
}
}
return m_DefaultItemHandsAnimations;
}
void SetHandsIdleAnimation() {
if (m_EquippedItem != null) {
PlayerItemTypeHandsAnimationsConfig animationsConfig =
GetHandsAnimationsConfig(m_EquippedItem.Config.itemType);
m_Animator.CrossFade(animationsConfig.idle, 0.0f, m_HandsLayerIndex);
} else {
m_Animator.CrossFade(m_HandsIdleStateName, 0.0f, m_HandsLayerIndex);
}
}
void SetChargingAnimation() {
if (m_EquippedItem != null) {
PlayerItemTypeHandsAnimationsConfig animationsConfig =
GetHandsAnimationsConfig(m_EquippedItem.Config.itemType);
m_Animator.CrossFade(animationsConfig.charging, 0.0f, m_HandsLayerIndex);
}
}
void SetChargedUseAnimation() {
if (m_EquippedItem != null) {
PlayerItemTypeHandsAnimationsConfig animationsConfig =
GetHandsAnimationsConfig(m_EquippedItem.Config.itemType);
m_Animator.CrossFade(animationsConfig.chargedUse, 0.0f, m_HandsLayerIndex);
}
}
public void BeginPrimaryAction() {
if (!m_IsSetupAsOwner) {
s_Logger.Error("Cannot perform primary action when not set up as owner.");
s_Logger.Error("Cannot begin primary action when not set up as owner.");
return;
}
// if (!IsOwner()) {
// s_Logger.Error("Only the owner can perform primary actions.");
// return;
// }
// if (TryGetBeaconPosition(out Vector3 beaconPosition)) {
// SetAnimatorTriggerRpc(AnimatorParamHashes.Throw);
//
// if (RR.World.Context is WorldContext worldContext) {
// worldContext.BaseManager.TrySpawnBeacon(beaconPosition);
// }
// }
if (m_EquippedItem == null) {
return;
}
if (m_EquippedItem.Config.chargeAction != null && m_EquippedItem.Config.isChargeable) {
if (m_EquippedItem.Config.chargeAction.OnChargeStart(this, m_EquippedItem)) {
m_IsCharging = true;
m_ChargeTimer = 0.0f;
SetChargingAnimation();
}
}
}
float GetChargeProgress() {
if (m_EquippedItem == null || !m_EquippedItem.Config.isChargeable) {
return 0.0f;
}
float chargeProgress = Mathf.InverseLerp(m_EquippedItem.Config.minChargeDuration,
m_EquippedItem.Config.maxChargeDuration,
m_ChargeTimer);
return Mathf.Clamp01(chargeProgress);
}
public void EndPrimaryAction() {
if (!m_IsSetupAsOwner) {
s_Logger.Error("Cannot end primary action when not set up as owner.");
return;
}
if (m_IsCharging) {
ItemConfig itemConfig = m_EquippedItem.Config;
if (m_ChargeTimer >= itemConfig.minChargeDuration) {
float chargeProgress = GetChargeProgress();
itemConfig.chargeAction.OnChargeEnd(this, m_EquippedItem, chargeProgress);
SetChargedUseAnimation();
} else {
itemConfig.chargeAction.OnChargeCancel(this, m_EquippedItem);
SetHandsIdleAnimation();
}
m_IsCharging = false;
}
}
public void SecondaryAction() {
@@ -355,7 +307,13 @@ namespace RebootReality.jelycho.Player {
return;
}
m_Animator.SetTrigger(AnimatorParamHashes.Block);
if (m_IsCharging) {
m_EquippedItem.Config.chargeAction.OnChargeCancel(this, m_EquippedItem);
m_IsCharging = false;
m_ChargeTimer = 0.0f;
SetHandsIdleAnimation();
}
}
public void Interact() {
@@ -372,6 +330,171 @@ namespace RebootReality.jelycho.Player {
}
}
//
// @MARK: Actor
//
public override void OnServerTick(float deltaTime) {
base.OnServerTick(deltaTime);
NativeArray<byte> remoteStateData = DataSerializationUtils.Serialize(m_RemoteState);
SendActorEvent((byte) PlayerActorEvents.UpdatedRemoteState, remoteStateData);
}
public override void OnClientTick(float deltaTime) {
base.OnClientTick(deltaTime);
if (m_IsSetupAsOwner) {
TickCamera();
UpdateAnimator(m_Locomotion.Velocity);
SenseInteractable();
if (m_IsCharging) {
m_ChargeTimer += deltaTime;
m_EquippedItem.Config.chargeAction.OnChargeUpdate(this, m_EquippedItem, GetChargeProgress());
}
m_SyncRemoteStateTimer -= deltaTime;
if (m_SyncRemoteStateTimer <= 0.0f) {
m_SyncRemoteStateTimer = 1.0f / NetworkSystem.TickRate.IndexValue;
RemotePlayerActorState remoteState = new RemotePlayerActorState {
Position = transform.position,
Velocity = m_Locomotion.Velocity,
LookPitch = m_Camera.Pitch,
LookYaw = m_Camera.Yaw,
IsGrounded = m_Locomotion.IsGrounded
};
NativeArray<byte> data = DataSerializationUtils.Serialize(remoteState);
SendActorCommand((byte) PlayerActorCommands.UpdateRemoteState, data);
}
} else {
InterpolateActorState(deltaTime);
}
TickCharacterRotation();
}
protected override void OnActorCommandServer(ulong senderID, ActorCommand actorCommand) {
switch ((PlayerActorCommands) actorCommand.CommandID) {
case PlayerActorCommands.UpdateRemoteState: {
RemotePlayerActorState remoteState = new RemotePlayerActorState();
DataSerializationUtils.Deserialize(actorCommand.Data, ref remoteState);
m_RemoteState = remoteState;
break;
}
case PlayerActorCommands.PickupItem: {
PlayerActorPickupItemCommand command = new PlayerActorPickupItemCommand();
DataSerializationUtils.Deserialize(actorCommand.Data, ref command);
Actor itemActor = RR.FindSpawnedActor(command.ItemActorID);
if (itemActor is ItemActor item) {
if (math.distancesq(itemActor.transform.position, m_HeadBoneTransform.position) <=
m_ItemPickupDistance * m_ItemPickupDistance) {
if (Inventory.TryPickup(item)) {
s_Logger.Info($"Item {item.name} picked up successfully by player {name}.");
UpdateEquippedItem();
} else {
s_Logger.Info($"Failed to pick up item {item.name}. Inventory is full.");
}
} else {
s_Logger.Info($"Item actor {item.name} is too far away to pick up.");
}
} else {
s_Logger.Error($"Item actor with ID {command.ItemActorID} not found.");
}
break;
}
case PlayerActorCommands.SelectItemSlot: {
PlayerActorSelectItemSlotCommand command = new PlayerActorSelectItemSlotCommand();
DataSerializationUtils.Deserialize(actorCommand.Data, ref command);
if (command.SlotIndex < 0 || command.SlotIndex >= Inventory.SlotsCount) {
s_Logger.Error($"Invalid slot index {command.SlotIndex}. Must be between 0 and {Inventory.SlotsCount - 1}.");
return;
}
SelectedInventorySlot.Value = command.SlotIndex;
UpdateEquippedItem();
break;
}
case PlayerActorCommands.DropItem: {
PlayerActorDropItemCommand command = new PlayerActorDropItemCommand();
DataSerializationUtils.Deserialize(actorCommand.Data, ref command);
Inventory.TryDrop(command.InventorySlotIndex, out _);
break;
}
}
}
protected override void OnActorEventClient(ActorEvent actorEvent) {
base.OnActorEventClient(actorEvent);
switch ((PlayerActorEvents) actorEvent.EventID) {
case PlayerActorEvents.UpdatedRemoteState: {
RemotePlayerActorState remoteState = new RemotePlayerActorState();
DataSerializationUtils.Deserialize(actorEvent.Data, ref remoteState);
m_RemoteState = remoteState;
break;
}
case PlayerActorEvents.PrimaryEquippedItemChanged: {
PlayerActorPrimaryEquippedItemChangedEvent itemChangedEvent =
new PlayerActorPrimaryEquippedItemChangedEvent();
DataSerializationUtils.Deserialize(actorEvent.Data, ref itemChangedEvent);
if (itemChangedEvent.ItemActorID == 0) {
m_EquippedItem = null;
} else {
Actor itemActor = RR.FindSpawnedActor(itemChangedEvent.ItemActorID);
if (itemActor is ItemActor item) {
s_Logger.Info($"Primary equipped item changed to {item.name} for player {name}.");
m_EquippedItem = item;
} else {
s_Logger.Error($"Primary equipped item with ID {itemChangedEvent.ItemActorID} not found.");
}
}
SetHandsIdleAnimation();
break;
}
case PlayerActorEvents.UpdateInventory: {
if (RR.IsServer()) {
break;
}
PlayerUpdateInventoryEvent updateInventoryEvent = new PlayerUpdateInventoryEvent();
DataSerializationUtils.Deserialize(actorEvent.Data, ref updateInventoryEvent);
for (int i = 0; i < Inventory.SlotsCount; i++) {
ushort actorID = updateInventoryEvent.SlotsActorIDs[i];
if (actorID == 0) {
Inventory.SetItem(i, null);
} else {
Actor itemActor = RR.FindSpawnedActor(actorID);
if (itemActor is ItemActor item) {
Inventory.SetItem(i, item);
} else {
s_Logger.Error($"Item actor with ID {actorID} not found for inventory slot {i}.");
}
}
}
break;
}
default:
s_Logger.Error("Invalid actor event received: " + actorEvent.EventID);
break;
}
}
//
// @MARK: Owner
//
@@ -456,13 +579,28 @@ namespace RebootReality.jelycho.Player {
//
// @MARK: Server
//
void SendInventoryState() {
if (!RR.IsServer()) {
s_Logger.Error("Only the server can send inventory state.");
return;
}
PlayerUpdateInventoryEvent updateInventoryEvent = new PlayerUpdateInventoryEvent();
updateInventoryEvent.SlotsActorIDs = new NativeArray<ushort>(Inventory.SlotsCount, Allocator.Temp);
for (int i = 0; i < Inventory.SlotsCount; i++) {
updateInventoryEvent.SlotsActorIDs[i] = Inventory.GetItem(i)?.ActorID ?? (ushort) 0;
}
SendActorEvent((byte) PlayerActorEvents.UpdateInventory, ref updateInventoryEvent);
}
void OnItemDropped(ItemActor item) {
if (!RR.IsServer()) {
return;
}
// @BUG: Sometimes the item will not update it's physics state and will keep floating in the air. It's rare?
UpdateEquippedItem();
item.SetHidden(false);
@@ -470,6 +608,8 @@ namespace RebootReality.jelycho.Player {
item.transform.position = m_HeadBoneTransform.position + m_HeadBoneTransform.forward * 1.0f;
item.transform.rotation = Quaternion.LookRotation(m_HeadBoneTransform.forward, Vector3.up);
SendInventoryState();
}
void OnItemPickedUp(ItemActor item) {
@@ -478,6 +618,7 @@ namespace RebootReality.jelycho.Player {
}
item.SetHidden(true);
SendInventoryState();
}
void UpdateEquippedItem() {
@@ -486,7 +627,7 @@ namespace RebootReality.jelycho.Player {
return;
}
ItemActor itemActor = Inventory.GetFirstItem(SelectedInventorySlot.Value);
ItemActor itemActor = Inventory.GetItem(SelectedInventorySlot.Value);
if (itemActor == m_EquippedItem) {
return;
}
@@ -504,9 +645,11 @@ namespace RebootReality.jelycho.Player {
PlayerActorPrimaryEquippedItemChangedEvent itemChangedEvent =
new PlayerActorPrimaryEquippedItemChangedEvent {
ItemActorID = m_EquippedItem != null ? m_EquippedItem.ActorID : (ushort)0
ItemActorID = m_EquippedItem != null ? m_EquippedItem.ActorID : (ushort) 0
};
SendActorEvent((byte) PlayerActorEvents.PrimaryEquippedItemChanged, ref itemChangedEvent);
SetHandsIdleAnimation();
}
public void WarpTo(Vector3 position) {
@@ -682,12 +825,12 @@ namespace RebootReality.jelycho.Player {
m_Animator.SetInteger(AnimatorParamHashes.Holding, 1);
}
}
public class PlayerActorData : IActorData {
public void Serialize(NetworkBufferWriter writer) { }
public void Deserialize(NetworkBufferReader reader) { }
public int GetMaxBytes() {
return 0;
}
@@ -720,7 +863,7 @@ namespace RebootReality.jelycho.Player {
return sizeof(float) * 3 + // Position;
sizeof(float) * 3 + // Velocity
sizeof(float) * 2 + // LookPitch, LookYaw
sizeof(bool); // IsGrounded
sizeof(bool); // IsGrounded
}
}
@@ -751,21 +894,18 @@ namespace RebootReality.jelycho.Player {
}
struct PlayerActorDropItemCommand : IActorData {
public int InventorySlotIndex;
public int Count;
public byte InventorySlotIndex;
public void Serialize(NetworkBufferWriter writer) {
writer.Write(InventorySlotIndex);
writer.Write(Count);
}
public void Deserialize(NetworkBufferReader reader) {
reader.Read(out InventorySlotIndex);
reader.Read(out Count);
}
public int GetMaxBytes() {
return sizeof(int) * 2; // InventorySlotIndex, Count
return sizeof(byte);
}
}
@@ -795,7 +935,7 @@ namespace RebootReality.jelycho.Player {
public void Deserialize(NetworkBufferReader reader) {
reader.Read(out SlotIndex);
}
public int GetMaxBytes() {
return sizeof(int); // SlotIndex
}
@@ -806,6 +946,7 @@ namespace RebootReality.jelycho.Player {
None = 0x00,
PrimaryEquippedItemChanged = 0x01,
UpdatedRemoteState = 0x02,
UpdateInventory = 0x03,
}
struct PlayerActorPrimaryEquippedItemChangedEvent : IActorData {
@@ -823,4 +964,28 @@ namespace RebootReality.jelycho.Player {
return sizeof(ushort); // ItemActorID
}
}
struct PlayerUpdateInventoryEvent : IActorData {
public NativeArray<ushort> SlotsActorIDs;
public void Serialize(NetworkBufferWriter writer) {
writer.Write((byte) SlotsActorIDs.Length);
for (int i = 0; i < SlotsActorIDs.Length; i++) {
writer.Write(SlotsActorIDs[i]);
}
}
public void Deserialize(NetworkBufferReader reader) {
reader.Read(out byte slotsCount);
SlotsActorIDs = new NativeArray<ushort>(slotsCount, Allocator.Temp);
for (int i = 0; i < slotsCount; i++) {
reader.Read(out ushort actorID);
SlotsActorIDs[i] = actorID;
}
}
public int GetMaxBytes() {
return sizeof(byte) + SlotsActorIDs.Length * sizeof(ushort);
}
}
}

6
Assets/jelycho/Code/Player/PlayerController.cs
View File

@@ -128,8 +128,12 @@ namespace RebootReality.jelycho.Player {
m_Actor.DropItem();
}
if (m_Config.primaryActionReference.action.WasPressedThisFrame()) {
m_Actor.BeginPrimaryAction();
}
if (m_Config.primaryActionReference.action.WasReleasedThisFrame()) {
m_Actor.PrimaryAction();
m_Actor.EndPrimaryAction();
}
if (m_Config.secondaryActionReference.action.WasReleasedThisFrame()) {

116
Assets/jelycho/Worlds/dev/scn_map_dev.unity
View File

@@ -3131,7 +3131,7 @@ MonoBehaviour:
m_SubObjectGUID:
m_SubObjectType:
m_EditorAssetChanged: 0
m_Count: 256
m_Count: 10
m_SpawnPoints: []
--- !u!4 &1152925070
Transform:
@@ -4292,119 +4292,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}
--- !u!1001 &1803449077
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 194118488272484514, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 611922230303722876, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_Name
value: beacon_0
objectReference: {fileID: 0}
- target: {fileID: 1553563146403112987, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: <ActorID>k__BackingField
value: 28290
objectReference: {fileID: 0}
- target: {fileID: 2308339341351866705, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalScale.x
value: 21.469913
objectReference: {fileID: 0}
- target: {fileID: 2308339341351866705, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalScale.y
value: 21.469913
objectReference: {fileID: 0}
- target: {fileID: 2308339341351866705, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalScale.z
value: 21.469913
objectReference: {fileID: 0}
- target: {fileID: 2308339341351866705, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.x
value: -0.046736
objectReference: {fileID: 0}
- target: {fileID: 2308339341351866705, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.y
value: -0.90701
objectReference: {fileID: 0}
- target: {fileID: 2308339341351866705, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.z
value: -0.0097818
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.x
value: 4.7630744
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5007223
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.z
value: 7.6343584
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5368312062609190479, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6671416681996750347, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalScale.x
value: 5.7499223
objectReference: {fileID: 0}
- target: {fileID: 6671416681996750347, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalScale.y
value: 5.7499223
objectReference: {fileID: 0}
- target: {fileID: 6671416681996750347, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalScale.z
value: 5.7499223
objectReference: {fileID: 0}
- target: {fileID: 6671416681996750347, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.x
value: -0.51372
objectReference: {fileID: 0}
- target: {fileID: 6671416681996750347, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.y
value: -0.50238
objectReference: {fileID: 0}
- target: {fileID: 6671416681996750347, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
propertyPath: m_LocalPosition.z
value: -0.10753
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3}
--- !u!1 &1913099148
GameObject:
m_ObjectHideFlags: 0
@@ -5059,6 +4946,5 @@ SceneRoots:
- {fileID: 355652068}
- {fileID: 841619662}
- {fileID: 177390763}
- {fileID: 1803449077}
- {fileID: 634762288}
- {fileID: 355103136}

21
Assets/jelycho/core/Items/item_egg.prefab
View File

@@ -50,22 +50,35 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<SourceActorPath>k__BackingField:
<ActorID>k__BackingField: 5061208986541388439
<ActorStaticID>k__BackingField: 4966572228587685792
<ActorID>k__BackingField: 29335
m_ActorName: Egg
actorRigidbody: {fileID: 6762445103522978435}
m_OverrideActorColliders: []
m_SetKinematicOnMount: 1
m_DisableCollidersOnMount: 1
transformSyncMode: 59
syncTransform: 1
syncPosition: 1
syncRotation: 1
syncScale: 0
m_AttachmentSockets: []
<Config>k__BackingField:
itemType: 1
icon: {fileID: 22319203, guid: 72d716a5a5f582f43b585b9599f6ecf2, type: 3}
characterEquippedMountSlotName: hand_right
isChargeable: 0
chargeDuration: 0.5
isChargeable: 1
minChargeDuration: 0.1
maxChargeDuration: 1
chargeCooldown: 1
chargeAction:
rid: 6725240519461962327
m_HighlightEffect: {fileID: 3112011596488648805}
references:
version: 2
RefIds:
- rid: 6725240519461962327
type: {class: EggChargeAction, ns: RebootReality.jelycho.Items, asm: RebootReality.jelycho}
data:
--- !u!54 &6762445103522978435
Rigidbody:
m_ObjectHideFlags: 0

3
Assets/jelycho/core/hud/hud_inventory_slot_template.uxml
View File

@@ -1,6 +1,5 @@
<engine:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:engine="UnityEngine.UIElements" xmlns:editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<engine:VisualElement name="player-hud__inventory-slot" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0.7);">
<engine:VisualElement name="player-hud__inventory-slot-icon" style="flex-grow: 1; background-image: url(&quot;project://database/Assets/jelycho/Items/Shikashi&apos;s%20Fantasy%20Icons%20Pack%20v2/BG%2011.png?fileID=-137324388&amp;guid=72d716a5a5f582f43b585b9599f6ecf2&amp;type=3#jd_item_sword&quot;); margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px;" />
<engine:Label text="1" name="player-hud__inventory-slot-quantity" style="position: absolute; flex-direction: column; color: rgb(255, 255, 255); -unity-text-outline-color: rgba(0, 0, 0, 0.64); -unity-text-outline-width: 1px; -unity-font-style: bold; font-size: 20px; top: auto; left: auto; right: 0; bottom: 0; -unity-text-align: lower-right;" />
<engine:VisualElement name="player-hud__inventory-slot-icon" style="flex-grow: 1; background-image: url(&quot;project://database/Assets/jelycho/core/items/Shikashi&apos;s%20Fantasy%20Icons%20Pack%20v2/BG%2011.png?fileID=-137324388&amp;guid=72d716a5a5f582f43b585b9599f6ecf2&amp;type=3#jd_item_sword&quot;); margin-top: 2px; margin-right: 2px; margin-bottom: 2px; margin-left: 2px;" />
</engine:VisualElement>
</engine:UXML>

8
Assets/jelycho/core/player/a_player.prefab
View File

@@ -762,6 +762,14 @@ MonoBehaviour:
m_CharacterRotateSoftAngle: 75
m_CharacterRotateSpeed: 180
m_CharacterRotateFastSpeed: 720
m_HandsLayerIndex: 2
m_ItemTypeHandsAnimations: []
m_DefaultItemHandsAnimations:
itemType: 0
idle: Right_Hand_Hold_Idle
charging: Right_Hand_Hold_Charged
chargedUse: Right_Hand_Hold_Throw
m_HandsIdleStateName: Hands Locomotion
m_DragGutStartPosition: {fileID: 0}
m_PhysicsDragger: {fileID: 2402344678768307677}
m_DragDistanceRange:

182
Assets/jelycho/core/player/animator_player.controller
View File

@@ -60,8 +60,7 @@ AnimatorState:
m_Name: Attack
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -8330573370938196597}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -77,28 +76,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8330573370938196597
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.9347826
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-7843561725900691380
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -134,8 +111,7 @@ AnimatorState:
m_Name: Right_Hand_Hold_Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3118027288805498438}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -226,31 +202,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4711396281542594421
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Throw
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8662526277064250497}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-4592225796506358761
AnimatorStateMachine:
serializedVersion: 6
@@ -310,32 +261,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3118027288805498438
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: Holding
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 400375029870675044}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.984985
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3062724450661704150
--- !u!1101 &-3304044052770011223
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -351,7 +277,7 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -410,24 +336,25 @@ AnimatorStateMachine:
m_Position: {x: 350, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: -8396421346802500550}
m_Position: {x: 360, y: 380, z: 0}
m_Position: {x: 630, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -7519564327104386826}
m_Position: {x: 350, y: 270, z: 0}
m_Position: {x: 350, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 8662526277064250497}
m_Position: {x: 360, y: 480, z: 0}
m_Position: {x: 350, y: 240, z: 0}
- serializedVersion: 1
m_State: {fileID: 7168728000125186730}
m_Position: {x: 350, y: 180, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1582007811057979629}
- {fileID: -4711396281542594421}
m_AnyStateTransitions: []
m_EntryTransitions:
- {fileID: 6343792522304449684}
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 20, y: 380, z: 0}
m_EntryPosition: {x: 60, y: 50, z: 0}
m_ExitPosition: {x: 640, y: 380, z: 0}
m_AnyStatePosition: {x: 60, y: 100, z: 0}
m_EntryPosition: {x: 60, y: 60, z: 0}
m_ExitPosition: {x: 370, y: 450, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 400375029870675044}
--- !u!1102 &-1370786679102677242
@@ -613,8 +540,7 @@ AnimatorState:
m_Name: Hands Locomotion
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 3784344539730930853}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -630,31 +556,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &1582007811057979629
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Attack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8396421346802500550}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.05
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &2851786315226548937
AnimatorState:
serializedVersion: 6
@@ -681,31 +582,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3784344539730930853
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: Holding
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7519564327104386826}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5935865335456089982
AnimatorState:
serializedVersion: 6
@@ -747,6 +623,32 @@ AnimatorTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1102 &7168728000125186730
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Right_Hand_Hold_Charged
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -3347519175819947890, guid: e74130c49b009364f90d176af44766be, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!206 &7431716858329769754
BlendTree:
m_ObjectHideFlags: 1
@@ -863,7 +765,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3062724450661704150}
- {fileID: -3304044052770011223}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0