diff --git a/Assets/jelycho/Code/Actors.meta b/Assets/jelycho/Code/Actors.meta new file mode 100644 index 0000000..526ebd0 --- /dev/null +++ b/Assets/jelycho/Code/Actors.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7ba665ddebe34f608f00db5d8107b685 +timeCreated: 1761225260 \ No newline at end of file diff --git a/Assets/jelycho/Code/ActorSpawner.cs b/Assets/jelycho/Code/Actors/ActorSpawner.cs similarity index 98% rename from Assets/jelycho/Code/ActorSpawner.cs rename to Assets/jelycho/Code/Actors/ActorSpawner.cs index 5865f76..e80e0e4 100644 --- a/Assets/jelycho/Code/ActorSpawner.cs +++ b/Assets/jelycho/Code/Actors/ActorSpawner.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEngine.AddressableAssets; using Logger = RebootKit.Engine.Foundation.Logger; -namespace RebootReality.jelycho { +namespace RebootReality.jelycho.Actors { public class ActorSpawner : Actor { static readonly Logger s_Logger = new Logger(nameof(ActorSpawner)); diff --git a/Assets/jelycho/Code/ActorSpawner.cs.meta b/Assets/jelycho/Code/Actors/ActorSpawner.cs.meta similarity index 100% rename from Assets/jelycho/Code/ActorSpawner.cs.meta rename to Assets/jelycho/Code/Actors/ActorSpawner.cs.meta diff --git a/Assets/jelycho/Code/ButtonActor.cs b/Assets/jelycho/Code/Actors/ButtonActor.cs similarity index 98% rename from Assets/jelycho/Code/ButtonActor.cs rename to Assets/jelycho/Code/Actors/ButtonActor.cs index 1c09ced..96bb525 100644 --- a/Assets/jelycho/Code/ButtonActor.cs +++ b/Assets/jelycho/Code/Actors/ButtonActor.cs @@ -6,7 +6,7 @@ using UnityEngine; using UnityEngine.Events; using Logger = RebootKit.Engine.Foundation.Logger; -namespace RebootReality.jelycho { +namespace RebootReality.jelycho.Actors { public class ButtonActor : Actor, IInteractable { static readonly Logger s_Logger = new Logger(nameof(ButtonActor)); diff --git a/Assets/jelycho/Code/ButtonActor.cs.meta b/Assets/jelycho/Code/Actors/ButtonActor.cs.meta similarity index 100% rename from Assets/jelycho/Code/ButtonActor.cs.meta rename to Assets/jelycho/Code/Actors/ButtonActor.cs.meta diff --git a/Assets/jelycho/Code/Actors/IHasHealth.cs b/Assets/jelycho/Code/Actors/IHasHealth.cs new file mode 100644 index 0000000..7af1870 --- /dev/null +++ b/Assets/jelycho/Code/Actors/IHasHealth.cs @@ -0,0 +1,8 @@ +namespace RebootReality.jelycho.Actors { + public interface IHasHealth { + ulong Health { get; } + ulong MaxHealth { get; } + + bool IsAlive(); + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/Enemies/IKillable.cs.meta b/Assets/jelycho/Code/Actors/IHasHealth.cs.meta similarity index 100% rename from Assets/jelycho/Code/Enemies/IKillable.cs.meta rename to Assets/jelycho/Code/Actors/IHasHealth.cs.meta diff --git a/Assets/jelycho/Code/IInteractable.cs b/Assets/jelycho/Code/Actors/IInteractable.cs similarity index 71% rename from Assets/jelycho/Code/IInteractable.cs rename to Assets/jelycho/Code/Actors/IInteractable.cs index 572d81b..ed82331 100644 --- a/Assets/jelycho/Code/IInteractable.cs +++ b/Assets/jelycho/Code/Actors/IInteractable.cs @@ -1,4 +1,4 @@ -namespace RebootReality.jelycho { +namespace RebootReality.jelycho.Actors { public interface IInteractable { void SetHighlight(bool highlight); void Interact(); diff --git a/Assets/jelycho/Code/IInteractable.cs.meta b/Assets/jelycho/Code/Actors/IInteractable.cs.meta similarity index 100% rename from Assets/jelycho/Code/IInteractable.cs.meta rename to Assets/jelycho/Code/Actors/IInteractable.cs.meta diff --git a/Assets/jelycho/Code/Beacons/BaseManagerActor.cs b/Assets/jelycho/Code/Beacons/BaseManagerActor.cs index ee5e8b3..7bb577f 100644 --- a/Assets/jelycho/Code/Beacons/BaseManagerActor.cs +++ b/Assets/jelycho/Code/Beacons/BaseManagerActor.cs @@ -4,6 +4,7 @@ using RebootKit.Engine.Main; using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; using RebootReality.jelycho.InfectedArea; +using RebootReality.jelycho.Main; using Unity.Mathematics; using UnityEngine; using UnityEngine.AddressableAssets; diff --git a/Assets/jelycho/Code/Beacons/MotherActor.cs b/Assets/jelycho/Code/Beacons/MotherActor.cs index fe354e4..0a3b5f4 100644 --- a/Assets/jelycho/Code/Beacons/MotherActor.cs +++ b/Assets/jelycho/Code/Beacons/MotherActor.cs @@ -1,5 +1,6 @@ using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Actors; using RebootReality.jelycho.Enemies; using UnityEngine; @@ -24,7 +25,7 @@ namespace RebootReality.jelycho.Beacons { } } - public class MotherActor : Actor, IKillable { + public class MotherActor : Actor, IHasHealth { MotherActorData m_ActorData = new MotherActorData(); [field: SerializeField] public Transform GutConnector { get; private set; } @@ -35,16 +36,24 @@ namespace RebootReality.jelycho.Beacons { protected override IActorData CreateActorData() { return m_ActorData; } - + // - // @MARK: IKillable - // + // @MARK: IHasHealth + // + public ulong Health { + get { + return m_ActorData.Health; + } + + private set { + m_ActorData.Health = value; + } + } + + [field: SerializeField] public ulong MaxHealth { get; private set; } + public bool IsAlive() { return m_ActorData.Health > 0; } - - public ulong OnHit(Actor attacker, ulong damage) { - return damage; - } } } \ No newline at end of file diff --git a/Assets/jelycho/Code/Damage.meta b/Assets/jelycho/Code/Damage.meta new file mode 100644 index 0000000..1378c04 --- /dev/null +++ b/Assets/jelycho/Code/Damage.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: aaf9c8fc3fd047bfa82bdf2c1422c6be +timeCreated: 1761224582 \ No newline at end of file diff --git a/Assets/jelycho/Code/HitboxManagerActor.cs b/Assets/jelycho/Code/Damage/HitboxManagerActor.cs similarity index 71% rename from Assets/jelycho/Code/HitboxManagerActor.cs rename to Assets/jelycho/Code/Damage/HitboxManagerActor.cs index 7786deb..823b8cd 100644 --- a/Assets/jelycho/Code/HitboxManagerActor.cs +++ b/Assets/jelycho/Code/Damage/HitboxManagerActor.cs @@ -7,7 +7,7 @@ using Unity.Mathematics; using UnityEngine; using Logger = RebootKit.Engine.Foundation.Logger; -namespace RebootReality.jelycho { +namespace RebootReality.jelycho.Damage { public class HitboxManagerActor : Actor { static readonly Logger s_Logger = new Logger(nameof(HitboxManagerActor)); static readonly Collider[] s_CollidersBuffer = new Collider[512]; @@ -54,25 +54,6 @@ namespace RebootReality.jelycho { hurtbox.ReceiveDamage(attacker, damage, p); } - - // if (s_CollidersBuffer[i].TryGetComponent(out IKillable killable)) { - // Actor killableActor = killable as Actor; - // if (killableActor == attacker) { - // continue; - // } - // - // if (killable is IHasHitFeedback hitFeedback) { - // float3 p = s_CollidersBuffer[i].ClosestPoint(origin); - // if (ShouldShowHitboxes()) { - // DbgDraw.Sphere(p, Quaternion.identity, Vector3.one * 0.1f, Color.magenta, m_HitboxDebugDuration); - // } - // - // hitFeedback.HitFeedback(p); - // } - // - // // @TODO: send command to server to hit an killable - // killable.OnHit(attacker, damage); - // } } } diff --git a/Assets/jelycho/Code/HitboxManagerActor.cs.meta b/Assets/jelycho/Code/Damage/HitboxManagerActor.cs.meta similarity index 100% rename from Assets/jelycho/Code/HitboxManagerActor.cs.meta rename to Assets/jelycho/Code/Damage/HitboxManagerActor.cs.meta diff --git a/Assets/jelycho/Code/IHurtbox.cs b/Assets/jelycho/Code/Damage/IHurtbox.cs similarity index 81% rename from Assets/jelycho/Code/IHurtbox.cs rename to Assets/jelycho/Code/Damage/IHurtbox.cs index a471124..c25e290 100644 --- a/Assets/jelycho/Code/IHurtbox.cs +++ b/Assets/jelycho/Code/Damage/IHurtbox.cs @@ -1,7 +1,7 @@ using RebootKit.Engine.Simulation; using Unity.Mathematics; -namespace RebootReality.jelycho { +namespace RebootReality.jelycho.Damage { public interface IHurtbox { void ReceiveDamage(Actor attacker, ulong damage, float3 worldHitPos); } diff --git a/Assets/jelycho/Code/IHurtbox.cs.meta b/Assets/jelycho/Code/Damage/IHurtbox.cs.meta similarity index 100% rename from Assets/jelycho/Code/IHurtbox.cs.meta rename to Assets/jelycho/Code/Damage/IHurtbox.cs.meta diff --git a/Assets/jelycho/Code/Enemies/IKillable.cs b/Assets/jelycho/Code/Enemies/IKillable.cs deleted file mode 100644 index 118f380..0000000 --- a/Assets/jelycho/Code/Enemies/IKillable.cs +++ /dev/null @@ -1,10 +0,0 @@ -using RebootKit.Engine.Simulation; - -namespace RebootReality.jelycho.Enemies { - public interface IKillable { - bool IsAlive(); - - // @NOTE: Returns damage dealt - ulong OnHit(Actor attacker, ulong damage); - } -} \ No newline at end of file diff --git a/Assets/jelycho/Code/Enemies/WavesManagerActor.cs b/Assets/jelycho/Code/Enemies/WavesManagerActor.cs index 86e7af9..3d4a0a1 100644 --- a/Assets/jelycho/Code/Enemies/WavesManagerActor.cs +++ b/Assets/jelycho/Code/Enemies/WavesManagerActor.cs @@ -2,6 +2,7 @@ using RebootKit.Engine.Extensions; using RebootKit.Engine.Main; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Enemies.Zombie; using Unity.Collections; using UnityEngine; using UnityEngine.AddressableAssets; diff --git a/Assets/jelycho/Code/Enemies/Zombie.meta b/Assets/jelycho/Code/Enemies/Zombie.meta new file mode 100644 index 0000000..4bc0fbe --- /dev/null +++ b/Assets/jelycho/Code/Enemies/Zombie.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 72a9c46420c34ee594e3a68ac031a649 +timeCreated: 1761227055 \ No newline at end of file diff --git a/Assets/jelycho/Code/Enemies/ZombieActor.cs b/Assets/jelycho/Code/Enemies/Zombie/ZombieActor.cs similarity index 93% rename from Assets/jelycho/Code/Enemies/ZombieActor.cs rename to Assets/jelycho/Code/Enemies/Zombie/ZombieActor.cs index e3c3762..fde606c 100644 --- a/Assets/jelycho/Code/Enemies/ZombieActor.cs +++ b/Assets/jelycho/Code/Enemies/Zombie/ZombieActor.cs @@ -6,16 +6,19 @@ using RebootKit.Engine.Extensions; using RebootKit.Engine.Main; using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Actors; using RebootReality.jelycho.Beacons; +using RebootReality.jelycho.Main; using RebootReality.jelycho.Player; using TriInspector; using Unity.Mathematics; using UnityEngine; using UnityEngine.AI; using Logger = RebootKit.Engine.Foundation.Logger; +using Random = UnityEngine.Random; using UnityEvent = UnityEngine.Events.UnityEvent; -namespace RebootReality.jelycho.Enemies { +namespace RebootReality.jelycho.Enemies.Zombie { public class ZombieActorData : IActorData { public void Serialize(NetworkBufferWriter writer) { } @@ -101,7 +104,7 @@ namespace RebootReality.jelycho.Enemies { [DeclareBoxGroup("Body parts")] [DeclareBoxGroup("Animations")] - public class ZombieActor : Actor, IKillable { + public class ZombieActor : Actor, IHasHealth { static readonly Logger s_Logger = new Logger(nameof(ZombieActor)); [SerializeField] AnimancerComponent m_Animancer; @@ -335,35 +338,14 @@ namespace RebootReality.jelycho.Enemies { } // - // @MARK: IKillable + // @MARK: IHasHealth // public ulong Health { get; private set; } = 100; + public ulong MaxHealth { get; private set; } = 100; public bool IsAlive() { return Health > 0; } - - public ulong OnHit(Actor attacker, ulong damage) { - if (!RR.IsServer()) { - s_Logger.Error("OnHit can only be called on the server."); - return 0; - } - - if (!IsAlive()) { - return 0; - } - - s_Logger.Info($"Hit: {damage}"); - - damage = math.min(damage, Health); - Health -= damage; - if (Health <= 0) { - Die(); - return damage; - } - - return damage; - } // // @MARK: damage? @@ -374,7 +356,12 @@ namespace RebootReality.jelycho.Enemies { } } - public void ReceiveDamage(ulong damage, ZombieBodyPartType bodyPartType) { + public void ReceiveBodyPartDamage(ulong damage, ZombieBodyPartType bodyPartType) { + if (!RR.IsServer()) { + s_Logger.Error("ReceiveBodyPartDamage can only be called on the server."); + return; + } + if (!IsAlive()) { return; } @@ -384,10 +371,26 @@ namespace RebootReality.jelycho.Enemies { return; } - bodyPart.HideParts(); - bodyPart.bloodStreamParticles.Play(); + bool isBodyPartDestroyed = Random.Range(0.0f, 1.0f) > 0.5f; - Die(); + if (isBodyPartDestroyed) { + bodyPart.HideParts(); + bodyPart.bloodStreamParticles.Play(); + + if (bodyPartType == ZombieBodyPartType.Head) { + damage = Health; + } else if (bodyPartType == ZombieBodyPartType.LeftLeg || + bodyPartType == ZombieBodyPartType.RightLeg) { + + } + } + + damage = math.min(damage, Health); + + Health -= damage; + if (Health <= 0) { + Die(); + } } public bool HasBodyPart(ZombieBodyPartType bodyPart) { diff --git a/Assets/jelycho/Code/Enemies/ZombieActor.cs.meta b/Assets/jelycho/Code/Enemies/Zombie/ZombieActor.cs.meta similarity index 100% rename from Assets/jelycho/Code/Enemies/ZombieActor.cs.meta rename to Assets/jelycho/Code/Enemies/Zombie/ZombieActor.cs.meta diff --git a/Assets/jelycho/Code/Enemies/ZombieHurtbox.cs b/Assets/jelycho/Code/Enemies/Zombie/ZombieHurtbox.cs similarity index 80% rename from Assets/jelycho/Code/Enemies/ZombieHurtbox.cs rename to Assets/jelycho/Code/Enemies/Zombie/ZombieHurtbox.cs index 5c0daa3..99ca702 100644 --- a/Assets/jelycho/Code/Enemies/ZombieHurtbox.cs +++ b/Assets/jelycho/Code/Enemies/Zombie/ZombieHurtbox.cs @@ -1,10 +1,12 @@ using RebootKit.Engine.Main; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Damage; +using RebootReality.jelycho.Main; using Unity.Mathematics; using UnityEngine; using UnityEngine.Assertions; -namespace RebootReality.jelycho.Enemies { +namespace RebootReality.jelycho.Enemies.Zombie { public class ZombieHurtbox : MonoBehaviour, IHurtbox { public ZombieActor owner; [SerializeField] ZombieBodyPartType m_BodyPart = ZombieBodyPartType.Body; @@ -18,7 +20,7 @@ namespace RebootReality.jelycho.Enemies { return; } - owner.ReceiveDamage(damage, m_BodyPart); + owner.ReceiveBodyPartDamage(damage, m_BodyPart); if (RR.World.Context is WorldContext worldContext) { worldContext.FeedbacksManager.SpawnBloodSplash(worldHitPos); diff --git a/Assets/jelycho/Code/Enemies/ZombieHurtbox.cs.meta b/Assets/jelycho/Code/Enemies/Zombie/ZombieHurtbox.cs.meta similarity index 100% rename from Assets/jelycho/Code/Enemies/ZombieHurtbox.cs.meta rename to Assets/jelycho/Code/Enemies/Zombie/ZombieHurtbox.cs.meta diff --git a/Assets/jelycho/Code/InfectedArea/InfectedAreaRendererFeature.cs b/Assets/jelycho/Code/InfectedArea/InfectedAreaRendererFeature.cs index 5479974..15191e5 100644 --- a/Assets/jelycho/Code/InfectedArea/InfectedAreaRendererFeature.cs +++ b/Assets/jelycho/Code/InfectedArea/InfectedAreaRendererFeature.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using RebootKit.Engine.Main; +using RebootReality.jelycho.Main; using Unity.Mathematics; using UnityEngine; using UnityEngine.Experimental.Rendering; diff --git a/Assets/jelycho/Code/Items/ItemActor.cs b/Assets/jelycho/Code/Items/ItemActor.cs index f08ea61..e9fb167 100644 --- a/Assets/jelycho/Code/Items/ItemActor.cs +++ b/Assets/jelycho/Code/Items/ItemActor.cs @@ -1,6 +1,7 @@ using HighlightPlus; using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Actors; using UnityEngine; using Logger = RebootKit.Engine.Foundation.Logger; diff --git a/Assets/jelycho/Code/Items/ItemQuickAttackAction.cs b/Assets/jelycho/Code/Items/ItemQuickAttackAction.cs index 90a19c4..5fbc464 100644 --- a/Assets/jelycho/Code/Items/ItemQuickAttackAction.cs +++ b/Assets/jelycho/Code/Items/ItemQuickAttackAction.cs @@ -1,5 +1,6 @@ using RebootKit.Engine.Main; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Main; using RebootReality.jelycho.Player; using UnityEngine; @@ -10,13 +11,13 @@ namespace RebootReality.jelycho.Items { return; } - PlayerActor playerActor = attacker as PlayerActor; + var playerActor = attacker as PlayerActor; if (playerActor == null) { return; } Vector3 attackPosition = playerActor.GetAttackPosition(); - float attackRadius = 1.0f; + float attackRadius = 0.5f; worldContext.HitboxManager.HitSphere(attackPosition, attackRadius, attacker, itemActor.Config.baseDamage); } diff --git a/Assets/jelycho/Code/Items/SpawnBeaconChargeAction.cs b/Assets/jelycho/Code/Items/SpawnBeaconChargeAction.cs index b79eeb8..8cbff5e 100644 --- a/Assets/jelycho/Code/Items/SpawnBeaconChargeAction.cs +++ b/Assets/jelycho/Code/Items/SpawnBeaconChargeAction.cs @@ -1,5 +1,6 @@ using RebootKit.Engine.Main; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Main; using RebootReality.jelycho.Player; using UnityEngine; using Logger = RebootKit.Engine.Foundation.Logger; diff --git a/Assets/jelycho/Code/WorldContext.cs b/Assets/jelycho/Code/Main/WorldContext.cs similarity index 92% rename from Assets/jelycho/Code/WorldContext.cs rename to Assets/jelycho/Code/Main/WorldContext.cs index 200c39a..c5d16be 100644 --- a/Assets/jelycho/Code/WorldContext.cs +++ b/Assets/jelycho/Code/Main/WorldContext.cs @@ -1,12 +1,13 @@ using RebootKit.Engine.Simulation; using RebootReality.jelycho.Beacons; +using RebootReality.jelycho.Damage; using RebootReality.jelycho.Enemies; using RebootReality.jelycho.Feedbacks; using RebootReality.jelycho.InfectedArea; using RebootReality.jelycho.Ropes; using UnityEngine; -namespace RebootReality.jelycho { +namespace RebootReality.jelycho.Main { public class WorldContext : MonoBehaviour, IWorldContext { [field: SerializeField] public Transform PlayerSpawnPoint { get; private set; } [field: SerializeField] public RopesManager RopesManager { get; private set; } diff --git a/Assets/jelycho/Code/WorldContext.cs.meta b/Assets/jelycho/Code/Main/WorldContext.cs.meta similarity index 100% rename from Assets/jelycho/Code/WorldContext.cs.meta rename to Assets/jelycho/Code/Main/WorldContext.cs.meta diff --git a/Assets/jelycho/Code/Player/PlayerActor.cs b/Assets/jelycho/Code/Player/PlayerActor.cs index ecc815a..b49e2b4 100755 --- a/Assets/jelycho/Code/Player/PlayerActor.cs +++ b/Assets/jelycho/Code/Player/PlayerActor.cs @@ -4,15 +4,17 @@ using RebootKit.Engine.Extensions; using RebootKit.Engine.Main; using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Actors; using RebootReality.jelycho.Enemies; using RebootReality.jelycho.Items; +using RebootReality.jelycho.Main; using Unity.Collections; using Unity.Mathematics; using UnityEngine; using Logger = RebootKit.Engine.Foundation.Logger; namespace RebootReality.jelycho.Player { - public class PlayerActor : Actor, IKillable { + public class PlayerActor : Actor, IHasHealth { static readonly Logger s_Logger = new Logger(nameof(PlayerActor)); [SerializeField] PlayerAnimator m_PlayerAnimator; @@ -526,23 +528,6 @@ namespace RebootReality.jelycho.Player { break; } - - case PlayerActorCommands.DealDamage: { - PlayerActorDealDamageCommand dealDamageCommand = new PlayerActorDealDamageCommand(); - DataSerializationUtils.Deserialize(actorCommand.Data, ref dealDamageCommand); - - Actor targetActor = RR.FindSpawnedActor(dealDamageCommand.TargetActorID); - if (targetActor == null) { - s_Logger.Error($"Target actor with ID {dealDamageCommand.TargetActorID} not found."); - break; - } - - if (targetActor is IKillable killable) { - killable.OnHit(this, 100); - } - - break; - } } } @@ -673,18 +658,6 @@ namespace RebootReality.jelycho.Player { } } - public void DealDamage(IKillable target) { - if (target is Actor actor) { - var dealDamageCommand = new PlayerActorDealDamageCommand { - TargetActorID = actor.ActorID - }; - SendActorCommand((byte) PlayerActorCommands.DealDamage, - ref dealDamageCommand); - } else { - s_Logger.Error($"Player can only deal damage to other actors!"); - } - } - // // @MARK: Remote // @@ -830,16 +803,15 @@ namespace RebootReality.jelycho.Player { } // - // @MARK: IKillable + // @MARK: IHasHealth // + public ulong Health { get; private set; } = 100; + public ulong MaxHealth { get; private set; } = 100; + public bool IsAlive() { return true; } - public ulong OnHit(Actor attacker, ulong damage) { - return 0; - } - // // @MARK: Common // @@ -1055,8 +1027,7 @@ namespace RebootReality.jelycho.Player { DropItem = 0x03, EquipItem = 0x04, SelectItemSlot = 0x05, - RequestHandsAnimation = 0x06, - DealDamage = 0x07 + RequestHandsAnimation = 0x06 } struct PlayerActorPickupItemCommand : IActorData { @@ -1139,22 +1110,6 @@ namespace RebootReality.jelycho.Player { } } - struct PlayerActorDealDamageCommand : IActorData { - public ushort TargetActorID; - - public int GetMaxBytes() { - return sizeof(ushort); - } - - public void Serialize(NetworkBufferWriter writer) { - writer.Write(TargetActorID); - } - - public void Deserialize(NetworkBufferReader reader) { - reader.Read(out TargetActorID); - } - } - // @MARK: Player Actor Events enum PlayerActorEvents : byte { None = 0x00, diff --git a/Assets/jelycho/Code/Player/PlayerController.cs b/Assets/jelycho/Code/Player/PlayerController.cs index ddce4dd..bb2e537 100755 --- a/Assets/jelycho/Code/Player/PlayerController.cs +++ b/Assets/jelycho/Code/Player/PlayerController.cs @@ -5,6 +5,7 @@ using RebootKit.Engine.Input; using RebootKit.Engine.Main; using RebootKit.Engine.Network; using RebootKit.Engine.Simulation; +using RebootReality.jelycho.Actors; using RebootReality.jelycho.Main; using RebootReality.jelycho.Player.HUD; using Unity.Mathematics; diff --git a/Assets/jelycho/Code/Ropes/RopesSpawnerTest.cs b/Assets/jelycho/Code/Ropes/RopesSpawnerTest.cs index 073b523..998a053 100644 --- a/Assets/jelycho/Code/Ropes/RopesSpawnerTest.cs +++ b/Assets/jelycho/Code/Ropes/RopesSpawnerTest.cs @@ -1,4 +1,5 @@ using RebootKit.Engine.Main; +using RebootReality.jelycho.Main; using Unity.Mathematics; using UnityEngine; using UnityEngine.Assertions; diff --git a/Assets/jelycho/core/enemies/Zombie/actor_zombie.prefab b/Assets/jelycho/core/enemies/Zombie/actor_zombie.prefab index 58c8194..b379a5e 100644 --- a/Assets/jelycho/core/enemies/Zombie/actor_zombie.prefab +++ b/Assets/jelycho/core/enemies/Zombie/actor_zombie.prefab @@ -87,6 +87,8 @@ MonoBehaviour: - {fileID: 195185668620797367} - {fileID: 7804274750609309327} - {fileID: 516503892404828442} + - {fileID: 9055748677541019715} + - {fileID: 7745855554213630296} colliders: - {fileID: 5196034780342043746} bloodStreamParticles: {fileID: 1496971979244116752} @@ -113,6 +115,7 @@ MonoBehaviour: wearables: - {fileID: 4057421942970078161} - {fileID: 9077155126279679235} + - {fileID: 1386487405498541073} colliders: - {fileID: 5959361679409008663} - {fileID: 1107962127697433817} @@ -122,6 +125,7 @@ MonoBehaviour: wearables: - {fileID: 2842147911703410086} - {fileID: 3549243330475707168} + - {fileID: 3612120341523365289} colliders: - {fileID: 600210410026507738} - {fileID: 6618653062145489106} @@ -191,6 +195,10 @@ PrefabInstance: propertyPath: m_Name value: ps_blood_stream objectReference: {fileID: 0} + - target: {fileID: 2645631219435715753, guid: e4708616b97e6384fbc6a5d749870ef0, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 8314467853670120486, guid: e4708616b97e6384fbc6a5d749870ef0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -455,6 +463,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3087783944934017836} m_Modifications: + - target: {fileID: -9070493210130169274, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -495,6 +507,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8006009767450596044, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: -7547733204030175338, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -511,6 +527,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: dee771a2fd568e346a44028af6db8c4a, type: 2} + - target: {fileID: -6170625038081293824, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: -5928052198791885581, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -519,10 +539,50 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 6f6bf6c40b9130843890124806980318, type: 2} + - target: {fileID: -4728426434207774260, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -4332706925441422008, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: -4223379080860796823, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 6f6bf6c40b9130843890124806980318, type: 2} + - target: {fileID: -3478013746326755454, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -3214267034143217929, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -3086436065929644917, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -1781356600409242780, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -1425791611860619382, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -1268151995469589007, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -552831747908440785, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: -290750445479886849, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 579163500693744052, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -539,10 +599,18 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 6f6bf6c40b9130843890124806980318, type: 2} + - target: {fileID: 1711505207429034123, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 1751384141052031026, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 08e19dab1a066fc4c837941529974811, type: 2} + - target: {fileID: 2586065998465600510, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 2674498840362988503, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -551,6 +619,26 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 08e19dab1a066fc4c837941529974811, type: 2} + - target: {fileID: 3047284246813455858, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 3135921509060577837, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 3948933247560734027, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4114030615378554161, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4549111882529890269, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 4691356734749045086, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -559,6 +647,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: bd4a273039eeb24478a41c1ca3342080, type: 2} + - target: {fileID: 6514210125699187276, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 6548349598244766560, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -567,6 +659,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: dee771a2fd568e346a44028af6db8c4a, type: 2} + - target: {fileID: 7363479242261063072, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 7776229726456038893, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} - target: {fileID: 7833282959318594594, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -583,6 +683,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: bd4a273039eeb24478a41c1ca3342080, type: 2} + - target: {fileID: 8817898888258712963, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 9037727976738196030, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + propertyPath: m_Layer + value: 12 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -623,6 +731,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3135921509060577837, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 9114647905794880330} + - targetCorrespondingSourceObject: {fileID: 3135921509060577837, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 8889524053042602330} - targetCorrespondingSourceObject: {fileID: -6170625038081293824, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 1107962127697433817} @@ -632,6 +743,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -6170625038081293824, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 1540632195369085368} + - targetCorrespondingSourceObject: {fileID: -6170625038081293824, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 8696581383255721117} - targetCorrespondingSourceObject: {fileID: -3086436065929644917, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 600210410026507738} @@ -641,6 +755,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -3086436065929644917, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 726057557378094293} + - targetCorrespondingSourceObject: {fileID: -3086436065929644917, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 711757849574573574} - targetCorrespondingSourceObject: {fileID: -4332706925441422008, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 6618653062145489106} @@ -650,6 +767,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -4332706925441422008, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 8617324969592010863} + - targetCorrespondingSourceObject: {fileID: -4332706925441422008, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929018140768363926} - targetCorrespondingSourceObject: {fileID: -203856693384778745, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 1413923487375971647} @@ -671,6 +791,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8817898888258712963, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 7650472635330070799} + - targetCorrespondingSourceObject: {fileID: 8817898888258712963, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 8763777495105657203} - targetCorrespondingSourceObject: {fileID: 3948933247560734027, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 8675953056952567188} @@ -680,6 +803,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3948933247560734027, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 2005653223311132657} + - targetCorrespondingSourceObject: {fileID: 3948933247560734027, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 3208180709493702790} - targetCorrespondingSourceObject: {fileID: -1781356600409242780, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 5196034780342043746} @@ -701,6 +827,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -9070493210130169274, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 1647824546989841962} + - targetCorrespondingSourceObject: {fileID: -9070493210130169274, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 7123774486743823049} - targetCorrespondingSourceObject: {fileID: -290750445479886849, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 4929436638533926073} @@ -710,6 +839,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -290750445479886849, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} insertIndex: -1 addedObject: {fileID: 1847148280696077802} + - targetCorrespondingSourceObject: {fileID: -290750445479886849, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + insertIndex: -1 + addedObject: {fileID: 7150118618737326427} m_SourcePrefab: {fileID: 100100000, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} --- !u!4 &195185668620797367 stripped Transform: @@ -817,6 +949,20 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &1929018140768363926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318341321164162482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 5 --- !u!4 &387768722951651117 stripped Transform: m_CorrespondingSourceObject: {fileID: -4407763831008536617, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -928,6 +1074,25 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &711757849574573574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341823646622997617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 5 +--- !u!4 &1386487405498541073 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6091137516116298987, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + m_PrefabInstance: {fileID: 5167277762949540090} + m_PrefabAsset: {fileID: 0} --- !u!4 &1508813012558952447 stripped Transform: m_CorrespondingSourceObject: {fileID: 6000407479487422213, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1091,6 +1256,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8571662625946739674, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} m_PrefabInstance: {fileID: 5167277762949540090} m_PrefabAsset: {fileID: 0} +--- !u!4 &3612120341523365289 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -750676241868679853, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + m_PrefabInstance: {fileID: 5167277762949540090} + m_PrefabAsset: {fileID: 0} --- !u!4 &3810518212273745183 stripped Transform: m_CorrespondingSourceObject: {fileID: -912975496661547547, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1320,6 +1490,20 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &7150118618737326427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4342270201220536069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 3 --- !u!1 &4461558626407488889 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8817898888258712963, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1421,6 +1605,20 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8763777495105657203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4461558626407488889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 2 --- !u!4 &4629527527371345681 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1532,6 +1730,20 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &7123774486743823049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5020099358574029500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 3 --- !u!1 &5237927313291425520 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1082271958561512970, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1642,6 +1854,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2559285840627121667, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} m_PrefabInstance: {fileID: 5167277762949540090} m_PrefabAsset: {fileID: 0} +--- !u!4 &7745855554213630296 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5995675212371052126, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + m_PrefabInstance: {fileID: 5167277762949540090} + m_PrefabAsset: {fileID: 0} --- !u!1 &7795973122874794711 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3135921509060577837, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1743,6 +1960,20 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8889524053042602330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7795973122874794711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 4 --- !u!4 &7804274750609309327 stripped Transform: m_CorrespondingSourceObject: {fileID: 3169268832049026677, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1849,6 +2080,20 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8696581383255721117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7919670688253307642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 4 --- !u!1 &8176485658650983857 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3948933247560734027, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} @@ -1950,11 +2195,30 @@ CharacterJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &3208180709493702790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8176485658650983857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37d2b8f1679f41288194769e98584e0e, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 8352071028351746831} + m_BodyPart: 2 --- !u!4 &8811467099555359601 stripped Transform: m_CorrespondingSourceObject: {fileID: -4756569648371596405, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} m_PrefabInstance: {fileID: 5167277762949540090} m_PrefabAsset: {fileID: 0} +--- !u!4 &9055748677541019715 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4186554135785121977, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3} + m_PrefabInstance: {fileID: 5167277762949540090} + m_PrefabAsset: {fileID: 0} --- !u!4 &9077155126279679235 stripped Transform: m_CorrespondingSourceObject: {fileID: -5022265917205789191, guid: d2e957dad22ca1f4fae5e5e9fd8170c3, type: 3}