diff options
| -rw-r--r-- | Doc/ROUNDS分析.xlsx | bin | 11580685 -> 12223083 bytes | |||
| -rw-r--r-- | ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 | bin | 116663 -> 116754 bytes | |||
| -rw-r--r-- | ROUNDS/.vs/ROUNDS/v17/.suo | bin | 214528 -> 217600 bytes | |||
| -rw-r--r-- | ROUNDS/ROUNDS.csproj | 7 | ||||
| -rw-r--r-- | ROUNDS/_Player/CollisionChecker.cs | 6 | ||||
| -rw-r--r-- | ROUNDS/_Player/LegRaycasters.cs | 8 | ||||
| -rw-r--r-- | ROUNDS/_Player/PlayerCollision.cs | 10 | ||||
| -rw-r--r-- | ROUNDS/_Player/PlayerMovement.cs | 5 | ||||
| -rw-r--r-- | ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll | bin | 907776 -> 909824 bytes | |||
| -rw-r--r-- | ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb | bin | 486436 -> 487236 bytes | |||
| -rw-r--r-- | ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll | bin | 907776 -> 909824 bytes | |||
| -rw-r--r-- | ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb | bin | 486436 -> 487236 bytes | |||
| -rw-r--r-- | ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache | 2 |
13 files changed, 29 insertions, 9 deletions
diff --git a/Doc/ROUNDS分析.xlsx b/Doc/ROUNDS分析.xlsx Binary files differindex bed2132..37066cd 100644 --- a/Doc/ROUNDS分析.xlsx +++ b/Doc/ROUNDS分析.xlsx diff --git a/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 b/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 Binary files differindex 9574726..01bc485 100644 --- a/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 +++ b/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 diff --git a/ROUNDS/.vs/ROUNDS/v17/.suo b/ROUNDS/.vs/ROUNDS/v17/.suo Binary files differindex 933d54b..f8d3e6a 100644 --- a/ROUNDS/.vs/ROUNDS/v17/.suo +++ b/ROUNDS/.vs/ROUNDS/v17/.suo diff --git a/ROUNDS/ROUNDS.csproj b/ROUNDS/ROUNDS.csproj index ce465f3..2577a43 100644 --- a/ROUNDS/ROUNDS.csproj +++ b/ROUNDS/ROUNDS.csproj @@ -8,7 +8,12 @@ <LangVersion>11.0</LangVersion> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> </PropertyGroup> - <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <DefineConstants>$(DefineConstants)TRACE;</DefineConstants> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <DefineConstants>$(DefineConstants)TRACE;</DefineConstants> + </PropertyGroup> <ItemGroup> <Reference Include="AmplifyColor"> <HintPath>..\..\Game\Rounds_Data\Managed\AmplifyColor.dll</HintPath> diff --git a/ROUNDS/_Player/CollisionChecker.cs b/ROUNDS/_Player/CollisionChecker.cs index f48520e..fac3d45 100644 --- a/ROUNDS/_Player/CollisionChecker.cs +++ b/ROUNDS/_Player/CollisionChecker.cs @@ -26,7 +26,11 @@ public class CollisionChecker : MonoBehaviour private void Collide(Collision2D collision) { - if (collisionAction != null) +#if IGNORE_COLLISIONCHECK + return ; +#endif + + if (collisionAction != null) { collisionAction(collision); } diff --git a/ROUNDS/_Player/LegRaycasters.cs b/ROUNDS/_Player/LegRaycasters.cs index db65cf1..2807f8d 100644 --- a/ROUNDS/_Player/LegRaycasters.cs +++ b/ROUNDS/_Player/LegRaycasters.cs @@ -67,9 +67,12 @@ public class LegRaycasters : MonoBehaviour { if (!(data.sinceJump < 0.2f) && !(Vector3.Angle(Vector3.up, hit.normal) > 70f)) { +#if !IGNORE_TOUCHGROUND // touch ground ҪӰŵغgravityΪ0 data.TouchGround(hit.point, hit.normal, hit.rigidbody); +#endif +#if !IGNORE_HITGROUND // ʩϵ Vector3 vector = ((Vector3)hit.point - leg.transform.position) / base.transform.root.localScale.x; if (data.input.direction.x != 0f) @@ -79,6 +82,7 @@ public class LegRaycasters : MonoBehaviour } rig.AddForce(animationCurve.Evaluate(Mathf.Abs(vector.y)) * Vector3.up * rig.mass * force);//һֱϵ rig.AddForce(animationCurve.Evaluate(Mathf.Abs(vector.y)) * (0f - rig.velocity.y) * Vector2.up * rig.mass * drag);//һֱõ - } - } +#endif + } + } } diff --git a/ROUNDS/_Player/PlayerCollision.cs b/ROUNDS/_Player/PlayerCollision.cs index c6f2750..36f0113 100644 --- a/ROUNDS/_Player/PlayerCollision.cs +++ b/ROUNDS/_Player/PlayerCollision.cs @@ -51,7 +51,8 @@ public class PlayerCollision : MonoBehaviour // PlayerVelocityǿһµٶȺɫûݵ£Ϊײ⡣ע͵ɫͻ private void FixedUpdate() - { + { +#if !IGNORE_CHECKWALL #region ǽ͵أҲйأ if (checkForGoThroughWall && ignoreWallFor <= 0) { @@ -78,7 +79,9 @@ public class PlayerCollision : MonoBehaviour } } #endregion +#endif +#if !IGNORE_CIRCLECAST #region ײ ignoreWallFor--; lastPos = base.transform.position; @@ -130,9 +133,10 @@ public class PlayerCollision : MonoBehaviour DoBounce(array2[j]); } } - #endregion + #endregion +#endif - lastPos = base.transform.position; + lastPos = base.transform.position; } private void DoBounce(RaycastHit2D hit) diff --git a/ROUNDS/_Player/PlayerMovement.cs b/ROUNDS/_Player/PlayerMovement.cs index c4753c6..84dd5d0 100644 --- a/ROUNDS/_Player/PlayerMovement.cs +++ b/ROUNDS/_Player/PlayerMovement.cs @@ -31,6 +31,8 @@ public class PlayerMovement : MonoBehaviour return; } Move(data.input.direction); + +#if!IGNORE_DRAG if (data.isWallGrab && data.wallDistance < 0.7f) { Vector2 velocity = data.playerVel.velocity; @@ -44,7 +46,8 @@ public class PlayerMovement : MonoBehaviour // ٶ෴Ŀ data.playerVel.velocity -= data.playerVel.velocity * TimeHandler.timeScale * 0.01f * 0.1f * extraDrag * multiplier; data.playerVel.angularVelocity -= data.playerVel.angularVelocity * TimeHandler.timeScale * 0.01f * 0.1f * extraAngularDrag * multiplier; - } +#endif + } private void Update() { diff --git a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll Binary files differindex 8ee191b..5d9c678 100644 --- a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll +++ b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll diff --git a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb Binary files differindex b748500..89d1b62 100644 --- a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb +++ b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.pdb diff --git a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll Binary files differindex 8ee191b..5d9c678 100644 --- a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll +++ b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.dll diff --git a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb Binary files differindex b748500..89d1b62 100644 --- a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb +++ b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb diff --git a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache index 723adb5..59371bf 100644 --- a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache +++ b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -33474f73f933efdfb31f86b6b5137b0e424a5cf9 +79f9f757afc32c7e1628632fee8ea891bdd71bb0 |