From 73fdcea6c81de3ffebd808a32e08da63480d7b94 Mon Sep 17 00:00:00 2001 From: chai <215380520@qq.com> Date: Sat, 28 Oct 2023 21:54:30 +0800 Subject: *misc --- "Doc/\344\273\243\347\240\201.txt" | 0 ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 | Bin 111939 -> 116511 bytes .../137f2f53-0b71-4a63-9ade-cfe5b28588f0.vsidx | Bin 88765 -> 0 bytes .../2adbfb29-6aff-48dd-8bc3-b9f979cbf6ae.vsidx | Bin 58169 -> 0 bytes .../81f59e87-7d5d-428b-9655-e998bc993e47.vsidx | Bin 1284045 -> 0 bytes ROUNDS/.vs/ROUNDS/v17/.suo | Bin 108032 -> 155648 bytes ROUNDS/CollisionChecker.cs | 41 ----- ROUNDS/Gravity.cs | 35 ---- ROUNDS/Holding.cs | 75 -------- ROUNDS/Movement.cs | 3 + ROUNDS/ROUNDS.csproj | 204 ++++++++++----------- ROUNDS/StandStillTrigger.cs | 1 + ROUNDS/WallRayCaster.cs | 34 ---- ROUNDS/_Player/CharacterData.cs | 28 ++- ROUNDS/_Player/CollisionChecker.cs | 43 +++++ ROUNDS/_Player/GeneralInput.cs | 1 + ROUNDS/_Player/Gravity.cs | 35 ++++ ROUNDS/_Player/Holding.cs | 75 ++++++++ ROUNDS/_Player/PlayerCollision.cs | 2 + ROUNDS/_Player/PlayerFollowGround.cs | 44 ++--- ROUNDS/_Player/WallRayCaster.cs | 34 ++++ .../bin/Debug/netstandard2.1/Assembly-CSharp.dll | Bin 908288 -> 909312 bytes .../bin/Debug/netstandard2.1/Assembly-CSharp.pdb | Bin 484800 -> 486868 bytes .../obj/Debug/netstandard2.1/Assembly-CSharp.dll | Bin 908288 -> 909312 bytes .../obj/Debug/netstandard2.1/Assembly-CSharp.pdb | Bin 484800 -> 486868 bytes ...OUNDS.GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/netstandard2.1/ROUNDS.assets.cache | Bin 232 -> 236 bytes .../ROUNDS.csproj.AssemblyReference.cache | Bin 139592 -> 144692 bytes .../ROUNDS.csproj.CoreCompileInputs.cache | 2 +- .../ROUNDS.csproj.FileListAbsolute.txt | 113 ++++++++++++ ROUNDS/obj/ROUNDS.csproj.nuget.dgspec.json | 12 +- ROUNDS/obj/project.assets.json | 8 +- ROUNDS/obj/project.nuget.cache | 4 +- 33 files changed, 471 insertions(+), 325 deletions(-) create mode 100644 "Doc/\344\273\243\347\240\201.txt" delete mode 100644 ROUNDS/.vs/ROUNDS/FileContentIndex/137f2f53-0b71-4a63-9ade-cfe5b28588f0.vsidx delete mode 100644 ROUNDS/.vs/ROUNDS/FileContentIndex/2adbfb29-6aff-48dd-8bc3-b9f979cbf6ae.vsidx delete mode 100644 ROUNDS/.vs/ROUNDS/FileContentIndex/81f59e87-7d5d-428b-9655-e998bc993e47.vsidx delete mode 100644 ROUNDS/CollisionChecker.cs delete mode 100644 ROUNDS/Gravity.cs delete mode 100644 ROUNDS/Holding.cs delete mode 100644 ROUNDS/WallRayCaster.cs create mode 100644 ROUNDS/_Player/CollisionChecker.cs create mode 100644 ROUNDS/_Player/Gravity.cs create mode 100644 ROUNDS/_Player/Holding.cs create mode 100644 ROUNDS/_Player/WallRayCaster.cs diff --git "a/Doc/\344\273\243\347\240\201.txt" "b/Doc/\344\273\243\347\240\201.txt" new file mode 100644 index 0000000..e69de29 diff --git a/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 b/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 index a483844..62e3f8e 100644 Binary files a/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 and b/ROUNDS/.vs/ROUNDS/DesignTimeBuild/.dtbcache.v2 differ diff --git a/ROUNDS/.vs/ROUNDS/FileContentIndex/137f2f53-0b71-4a63-9ade-cfe5b28588f0.vsidx b/ROUNDS/.vs/ROUNDS/FileContentIndex/137f2f53-0b71-4a63-9ade-cfe5b28588f0.vsidx deleted file mode 100644 index b724439..0000000 Binary files a/ROUNDS/.vs/ROUNDS/FileContentIndex/137f2f53-0b71-4a63-9ade-cfe5b28588f0.vsidx and /dev/null differ diff --git a/ROUNDS/.vs/ROUNDS/FileContentIndex/2adbfb29-6aff-48dd-8bc3-b9f979cbf6ae.vsidx b/ROUNDS/.vs/ROUNDS/FileContentIndex/2adbfb29-6aff-48dd-8bc3-b9f979cbf6ae.vsidx deleted file mode 100644 index da17e01..0000000 Binary files a/ROUNDS/.vs/ROUNDS/FileContentIndex/2adbfb29-6aff-48dd-8bc3-b9f979cbf6ae.vsidx and /dev/null differ diff --git a/ROUNDS/.vs/ROUNDS/FileContentIndex/81f59e87-7d5d-428b-9655-e998bc993e47.vsidx b/ROUNDS/.vs/ROUNDS/FileContentIndex/81f59e87-7d5d-428b-9655-e998bc993e47.vsidx deleted file mode 100644 index 56e3d3d..0000000 Binary files a/ROUNDS/.vs/ROUNDS/FileContentIndex/81f59e87-7d5d-428b-9655-e998bc993e47.vsidx and /dev/null differ diff --git a/ROUNDS/.vs/ROUNDS/v17/.suo b/ROUNDS/.vs/ROUNDS/v17/.suo index e6cd5dc..c630da1 100644 Binary files a/ROUNDS/.vs/ROUNDS/v17/.suo and b/ROUNDS/.vs/ROUNDS/v17/.suo differ diff --git a/ROUNDS/CollisionChecker.cs b/ROUNDS/CollisionChecker.cs deleted file mode 100644 index a344911..0000000 --- a/ROUNDS/CollisionChecker.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using UnityEngine; - -public class CollisionChecker : MonoBehaviour -{ - private CharacterData data; - - public Action collisionAction; - - private void Awake() - { - data = GetComponent(); - } - - private void OnCollisionEnter2D(Collision2D collision) - { - Collide(collision); - } - - private void OnCollisionStay2D(Collision2D collision) - { - Collide(collision); - } - - private void Collide(Collision2D collision) - { - if (collisionAction != null) - { - collisionAction(collision); - } - if (Vector3.Angle(Vector3.up, collision.contacts[0].normal) > 70f) - { - Vector3.Angle(Vector3.up, collision.contacts[0].normal); - _ = 110f; - } - else - { - data.TouchGround(collision.contacts[0].point, collision.contacts[0].normal, collision.otherRigidbody, collision.transform); - } - } -} diff --git a/ROUNDS/Gravity.cs b/ROUNDS/Gravity.cs deleted file mode 100644 index 1d9cb83..0000000 --- a/ROUNDS/Gravity.cs +++ /dev/null @@ -1,35 +0,0 @@ -using UnityEngine; - -public class Gravity : MonoBehaviour -{ - public float gravityForce; - - public float exponent = 1f; - - private PlayerVelocity rig; - - private CharacterData data; - - private void Start() - { - data = GetComponent(); - rig = GetComponent(); - } - - private void FixedUpdate() - { - float num = data.sinceGrounded; - if (data.sinceWallGrab < num) - { - num = data.sinceWallGrab; - } - if (num > 0f) - { - rig.AddForce(Vector3.down * TimeHandler.timeScale * Mathf.Pow(num, exponent) * gravityForce * rig.mass, ForceMode2D.Force); - } - else - { - rig.AddForce(Vector3.down * TimeHandler.timeScale * num * gravityForce * rig.mass, ForceMode2D.Force); - } - } -} diff --git a/ROUNDS/Holding.cs b/ROUNDS/Holding.cs deleted file mode 100644 index 1f1839f..0000000 --- a/ROUNDS/Holding.cs +++ /dev/null @@ -1,75 +0,0 @@ -using UnityEngine; - -public class Holding : MonoBehaviour -{ - public float force; - - public float drag; - - public Holdable holdable; - - private Transform handPos; - - private PlayerVelocity rig; - - private GeneralInput input; - - private CharacterData data; - - private Player player; - - private Gun gun; - - private bool hasSpawnedGun; - - public void Awake() - { - if (hasSpawnedGun) - { - Object.Destroy(holdable.gameObject); - } - hasSpawnedGun = true; - holdable = Object.Instantiate(holdable, base.transform.position, Quaternion.identity); - player = GetComponent(); - holdable.GetComponent().holder = player.data; - handPos = GetComponentInChildren().transform; - rig = GetComponent(); - input = GetComponent(); - data = GetComponent(); - if ((bool)holdable) - { - gun = holdable.GetComponent(); - GetComponentInChildren().gun = holdable.GetComponent(); - } - } - - private void Start() - { - if ((bool)holdable) - { - holdable.SetTeamColors(PlayerSkinBank.GetPlayerSkinColors(player.playerID), player); - } - } - - private void FixedUpdate() - { - if ((bool)holdable && (bool)holdable.rig) - { - holdable.rig.AddForce((handPos.transform.position + (Vector3)rig.velocity * 0.04f - holdable.transform.position) * force * holdable.rig.mass, ForceMode2D.Force); - holdable.rig.AddForce(holdable.rig.velocity * (0f - drag) * holdable.rig.mass, ForceMode2D.Force); - holdable.rig.transform.rotation = Quaternion.LookRotation(Vector3.forward, handPos.transform.forward); - } - } - - private void Update() - { - } - - private void OnDestroy() - { - if ((bool)holdable) - { - Object.Destroy(holdable.gameObject); - } - } -} diff --git a/ROUNDS/Movement.cs b/ROUNDS/Movement.cs index 17d7b11..f62c82e 100644 --- a/ROUNDS/Movement.cs +++ b/ROUNDS/Movement.cs @@ -1,5 +1,8 @@ using UnityEngine; + + +// 没用 public class Movement : MonoBehaviour { public float jumpForce; diff --git a/ROUNDS/ROUNDS.csproj b/ROUNDS/ROUNDS.csproj index eff937d..ce465f3 100644 --- a/ROUNDS/ROUNDS.csproj +++ b/ROUNDS/ROUNDS.csproj @@ -11,310 +11,310 @@ - ..\..\Rounds_Data\Managed\AmplifyColor.dll + ..\..\Game\Rounds_Data\Managed\AmplifyColor.dll - ..\..\Rounds_Data\Managed\Assembly-CSharp-firstpass.dll + ..\..\Game\Rounds_Data\Managed\Assembly-CSharp-firstpass.dll - ..\..\Rounds_Data\Managed\BitpackersASMDEF.dll + ..\..\Game\Rounds_Data\Managed\BitpackersASMDEF.dll - ..\..\Rounds_Data\Managed\ByteConverter.dll + ..\..\Game\Rounds_Data\Managed\ByteConverter.dll - ..\..\Rounds_Data\Managed\EmoCompressUtilsASMDEF.dll + ..\..\Game\Rounds_Data\Managed\EmoCompressUtilsASMDEF.dll - ..\..\Rounds_Data\Managed\FloatCrusher.dll + ..\..\Game\Rounds_Data\Managed\FloatCrusher.dll - ..\..\Rounds_Data\Managed\HalfFloatASMDEF.dll + ..\..\Game\Rounds_Data\Managed\HalfFloatASMDEF.dll - ..\..\Rounds_Data\Managed\HalFloat.dll + ..\..\Game\Rounds_Data\Managed\HalFloat.dll - ..\..\Rounds_Data\Managed\InControl.dll + ..\..\Game\Rounds_Data\Managed\InControl.dll - ..\..\Rounds_Data\Managed\Mono.Posix.dll + ..\..\Game\Rounds_Data\Managed\Mono.Posix.dll - ..\..\Rounds_Data\Managed\Mono.Security.dll + ..\..\Game\Rounds_Data\Managed\Mono.Security.dll - ..\..\Rounds_Data\Managed\Photon3Unity3D.dll + ..\..\Game\Rounds_Data\Managed\Photon3Unity3D.dll - ..\..\Rounds_Data\Managed\PhotonChat.dll + ..\..\Game\Rounds_Data\Managed\PhotonChat.dll - ..\..\Rounds_Data\Managed\PhotonRealtime.dll + ..\..\Game\Rounds_Data\Managed\PhotonRealtime.dll - ..\..\Rounds_Data\Managed\PhotonUnityNetworking.dll + ..\..\Game\Rounds_Data\Managed\PhotonUnityNetworking.dll - ..\..\Rounds_Data\Managed\PhotonUnityNetworking.Demos.dll + ..\..\Game\Rounds_Data\Managed\PhotonUnityNetworking.Demos.dll - ..\..\Rounds_Data\Managed\PhotonUnityNetworking.Utilities.dll + ..\..\Game\Rounds_Data\Managed\PhotonUnityNetworking.Utilities.dll - ..\..\Rounds_Data\Managed\PhotonWebSocket.dll + ..\..\Game\Rounds_Data\Managed\PhotonWebSocket.dll - ..\..\Rounds_Data\Managed\QuatCompress.dll + ..\..\Game\Rounds_Data\Managed\QuatCompress.dll - ..\..\Rounds_Data\Managed\Sirenix.OdinInspector.Attributes.dll + ..\..\Game\Rounds_Data\Managed\Sirenix.OdinInspector.Attributes.dll - ..\..\Rounds_Data\Managed\Sirenix.OdinInspector.CompatibilityLayer.dll + ..\..\Game\Rounds_Data\Managed\Sirenix.OdinInspector.CompatibilityLayer.dll - ..\..\Rounds_Data\Managed\Sirenix.Serialization.dll + ..\..\Game\Rounds_Data\Managed\Sirenix.Serialization.dll - ..\..\Rounds_Data\Managed\Sirenix.Serialization.Config.dll + ..\..\Game\Rounds_Data\Managed\Sirenix.Serialization.Config.dll - ..\..\Rounds_Data\Managed\Sirenix.Utilities.dll + ..\..\Game\Rounds_Data\Managed\Sirenix.Utilities.dll - ..\..\Rounds_Data\Managed\SonigonAudioEngine.Runtime.dll + ..\..\Game\Rounds_Data\Managed\SonigonAudioEngine.Runtime.dll - ..\..\Rounds_Data\Managed\System.Configuration.dll + ..\..\Game\Rounds_Data\Managed\System.Configuration.dll - ..\..\Rounds_Data\Managed\System.Diagnostics.StackTrace.dll + ..\..\Game\Rounds_Data\Managed\System.Diagnostics.StackTrace.dll - ..\..\Rounds_Data\Managed\System.EnterpriseServices.dll + ..\..\Game\Rounds_Data\Managed\System.EnterpriseServices.dll - ..\..\Rounds_Data\Managed\System.Globalization.Extensions.dll + ..\..\Game\Rounds_Data\Managed\System.Globalization.Extensions.dll - ..\..\Rounds_Data\Managed\System.Security.dll + ..\..\Game\Rounds_Data\Managed\System.Security.dll - ..\..\Rounds_Data\Managed\System.ServiceModel.Internals.dll + ..\..\Game\Rounds_Data\Managed\System.ServiceModel.Internals.dll - ..\..\Rounds_Data\Managed\System.Xml.XPath.XDocument.dll + ..\..\Game\Rounds_Data\Managed\System.Xml.XPath.XDocument.dll - ..\..\Rounds_Data\Managed\Unity.Analytics.DataPrivacy.dll + ..\..\Game\Rounds_Data\Managed\Unity.Analytics.DataPrivacy.dll - ..\..\Rounds_Data\Managed\Unity.Analytics.StandardEvents.dll + ..\..\Game\Rounds_Data\Managed\Unity.Analytics.StandardEvents.dll - ..\..\Rounds_Data\Managed\Unity.Postprocessing.Runtime.dll + ..\..\Game\Rounds_Data\Managed\Unity.Postprocessing.Runtime.dll - ..\..\Rounds_Data\Managed\Unity.TextMeshPro.dll + ..\..\Game\Rounds_Data\Managed\Unity.TextMeshPro.dll - ..\..\Rounds_Data\Managed\UnityEngine.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.dll - ..\..\Rounds_Data\Managed\UnityEngine.AccessibilityModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.AccessibilityModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.AIModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.AIModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.AnimationModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.AnimationModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.ARModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ARModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.AssetBundleModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.AssetBundleModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.AudioModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.AudioModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.BaselibModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.BaselibModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.ClothModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ClothModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.ClusterInputModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ClusterInputModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.ClusterRendererModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ClusterRendererModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.CoreModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.CoreModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.CrashReportingModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.CrashReportingModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.DirectorModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.DirectorModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.FileSystemHttpModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.FileSystemHttpModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.GameCenterModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.GameCenterModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.GridModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.GridModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.HotReloadModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.HotReloadModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.ImageConversionModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ImageConversionModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.IMGUIModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.IMGUIModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.InputModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.InputModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.JSONSerializeModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.JSONSerializeModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.LocalizationModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.LocalizationModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.Networking.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.Networking.dll - ..\..\Rounds_Data\Managed\UnityEngine.ParticleSystemModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ParticleSystemModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.PerformanceReportingModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.PerformanceReportingModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.Physics2DModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.Physics2DModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.PhysicsModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.PhysicsModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.ProfilerModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ProfilerModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.Purchasing.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.Purchasing.dll - ..\..\Rounds_Data\Managed\UnityEngine.ScreenCaptureModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.ScreenCaptureModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.SharedInternalsModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.SharedInternalsModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.SpatialTracking.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.SpatialTracking.dll - ..\..\Rounds_Data\Managed\UnityEngine.SpriteMaskModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.SpriteMaskModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.SpriteShapeModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.SpriteShapeModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.StreamingModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.StreamingModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.StyleSheetsModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.StyleSheetsModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.SubstanceModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.SubstanceModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.TerrainModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TerrainModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.TerrainPhysicsModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TerrainPhysicsModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.TextCoreModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TextCoreModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.TextRenderingModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TextRenderingModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.TilemapModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TilemapModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.Timeline.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.Timeline.dll - ..\..\Rounds_Data\Managed\UnityEngine.TimelineModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TimelineModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.TLSModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.TLSModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UI.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UI.dll - ..\..\Rounds_Data\Managed\UnityEngine.UIElementsModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UIElementsModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UIModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UIModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UmbraModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UmbraModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UNETModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UNETModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityAnalyticsModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityAnalyticsModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityConnectModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityConnectModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityTestProtocolModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityTestProtocolModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityWebRequestModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityWebRequestModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityWebRequestTextureModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityWebRequestTextureModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.VehiclesModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.VehiclesModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.VFXModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.VFXModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.VideoModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.VideoModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.VRModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.VRModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.WindModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.WindModule.dll - ..\..\Rounds_Data\Managed\UnityEngine.XRModule.dll + ..\..\Game\Rounds_Data\Managed\UnityEngine.XRModule.dll - ..\..\Rounds_Data\Managed\websocket-sharp.dll + ..\..\Game\Rounds_Data\Managed\websocket-sharp.dll \ No newline at end of file diff --git a/ROUNDS/StandStillTrigger.cs b/ROUNDS/StandStillTrigger.cs index b5dc487..19e81e8 100644 --- a/ROUNDS/StandStillTrigger.cs +++ b/ROUNDS/StandStillTrigger.cs @@ -1,5 +1,6 @@ using UnityEngine; +// 没用 public class StandStillTrigger : MonoBehaviour { public float sinceStandStill; diff --git a/ROUNDS/WallRayCaster.cs b/ROUNDS/WallRayCaster.cs deleted file mode 100644 index b7d5c52..0000000 --- a/ROUNDS/WallRayCaster.cs +++ /dev/null @@ -1,34 +0,0 @@ -using UnityEngine; - -public class WallRayCaster : MonoBehaviour -{ - public float rayLength = 0.7f; - - public LayerMask mask; - - private GeneralInput input; - - private CharacterData data; - - private Rigidbody2D rig; - - private void Start() - { - input = GetComponent(); - data = GetComponent(); - rig = GetComponent(); - } - - private void Update() - { - } - - public void RayCast(Vector3 dir, float offset = 0f) - { - RaycastHit2D raycastHit2D = Physics2D.Raycast(base.transform.position + base.transform.up * offset, dir, rayLength * base.transform.localScale.x, mask); - if ((bool)raycastHit2D.transform && !raycastHit2D.collider.GetComponent() && Vector3.Angle(raycastHit2D.normal, Vector3.up) > 70f && Vector3.Angle(raycastHit2D.normal, Vector3.up) < 110f) - { - data.TouchWall(raycastHit2D.normal, raycastHit2D.point); - } - } -} diff --git a/ROUNDS/_Player/CharacterData.cs b/ROUNDS/_Player/CharacterData.cs index 2f41ef3..524515c 100644 --- a/ROUNDS/_Player/CharacterData.cs +++ b/ROUNDS/_Player/CharacterData.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using Photon.Pun; using UnityEngine; +using UnityEngine.Serialization; public class CharacterData : MonoBehaviour { @@ -55,9 +56,26 @@ public class CharacterData : MonoBehaviour public float sinceGrounded; - public bool isGrounded = true; - - private bool wasGroundedLastFrame = true; + // 经过测试，isGrounded可以指示是否着地 + [FormerlySerializedAs("isGrounded")] + private bool m_IsGrounded = true; + private bool m_preGrounded = true; + + public bool isGrounded + { + get { return m_IsGrounded; } + set + { + m_IsGrounded = value; + if (m_preGrounded != value) + { + //this.gameObject.name = "Player_" + value; + } + m_preGrounded = value; + } + } + + private bool wasGroundedLastFrame = true; public Player player; @@ -207,8 +225,12 @@ public class CharacterData : MonoBehaviour wasWallGrabLastFrame = false; } + // 比较重要 + // 有且只有这个方法设置了 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"); + if (sinceJump > 0.2f) { currentJumps = jumps; diff --git a/ROUNDS/_Player/CollisionChecker.cs b/ROUNDS/_Player/CollisionChecker.cs new file mode 100644 index 0000000..f48520e --- /dev/null +++ b/ROUNDS/_Player/CollisionChecker.cs @@ -0,0 +1,43 @@ +using System; +using UnityEngine; + +public class CollisionChecker : MonoBehaviour +{ + private CharacterData data; + + public Action collisionAction; + + private void Awake() + { + data = GetComponent(); + } + + // 经过测试，注释掉这个文件，影响的是和箱子的碰撞，不影响地面 + + private void OnCollisionEnter2D(Collision2D collision) + { + Collide(collision); + } + + private void OnCollisionStay2D(Collision2D collision) + { + Collide(collision); + } + + private void Collide(Collision2D collision) + { + if (collisionAction != null) + { + collisionAction(collision); + } + if (Vector3.Angle(Vector3.up, collision.contacts[0].normal) > 70f) + { + Vector3.Angle(Vector3.up, collision.contacts[0].normal); + _ = 110f; + } + else + { + data.TouchGround(collision.contacts[0].point, collision.contacts[0].normal, collision.otherRigidbody, collision.transform); + } + } +} diff --git a/ROUNDS/_Player/GeneralInput.cs b/ROUNDS/_Player/GeneralInput.cs index 0487def..dad0934 100644 --- a/ROUNDS/_Player/GeneralInput.cs +++ b/ROUNDS/_Player/GeneralInput.cs @@ -203,6 +203,7 @@ public class GeneralInput : MonoBehaviour base.enabled = true; } + // 没用 public void SetState(Vector3 pos, bool isGrounded) { base.transform.position = pos; diff --git a/ROUNDS/_Player/Gravity.cs b/ROUNDS/_Player/Gravity.cs new file mode 100644 index 0000000..1d9cb83 --- /dev/null +++ b/ROUNDS/_Player/Gravity.cs @@ -0,0 +1,35 @@ +using UnityEngine; + +public class Gravity : MonoBehaviour +{ + public float gravityForce; + + public float exponent = 1f; + + private PlayerVelocity rig; + + private CharacterData data; + + private void Start() + { + data = GetComponent(); + rig = GetComponent(); + } + + private void FixedUpdate() + { + float num = data.sinceGrounded; + if (data.sinceWallGrab < num) + { + num = data.sinceWallGrab; + } + if (num > 0f) + { + rig.AddForce(Vector3.down * TimeHandler.timeScale * Mathf.Pow(num, exponent) * gravityForce * rig.mass, ForceMode2D.Force); + } + else + { + rig.AddForce(Vector3.down * TimeHandler.timeScale * num * gravityForce * rig.mass, ForceMode2D.Force); + } + } +} diff --git a/ROUNDS/_Player/Holding.cs b/ROUNDS/_Player/Holding.cs new file mode 100644 index 0000000..1f1839f --- /dev/null +++ b/ROUNDS/_Player/Holding.cs @@ -0,0 +1,75 @@ +using UnityEngine; + +public class Holding : MonoBehaviour +{ + public float force; + + public float drag; + + public Holdable holdable; + + private Transform handPos; + + private PlayerVelocity rig; + + private GeneralInput input; + + private CharacterData data; + + private Player player; + + private Gun gun; + + private bool hasSpawnedGun; + + public void Awake() + { + if (hasSpawnedGun) + { + Object.Destroy(holdable.gameObject); + } + hasSpawnedGun = true; + holdable = Object.Instantiate(holdable, base.transform.position, Quaternion.identity); + player = GetComponent(); + holdable.GetComponent().holder = player.data; + handPos = GetComponentInChildren().transform; + rig = GetComponent(); + input = GetComponent(); + data = GetComponent(); + if ((bool)holdable) + { + gun = holdable.GetComponent(); + GetComponentInChildren().gun = holdable.GetComponent(); + } + } + + private void Start() + { + if ((bool)holdable) + { + holdable.SetTeamColors(PlayerSkinBank.GetPlayerSkinColors(player.playerID), player); + } + } + + private void FixedUpdate() + { + if ((bool)holdable && (bool)holdable.rig) + { + holdable.rig.AddForce((handPos.transform.position + (Vector3)rig.velocity * 0.04f - holdable.transform.position) * force * holdable.rig.mass, ForceMode2D.Force); + holdable.rig.AddForce(holdable.rig.velocity * (0f - drag) * holdable.rig.mass, ForceMode2D.Force); + holdable.rig.transform.rotation = Quaternion.LookRotation(Vector3.forward, handPos.transform.forward); + } + } + + private void Update() + { + } + + private void OnDestroy() + { + if ((bool)holdable) + { + Object.Destroy(holdable.gameObject); + } + } +} diff --git a/ROUNDS/_Player/PlayerCollision.cs b/ROUNDS/_Player/PlayerCollision.cs index 6055a69..c998a15 100644 --- a/ROUNDS/_Player/PlayerCollision.cs +++ b/ROUNDS/_Player/PlayerCollision.cs @@ -45,6 +45,8 @@ public class PlayerCollision : MonoBehaviour vel = GetComponent(); } + // 经过测试，注释掉fixedupdate，有点影响地面碰撞，但还是可以站在地面上 + private void FixedUpdate() { if (checkForGoThroughWall && ignoreWallFor <= 0) diff --git a/ROUNDS/_Player/PlayerFollowGround.cs b/ROUNDS/_Player/PlayerFollowGround.cs index c200f89..4160bc2 100644 --- a/ROUNDS/_Player/PlayerFollowGround.cs +++ b/ROUNDS/_Player/PlayerFollowGround.cs @@ -2,29 +2,31 @@ using UnityEngine; public class PlayerFollowGround : MonoBehaviour { - private CharacterData data; + private CharacterData data; - private Vector2 lastPos; + private Vector2 lastPos; - private Rigidbody2D lastRig; + private Rigidbody2D lastRig; - private void Start() - { - data = GetComponent(); - } + private void Start() + { + data = GetComponent(); + } - private void FixedUpdate() - { - if (data.standOnRig == null || !data.isGrounded) - { - lastPos = Vector2.zero; - return; - } - if (lastPos != Vector2.zero && data.standOnRig == lastRig) - { - data.playerVel.transform.position = data.playerVel.position + (data.standOnRig.position - lastPos); - } - lastPos = data.standOnRig.position; - lastRig = data.standOnRig; - } + // 经过测试，把fixedupdate注释了，影响的是和箱子的碰撞，不影响和地面 + + private void FixedUpdate() + { + if (data.standOnRig == null || !data.isGrounded) + { + lastPos = Vector2.zero; + return; + } + if (lastPos != Vector2.zero && data.standOnRig == lastRig) + { + data.playerVel.transform.position = data.playerVel.position + (data.standOnRig.position - lastPos); + } + lastPos = data.standOnRig.position; + lastRig = data.standOnRig; + } } diff --git a/ROUNDS/_Player/WallRayCaster.cs b/ROUNDS/_Player/WallRayCaster.cs new file mode 100644 index 0000000..b7d5c52 --- /dev/null +++ b/ROUNDS/_Player/WallRayCaster.cs @@ -0,0 +1,34 @@ +using UnityEngine; + +public class WallRayCaster : MonoBehaviour +{ + public float rayLength = 0.7f; + + public LayerMask mask; + + private GeneralInput input; + + private CharacterData data; + + private Rigidbody2D rig; + + private void Start() + { + input = GetComponent(); + data = GetComponent(); + rig = GetComponent(); + } + + private void Update() + { + } + + public void RayCast(Vector3 dir, float offset = 0f) + { + RaycastHit2D raycastHit2D = Physics2D.Raycast(base.transform.position + base.transform.up * offset, dir, rayLength * base.transform.localScale.x, mask); + if ((bool)raycastHit2D.transform && !raycastHit2D.collider.GetComponent() && Vector3.Angle(raycastHit2D.normal, Vector3.up) > 70f && Vector3.Angle(raycastHit2D.normal, Vector3.up) < 110f) + { + data.TouchWall(raycastHit2D.normal, raycastHit2D.point); + } + } +} diff --git a/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll b/ROUNDS/bin/Debug/netstandard2.1/Assembly-CSharp.dll index 7b29d37..d5d9762 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 1e041a9..263699b 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 7b29d37..d5d9762 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 1e041a9..263699b 100644 Binary files a/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb and b/ROUNDS/obj/Debug/netstandard2.1/Assembly-CSharp.pdb differ diff --git a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.GeneratedMSBuildEditorConfig.editorconfig b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.GeneratedMSBuildEditorConfig.editorconfig index 3310772..8c26411 100644 --- a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.GeneratedMSBuildEditorConfig.editorconfig +++ b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,3 @@ is_global = true build_property.RootNamespace = ROUNDS -build_property.ProjectDir = D:\Games\ROUNDS\ROUNDS\ROUNDS\ +build_property.ProjectDir = D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\ diff --git a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.assets.cache b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.assets.cache index a888c9e..17c683b 100644 Binary files a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.assets.cache and b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.assets.cache differ diff --git a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.AssemblyReference.cache b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.AssemblyReference.cache index 9d0ca45..7c03706 100644 Binary files a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.AssemblyReference.cache and b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.AssemblyReference.cache differ diff --git a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache index ad9e109..ad8e926 100644 --- a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache +++ b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1d2fc872e96aa3ffdd6dba73b151e2b7206cd9a5 +d53aa903def1a9e861fd2cda6c1f7a53d40e9560 diff --git a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.FileListAbsolute.txt b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.FileListAbsolute.txt index 1372d10..c8dacc1 100644 --- a/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.FileListAbsolute.txt +++ b/ROUNDS/obj/Debug/netstandard2.1/ROUNDS.csproj.FileListAbsolute.txt @@ -218,3 +218,116 @@ D:\Games\ROUNDS\ROUNDS\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.csproj.CoreCompile D:\Games\ROUNDS\ROUNDS\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.csproj.CopyComplete D:\Games\ROUNDS\ROUNDS\ROUNDS\obj\Debug\netstandard2.1\Assembly-CSharp.dll D:\Games\ROUNDS\ROUNDS\ROUNDS\obj\Debug\netstandard2.1\Assembly-CSharp.pdb +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Assembly-CSharp.deps.json +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Assembly-CSharp.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Assembly-CSharp.pdb +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\AmplifyColor.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Assembly-CSharp-firstpass.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\BitpackersASMDEF.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\ByteConverter.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\EmoCompressUtilsASMDEF.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\FloatCrusher.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\HalfFloatASMDEF.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\HalFloat.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\InControl.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Mono.Posix.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Mono.Security.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Photon3Unity3D.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\PhotonChat.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\PhotonRealtime.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\PhotonUnityNetworking.Demos.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\PhotonUnityNetworking.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\PhotonUnityNetworking.Utilities.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\PhotonWebSocket.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\QuatCompress.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Sirenix.OdinInspector.Attributes.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Sirenix.OdinInspector.CompatibilityLayer.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Sirenix.Serialization.Config.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Sirenix.Serialization.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Sirenix.Utilities.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\SonigonAudioEngine.Runtime.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.Configuration.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.Diagnostics.StackTrace.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.EnterpriseServices.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.Globalization.Extensions.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.Security.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.ServiceModel.Internals.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\System.Xml.XPath.XDocument.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Unity.Analytics.DataPrivacy.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Unity.Analytics.StandardEvents.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Unity.Postprocessing.Runtime.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\Unity.TextMeshPro.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.AccessibilityModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.AIModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.AnimationModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ARModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.AssetBundleModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.AudioModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.BaselibModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ClothModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ClusterInputModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ClusterRendererModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.CoreModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.CrashReportingModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.DirectorModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.FileSystemHttpModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.GameCenterModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.GridModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.HotReloadModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ImageConversionModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.IMGUIModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.InputModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.JSONSerializeModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.LocalizationModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.Networking.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ParticleSystemModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.PerformanceReportingModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.Physics2DModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.PhysicsModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ProfilerModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.Purchasing.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.ScreenCaptureModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.SharedInternalsModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.SpatialTracking.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.SpriteMaskModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.SpriteShapeModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.StreamingModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.StyleSheetsModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.SubstanceModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TerrainModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TerrainPhysicsModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TextCoreModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TextRenderingModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TilemapModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.Timeline.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TimelineModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.TLSModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UI.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UIElementsModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UIModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UmbraModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UNETModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityAnalyticsModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityConnectModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityTestProtocolModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityWebRequestAssetBundleModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityWebRequestAudioModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityWebRequestModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityWebRequestTextureModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.UnityWebRequestWWWModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.VehiclesModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.VFXModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.VideoModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.VRModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.WindModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\UnityEngine.XRModule.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\bin\Debug\netstandard2.1\websocket-sharp.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.csproj.AssemblyReference.cache +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.Properties.Resources.resources +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.csproj.GenerateResource.cache +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.GeneratedMSBuildEditorConfig.editorconfig +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.csproj.CoreCompileInputs.cache +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\ROUNDS.csproj.CopyComplete +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\Assembly-CSharp.dll +D:\Documents\Unity\Decompile\Rounds\SourceCode\ROUNDS\obj\Debug\netstandard2.1\Assembly-CSharp.pdb diff --git a/ROUNDS/obj/ROUNDS.csproj.nuget.dgspec.json b/ROUNDS/obj/ROUNDS.csproj.nuget.dgspec.json index 25d990e..ee42b7f 100644 --- a/ROUNDS/obj/ROUNDS.csproj.nuget.dgspec.json +++ b/ROUNDS/obj/ROUNDS.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj": {} + "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj": {} }, "projects": { - "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj": { + "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj", + "projectUniqueName": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj", "projectName": "Assembly-CSharp", - "projectPath": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj", + "projectPath": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj", "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", - "outputPath": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\obj\\", + "outputPath": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -59,7 +59,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/ROUNDS/obj/project.assets.json b/ROUNDS/obj/project.assets.json index a8f23e4..e65572c 100644 --- a/ROUNDS/obj/project.assets.json +++ b/ROUNDS/obj/project.assets.json @@ -14,11 +14,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj", + "projectUniqueName": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj", "projectName": "Assembly-CSharp", - "projectPath": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj", + "projectPath": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj", "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", - "outputPath": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\obj\\", + "outputPath": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -66,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.102\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/ROUNDS/obj/project.nuget.cache b/ROUNDS/obj/project.nuget.cache index 698c706..baca3fc 100644 --- a/ROUNDS/obj/project.nuget.cache +++ b/ROUNDS/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "52fqfedSZGFV1JmNIJwNIP5R6bJvwKQ9YzGSjecwFqCycLEyNuKZ+iaj+GhQ4MGoXfZ4h0Geb2fOq5dwanFkVg==", + "dgSpecHash": "E307IL0e8SMRarKHrVMhXTJeUOtQir66gYAHkyR2wh9y8roi6fAEuTyIA34xVEoRHX2lUWbQfO47nKUwdgd3UA==", "success": true, - "projectFilePath": "D:\\Games\\ROUNDS\\ROUNDS\\ROUNDS\\ROUNDS.csproj", + "projectFilePath": "D:\\Documents\\Unity\\Decompile\\Rounds\\SourceCode\\ROUNDS\\ROUNDS.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file -- cgit v1.1-26-g67d0