diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index e1f854a99d..99218deed2 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -2343,10 +2343,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -484} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &66575388 MonoBehaviour: @@ -2481,9 +2481,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -110} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75133766 @@ -2633,9 +2633,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -136} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75580657 @@ -2784,9 +2784,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -188} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &77529301 @@ -2934,10 +2934,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -19} + m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &80074248 MonoBehaviour: @@ -3975,9 +3975,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -15} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153817299 @@ -6885,9 +6885,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -32} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &256353508 @@ -14263,9 +14263,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -255} m_SizeDelta: {x: 260, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &402645375 @@ -15707,10 +15707,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 34} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -98} + m_SizeDelta: {x: 260, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!114 &438218786 MonoBehaviour: @@ -17139,10 +17139,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -36} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &485322299 MonoBehaviour: @@ -23635,10 +23635,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 34} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -62} + m_SizeDelta: {x: 260, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!114 &574816556 MonoBehaviour: @@ -24877,10 +24877,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 24} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -134} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &644584041 MonoBehaviour: @@ -26781,10 +26781,10 @@ RectTransform: m_Father: {fileID: 823064026} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -321} + m_SizeDelta: {x: 260, y: 322} m_Pivot: {x: 0, y: 0.5} --- !u!114 &698007183 MonoBehaviour: @@ -28312,9 +28312,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -84} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &745954561 @@ -36986,9 +36986,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -214} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &899502179 @@ -44107,9 +44107,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -298} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1259822364 @@ -49851,9 +49851,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -58} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1488925096 @@ -75289,9 +75289,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -284} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1585506762 @@ -79962,6 +79962,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: renderToTextureIfAvailable: 0 + verticalSizeInTiles: 14 --- !u!1 &1711963779 GameObject: m_ObjectHideFlags: 0 @@ -89400,9 +89401,9 @@ RectTransform: m_Father: {fileID: 698007182} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 130, y: -162} m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2007433170 diff --git a/Assets/Scripts/BuildInfo.cs b/Assets/Scripts/BuildInfo.cs index f1e173edcd..bd39f14abb 100644 --- a/Assets/Scripts/BuildInfo.cs +++ b/Assets/Scripts/BuildInfo.cs @@ -1 +1 @@ -public static class BuildInfo{public static string BUILD_TIME = "1/11/2024 12:55:07 AM";} +public static class BuildInfo{public static string BUILD_TIME = "1/12/2024 4:07:48 AM";} diff --git a/Assets/Scripts/Entity/Enemy/BulletBill.cs b/Assets/Scripts/Entity/Enemy/BulletBill.cs index bff81d3a60..ec5dbdb690 100644 --- a/Assets/Scripts/Entity/Enemy/BulletBill.cs +++ b/Assets/Scripts/Entity/Enemy/BulletBill.cs @@ -125,7 +125,7 @@ public override void SpecialKill(bool right, bool groundpound, bool mega, int co IsDead = true; WasSpecialKilled = true; WasGroundpounded = true; - WasKilledByMega = true; + WasKilledByMega = mega; if (WasKilledByMega) { FacingRight = right; diff --git a/Assets/Scripts/Entity/Enemy/KillableEntity.cs b/Assets/Scripts/Entity/Enemy/KillableEntity.cs index a4a61c4436..31483109ba 100644 --- a/Assets/Scripts/Entity/Enemy/KillableEntity.cs +++ b/Assets/Scripts/Entity/Enemy/KillableEntity.cs @@ -311,6 +311,7 @@ public override void RespawnEntity() { FacingRight = false; WasSpecialKilled = false; WasGroundpounded = false; + WasKilledByMega = false; WasCrushed = false; ComboCounter = 0; @@ -326,6 +327,10 @@ public override void DespawnEntity(object data = null) { } IsDead = true; + WasSpecialKilled = false; + WasGroundpounded = false; + WasKilledByMega = false; + WasCrushed = false; } //---IPlayerInteractable overrides diff --git a/Assets/Scripts/Entity/Player/PlayerController.cs b/Assets/Scripts/Entity/Player/PlayerController.cs index 7de0a88c82..0cd3944508 100644 --- a/Assets/Scripts/Entity/Player/PlayerController.cs +++ b/Assets/Scripts/Entity/Player/PlayerController.cs @@ -500,6 +500,8 @@ public override void FixedUpdateNetwork() { HandleGroundCollision(); IsOnGround |= GroundSnapCheck(); + CheckForEntityCollision(); + if (IsOnGround) { IgnoreCoyoteTime = false; } @@ -519,7 +521,6 @@ public override void FixedUpdateNetwork() { HandleMovement(heldButtons, pressedButtons); } - CheckForEntityCollision(); PreviousTickIsOnGround = IsOnGround; } @@ -594,11 +595,11 @@ private void HandleDeathTimers() { } } - #region -- COLLISIONS -- + #region -- COLLISIONS --.// hand private void HandleGroundCollision() { IsOnGround = body.Data.OnGround && PropellerLaunchTimer.ExpiredOrNotRunning(Runner); - OnSpinner = null; + foreach (PhysicsDataStruct.ObjectContact objectContact in body.Data.ObjectsStandingOn) { NetworkObject obj = objectContact.GetNetworkObject(Runner); @@ -609,7 +610,7 @@ private void HandleGroundCollision() { if (obj.CompareTag("spinner") && obj.gameObject.TryGetComponent(out SpinnerAnimator spinner)) { OnSpinner = spinner; - OnSpinner.HasPlayer = true; + spinner.HasPlayer = true; break; } } @@ -2062,6 +2063,8 @@ private void HandleJumping(bool jumpHeld, bool doJump, bool down) { if (!DoEntityBounce && OnSpinner && !HeldEntity) { // Jump of spinner + Debug.Log($"{Runner.Tick}{(Runner.IsResimulation ? " (R)" : "")}"); + body.Velocity = new(body.Velocity.x, launchVelocity); IsSpinnerFlying = true; SpinnerLaunchAnimCounter++; diff --git a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs index 1cb9ceb72a..9c3d82ec7f 100644 --- a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs +++ b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs @@ -13,7 +13,7 @@ public class SpinnerAnimator : NetworkBehaviour, IBeforeTick { //---Serialized Variables [SerializeField] private Transform topArmBone; [SerializeField] private BoxCollider2D hitbox; - [SerializeField] private float idleSpinSpeed = -100, fastSpinSpeed = -1800, pressSpeed = 0.5f; + [SerializeField] private float idleSpinSpeed = -100, fastSpinSpeed = -1800, pressSpeed = 0.5f, acceleration = 1350f; //---Public Variables public float spinSpeed; @@ -29,6 +29,7 @@ public override void Spawned() { public void BeforeTick() { HasPlayer = false; hitbox.transform.localPosition = new(0, ArmPosition * -0.084f, 0); + Physics2D.SyncTransforms(); } public override void Render() { @@ -40,7 +41,7 @@ public override void Render() { armRenderPosition = ArmPosition; } - spinSpeed = Mathf.MoveTowards(spinSpeed, HasPlayer ? fastSpinSpeed : idleSpinSpeed, Time.deltaTime * 1350f); + spinSpeed = Mathf.MoveTowards(spinSpeed, HasPlayer ? fastSpinSpeed : idleSpinSpeed, Time.deltaTime * acceleration); topArmBone.eulerAngles += spinSpeed * Time.deltaTime * Vector3.up; topArmBone.localPosition = new(0, armRenderPosition * -0.084f, 0); } diff --git a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta index 159a47cb92..601d4632e4 100644 --- a/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta +++ b/Assets/Scripts/Entity/World Elements/SpinnerAnimator.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 4 + executionOrder: 3 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta b/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta index c9823711fe..7fec04ec22 100644 --- a/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta +++ b/Assets/Scripts/UI/CopyNdsTextureRect.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 3 + executionOrder: 4 icon: {instanceID: 0} userData: assetBundleName: