From 4ab505b50096f4c54f29738738179110fa79db69 Mon Sep 17 00:00:00 2001 From: chai <215380520@qq.com> Date: Sat, 28 Oct 2023 22:07:37 +0800 Subject: *misc --- "Doc/ROUNDS\345\210\206\346\236\220.xlsx" | Bin 2693775 -> 6075929 bytes ROUNDS/.vs/ROUNDS/v17/.suo | Bin 155648 -> 155648 bytes ROUNDS/_Player/CharacterData.cs | 46 +++++++++++---------- .../bin/Debug/netstandard2.1/Assembly-CSharp.dll | Bin 909312 -> 909824 bytes .../bin/Debug/netstandard2.1/Assembly-CSharp.pdb | Bin 486868 -> 486972 bytes .../obj/Debug/netstandard2.1/Assembly-CSharp.dll | Bin 909312 -> 909824 bytes .../obj/Debug/netstandard2.1/Assembly-CSharp.pdb | Bin 486868 -> 486972 bytes 7 files changed, 25 insertions(+), 21 deletions(-) diff --git "a/Doc/ROUNDS\345\210\206\346\236\220.xlsx" "b/Doc/ROUNDS\345\210\206\346\236\220.xlsx" index 36f3d44..6a3132f 100644 Binary files "a/Doc/ROUNDS\345\210\206\346\236\220.xlsx" and "b/Doc/ROUNDS\345\210\206\346\236\220.xlsx" differ diff --git a/ROUNDS/.vs/ROUNDS/v17/.suo b/ROUNDS/.vs/ROUNDS/v17/.suo index c630da1..db81732 100644 Binary files a/ROUNDS/.vs/ROUNDS/v17/.suo and b/ROUNDS/.vs/ROUNDS/v17/.suo differ diff --git a/ROUNDS/_Player/CharacterData.cs b/ROUNDS/_Player/CharacterData.cs index 524515c..394fe79 100644 --- a/ROUNDS/_Player/CharacterData.cs +++ b/ROUNDS/_Player/CharacterData.cs @@ -10,8 +10,6 @@ public class CharacterData : MonoBehaviour public List currentCards; - public float sinceGroundedMultiplierWhenWallGrab = 0.2f; - public PlayerActions playerActions; public ParticleSystem[] landParts; @@ -42,8 +40,6 @@ public class CharacterData : MonoBehaviour public Vector2 wallNormal; - public Vector3 groundPos; - public Transform hand; public float sinceWallGrab = float.PositiveInfinity; @@ -54,10 +50,16 @@ public class CharacterData : MonoBehaviour private bool wasWallGrabLastFrame; - public float sinceGrounded; + #region Ground + + public Vector3 groundPos; + + public float sinceGrounded; - // 经过测试，isGrounded可以指示是否着地 - [FormerlySerializedAs("isGrounded")] + public float sinceGroundedMultiplierWhenWallGrab = 0.2f; + + // 经过测试，isGrounded可以指示是否着地 + [FormerlySerializedAs("isGrounded")] private bool m_IsGrounded = true; private bool m_preGrounded = true; @@ -77,7 +79,9 @@ public class CharacterData : MonoBehaviour private bool wasGroundedLastFrame = true; - public Player player; + #endregion + + public Player player; public float sinceJump = 1f; @@ -229,7 +233,7 @@ public class CharacterData : MonoBehaviour // 有且只有这个方法设置了 isGrounded = true public void TouchGround(Vector3 pos, Vector3 groundNormal, Rigidbody2D groundRig, Transform groundTransform = null) { - //this.gameObject.name = "Player_" + pos.ToString() + "_" + (groundTransform != null ? groundTransform.gameObject.name : "null"); + this.gameObject.name = "Player_" + pos.ToString() + "_" + (groundTransform != null ? groundTransform.gameObject.name : "null"); if (sinceJump > 0.2f) { @@ -247,18 +251,18 @@ public class CharacterData : MonoBehaviour { standOnRig = groundRig; } - if (playerVel.velocity.y < -20f && !isGrounded) - { - for (int i = 0; i < landParts.Length; i++) - { - landParts[i].transform.localScale = Vector3.one * Mathf.Clamp((0f - playerVel.velocity.y) / 40f, 0.5f, 1f) * 0.5f; - landParts[i].transform.position = new Vector3(base.transform.position.x + playerVel.velocity.x * 0.03f, pos.y, 5f); - landParts[i].transform.rotation = Quaternion.LookRotation(groundNormal); - landParts[i].Play(); - } - GamefeelManager.instance.AddGameFeel(Vector2.down * Mathf.Clamp((sinceGrounded - 0.5f) * 1f, 0f, 4f)); - } - groundPos = pos; + if (playerVel.velocity.y < -20f && !isGrounded) + { + for (int i = 0; i < landParts.Length; i++) + { + landParts[i].transform.localScale = Vector3.one * Mathf.Clamp((0f - playerVel.velocity.y) / 40f, 0.5f, 1f) * 0.5f; + landParts[i].transform.position = new Vector3(base.transform.position.x + playerVel.velocity.x * 0.03f, pos.y, 5f); + landParts[i].transform.rotation = Quaternion.LookRotation(groundNormal); + landParts[i].Play(); + } + GamefeelManager.instance.AddGameFeel(Vector2.down * Mathf.Clamp((sinceGrounded - 0.5f) * 1f, 0f, 4f)); + } + groundPos = pos; wasGroundedLastFrame = true; isGrounded = true; sinceGrounded = 0f; diff --git a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll index d5d9762..98dcc58 100644 Binary files a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll and b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll differ diff --git a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb index 263699b..25eda73 100644 Binary files a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb and b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb differ diff --git a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll index d5d9762..98dcc58 100644 Binary files a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll and b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll differ diff --git a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb index 263699b..25eda73 100644 Binary files a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb and b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb differ -- cgit v1.1-26-g67d0