diff options
21 files changed, 977 insertions, 126 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab index aec59b7..da32b43 100644 --- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab +++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab @@ -98,6 +98,60 @@ CapsuleCollider: m_Height: 2.000001 m_Direction: 1 m_Center: {x: 0, y: 0.00000023841858, z: 0.000000044703484} +--- !u!1 &336585835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 336585836} + - component: {fileID: 336585837} + m_Layer: 6 + m_Name: CameraYRot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &336585836 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336585835} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1111946643} + m_Father: {fileID: 1932504148} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &336585837 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336585835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8f75acb6587ee74a9cfb051869e7a39, type: 3} + m_Name: + m_EditorClassIdentifier: + useX: 0 + xSpace: 0 + xVector: {x: 0, y: 0, z: 0} + useY: 1 + ySpace: 0 + yVector: {x: -1, y: 0, z: 0} + needControl: 1 + needAlive: 1 + freezeUnusedAngles: 0 --- !u!1 &679016040 GameObject: m_ObjectHideFlags: 0 @@ -391,6 +445,38 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.4 m_Center: {x: 0, y: 0, z: -0.00000013411045} +--- !u!1 &1111946642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1111946643} + m_Layer: 6 + m_Name: Pivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1111946643 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111946642} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1848931109} + m_Father: {fileID: 336585836} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1116313581 GameObject: m_ObjectHideFlags: 0 @@ -587,6 +673,75 @@ CapsuleCollider: m_Height: 2 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1212081994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1212081995} + - component: {fileID: 1212081997} + - component: {fileID: 1212081996} + m_Layer: 6 + m_Name: DirectionObjects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1212081995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212081994} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1400154561} + m_Father: {fileID: 1666344766112317020} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1212081997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212081994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73a2f45ff0944e442b2a14ada16c195f, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 4068544631671626976} + offset: {x: 0, y: 0, z: 0} +--- !u!114 &1212081996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1212081994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8f75acb6587ee74a9cfb051869e7a39, type: 3} + m_Name: + m_EditorClassIdentifier: + useX: 1 + xSpace: 1 + xVector: {x: 0, y: 1, z: 0} + useY: 0 + ySpace: 0 + yVector: {x: 0, y: 0, z: 0} + needControl: 1 + needAlive: 0 + freezeUnusedAngles: 0 --- !u!1 &1234205108 GameObject: m_ObjectHideFlags: 0 @@ -685,6 +840,50 @@ CapsuleCollider: m_Height: 2.000001 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1300165643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1300165644} + - component: {fileID: 1300165645} + m_Layer: 6 + m_Name: RotationTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1300165644 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1300165643} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1400154561} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1300165645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1300165643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6017d73a8e55c946960548b77bb264b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1325114489 GameObject: m_ObjectHideFlags: 0 @@ -783,6 +982,38 @@ CapsuleCollider: m_Height: 2 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1400154560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1400154561} + m_Layer: 6 + m_Name: Pivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1400154561 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400154560} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1300165644} + m_Father: {fileID: 1212081995} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1639162264 GameObject: m_ObjectHideFlags: 0 @@ -1265,6 +1496,174 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a7459e71d3133e747833a399f4895b51, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1848931106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1848931109} + - component: {fileID: 1848931108} + - component: {fileID: 1848931107} + - component: {fileID: 1848931111} + - component: {fileID: 1848931110} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1848931109 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848931106} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1111946643} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &1848931108 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848931106} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &1848931107 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848931106} + m_Enabled: 1 +--- !u!114 &1848931111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848931106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!114 &1848931110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848931106} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 795911e4559bdc649bea6a391e6aef71, type: 3} + m_Name: + m_EditorClassIdentifier: + movementSpeed: 10 + fastMovementSpeed: 100 + freeLookSensitivity: 3 + zoomSensitivity: 10 + fastZoomSensitivity: 50 +--- !u!1 &1932504147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1932504148} + m_Layer: 6 + m_Name: CameraMovement + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1932504148 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932504147} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 336585836} + m_Father: {fileID: 1666344766112317020} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2047997612 GameObject: m_ObjectHideFlags: 0 @@ -2451,6 +2850,8 @@ Transform: - {fileID: 861688529590854405} - {fileID: 1808858622} - {fileID: 5197509156858705010} + - {fileID: 1212081995} + - {fileID: 1932504148} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5131,6 +5532,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fa66a59fbdeb88241b1d0a4457980e08, type: 3} m_Name: m_EditorClassIdentifier: + friction: 0.9 + movementVector: {x: 0, y: 0, z: 0} + animationForceAmounts: + values: + - 0 + - 7 + jumpCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + jumpForce: 0 + multiplier: 1 --- !u!114 &3422831897407596435 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs index a15d114..ee7c182 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs @@ -29,12 +29,8 @@ namespace Rigging.Action public AnimationParam<float> balanceForces; - //public float balanceForce; //50 - public AnimationParam<float> footCenterForces; - //public float footCenterForces;//100 - private float muscleMultiplier; //1 private float crouchMultiplier = 1f; //1 diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs index 9652670..90515d7 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs @@ -1,3 +1,5 @@ +using Rigging.BodyPart; +using Rigging.Inputs; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -7,17 +9,74 @@ namespace Rigging.Action public class Rotation : RiggingActionBase { - // Start is called before the first frame update - void Start() + + public Transform rotationTarget; + + public Rigidbody hip; + + public Rigidbody torso; + + public Rigidbody head; + + public float rotationTorque; + + public float clamp; + + public InputHandler input; + + //private PlayerDeath death; + + [HideInInspector] + public float hipCorrectionAmount; + + public bool useHip = true; + + public bool useTorso = true; + + public bool useHead = true; + + protected override void OnStart() { - + //death = GetComponent<PlayerDeath>(); + rotationTarget = transform.root.GetComponentInChildren<RotationTarget>().transform; + hip = player.body.hip.rigidbody; + torso = player.body.torso.rigidbody; + head = player.body.head.rigidbody; + input = transform.root.GetComponentInChildren<InputHandler>(); } - // Update is called once per frame - void Update() + protected override void OnFixedUpdate() { - + float num = head.transform.InverseTransformPoint(rotationTarget.position).x; + float num2 = torso.transform.InverseTransformPoint(rotationTarget.position).x; + hipCorrectionAmount = hip.transform.InverseTransformPoint(hip.transform.position + input.lastInputDirection * 10f).x; + //float muscleFunction = death.muscleFunction; + float muscleFunction = 1; + float num3 = 0.3f; + if (input.inputMovementDirection.magnitude > 0.1f) + { + num3 = 1f; + } + if (clamp != 0f) + { + hipCorrectionAmount = Mathf.Clamp(hipCorrectionAmount, 0f - clamp, clamp); + num = Mathf.Clamp(num, 0f - clamp, clamp); + num2 = Mathf.Clamp(num2, 0f - clamp, clamp); + } + if (useHip) + { + hip.AddTorque(Vector3.up * muscleFunction * rotationTorque * num3 * hipCorrectionAmount, ForceMode.Acceleration); + } + if (useTorso) + { + torso.AddTorque(Vector3.up * muscleFunction * rotationTorque * num2, ForceMode.Acceleration); + } + if (useHead) + { + head.AddTorque(Vector3.up * muscleFunction * rotationTorque * num, ForceMode.Acceleration); + } } + } }
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/AvaragePosition.cs b/ActiveRagdoll/Assets/TABG/Scripts/AvaragePosition.cs new file mode 100644 index 0000000..43ed6d4 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/AvaragePosition.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging +{ + + public class AvaragePosition : MonoBehaviour + { + public Transform[] transforms; + + private Transform rotationHelper; + + public Vector3 offset; + + private void Start() + { + rotationHelper = base.transform.root.GetComponentInChildren<RotationTarget>().transform; + } + + private void LateUpdate() + { + Vector3 zero = Vector3.zero; + for (int i = 0; i < transforms.Length; i++) + { + zero += transforms[i].position; + } + zero /= (float)transforms.Length; + base.transform.position = zero + rotationHelper.TransformDirection(offset); + } + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/AvaragePosition.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/AvaragePosition.cs.meta new file mode 100644 index 0000000..b261aa1 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/AvaragePosition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 50fcd30d4eaec244ba38c1a668d04cd7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraManager.cs b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraManager.cs new file mode 100644 index 0000000..46dc7fd --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraManager.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging +{ + + public class CameraManager : MonoBehaviour + { + // Start is called before the first frame update + void Start() + { + Cursor.lockState = CursorLockMode.Locked; + Cursor.visible = false; + } + + } + + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraManager.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraManager.cs.meta new file mode 100644 index 0000000..2685dde --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eb842cd2348a82a4da482f35c434de80 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs index c988991..dd21770 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs @@ -1,23 +1,121 @@ +using Rigging.BodyPart; +using Rigging.Data; using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace Rigging.Camera +namespace Rigging.Cameras { public class CameraMovement : MonoBehaviour { - // Start is called before the first frame update - void Start() + public Camera camera; + + public Transform positionTarget; + + //public Transform headPosition; + + public Transform rotationTarget; + + //public Transform bobberTarget; + + private StandingDataHandler standingData; + + private float fallingValue; + + private float fallingEffectValue; + + private float minBobble = 0.02f; + + public bool ADS; + + //public DamageEffects effects; + + //private WeaponHandler weaponHandler; + + private Rigidbody hip; + + //private HasControl hasControl; + + //private HeadCollisionHandler headCollisionHandler; + + private MovementDataHandler movementData; + + private Rigidbody torso; + + //private PlayerDeath death; + + private Strength str; + + private Vector3 cameraCurrentRelativeADSPosition = Vector3.zero; + + private Vector3 movementADSVelocity = Vector3.zero; + + private Vector3 ADSMovementPosition = Vector3.zero; + + private void Start() { + torso = base.transform.root.GetComponentInChildren<Torso>().GetComponent<Rigidbody>(); + //headCollisionHandler = base.transform.root.GetComponentInChildren<HeadCollisionHandler>(); + standingData = base.transform.root.GetComponentInChildren<StandingDataHandler>(); + movementData = base.transform.root.GetComponentInChildren<MovementDataHandler>(); + //weaponHandler = base.transform.GetComponentInParent<WeaponHandler>(); + camera = GetComponentInChildren<Camera>(); + hip = base.transform.root.GetComponentInChildren<Hip>().GetComponentInChildren<Rigidbody>(); + //hasControl = base.transform.root.GetComponent<HasControl>(); + //death = base.transform.root.GetComponent<PlayerDeath>(); + str = base.transform.root.GetComponentInChildren<Strength>(); + //effects = base.transform.root.GetComponent<DamageEffects>(); + } + private void LateUpdate() + { + //headCollisionHandler.collisionValue = 0f; + if (standingData.sinceLanded > 1f) + { + fallingValue = Mathf.Clamp(standingData.sinceGrounded - 0.5f, 0f, 10f) * 0.5f; + } + if (standingData.sinceGrounded > 0.5f || standingData.sinceLanded < 0.5f) + { + fallingEffectValue = Mathf.Lerp(fallingEffectValue, fallingValue, Time.smoothDeltaTime * 15f); + } + else + { + fallingEffectValue = Mathf.Lerp(fallingEffectValue, minBobble, Time.smoothDeltaTime * 3f); + } + Vector3 position = positionTarget.position; + base.transform.position = position; + base.transform.rotation = rotationTarget.rotation; + SetCameraPosition(); } - // Update is called once per frame - void Update() + private void SetCameraPosition() { + camera.transform.localPosition = Vector3.Lerp(camera.transform.localPosition, Vector3.zero, Time.deltaTime * 20f); + camera.fieldOfView = Mathf.Lerp(camera.fieldOfView, 90f, Time.deltaTime * 20f); + } + private void FixedUpdate() + { } + + private void Update() + { + //if (hasControl.hasControl) + //{ + // ADSMovementPosition += movementADSVelocity * Time.deltaTime; + //} + } + + //private float GetPhysicsValue() + //{ + // float result = fallingEffectValue * 0.3f + (1f - str.strength) + effects.damageValue; + // if (death.dead) + // { + // result = 1f; + // } + // return result; + //} } }
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/RotationTarget.cs b/ActiveRagdoll/Assets/TABG/Scripts/Camera/RotationTarget.cs new file mode 100644 index 0000000..50a5a7e --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/RotationTarget.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace Rigging +{ + + public class RotationTarget : MonoBehaviour + { + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/RotationTarget.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Camera/RotationTarget.cs.meta new file mode 100644 index 0000000..ae1bc80 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/RotationTarget.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6017d73a8e55c946960548b77bb264b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs index b581821..48550e5 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs @@ -52,14 +52,14 @@ namespace Rigging.Data public T CurrentValue() { - return values[player.status.animation.animationState]; + return values[Mathf.Clamp(player.status.animation.animationState, 0, values.Length - 1)]; } public T current { get { - return values[player.status.animation.animationState]; + return values[Mathf.Clamp(player.status.animation.animationState, 0, values.Length - 1)]; } } diff --git a/ActiveRagdoll/Assets/TABG/Scripts/FollowRotation.cs b/ActiveRagdoll/Assets/TABG/Scripts/FollowRotation.cs new file mode 100644 index 0000000..86b3265 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/FollowRotation.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging +{ + + public class FollowRotation : MonoBehaviour + { + public Transform target; + + private void Start() + { + } + + private void LateUpdate() + { + base.transform.rotation = target.rotation; + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/FollowRotation.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/FollowRotation.cs.meta new file mode 100644 index 0000000..b3c5770 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/FollowRotation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec1f4e1c4a2dd4f41ad1d508b1c12670 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/FollowTransform.cs b/ActiveRagdoll/Assets/TABG/Scripts/FollowTransform.cs new file mode 100644 index 0000000..d64ce97 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/FollowTransform.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging +{ + + public class FollowTransform : MonoBehaviour + { + public Transform target; + + public Vector3 offset; + + private void Start() + { + } + + private void LateUpdate() + { + base.transform.position = target.position + offset; + } + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/FollowTransform.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/FollowTransform.cs.meta new file mode 100644 index 0000000..989e81d --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/FollowTransform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 73a2f45ff0944e442b2a14ada16c195f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs index d32d67d..f5e5ea2 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs @@ -1,4 +1,4 @@ -using Rigging.Camera; +using Rigging.Cameras; using Rigging.Data; using System; using System.Collections; diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Player.cs b/ActiveRagdoll/Assets/TABG/Scripts/Player.cs index e07da7f..6088901 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Player.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Player.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using Rigging.Data; using Rigging.Action; -using Rigging.Camera; +using Rigging.Cameras; using System; using Rigging.BodyPart; using Rigging.Inputs; diff --git a/ActiveRagdoll/Assets/TABG/Scripts/RotateByMouseInput.cs b/ActiveRagdoll/Assets/TABG/Scripts/RotateByMouseInput.cs new file mode 100644 index 0000000..3e1ee14 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/RotateByMouseInput.cs @@ -0,0 +1,126 @@ +using UnityEngine; + +namespace Rigging +{ + + public class RotateByMouseInput : MonoBehaviour + { + public enum XSpace + { + self, + world + } + + public enum YSpace + { + self, + world + } + + public bool useX; + + public XSpace xSpace; + + public Vector3 xVector; + + public bool useY; + + public YSpace ySpace; + + public Vector3 yVector; + + [Header("Control")] + public bool needControl; + + public bool needAlive; + + public bool freezeUnusedAngles; + + //private HasControl hasControl; + + //private PlayerDeath death; + + private float m = 1f; + + private void Start() + { + //if (needControl) + //{ + // hasControl = base.transform.root.GetComponent<HasControl>(); + //} + //if (needAlive) + //{ + // death = base.transform.root.GetComponent<PlayerDeath>(); + //} + } + + private void LateUpdate() + { + //if (needControl && !hasControl.hasControl) + //{ + // return; + //} + //if (needAlive) + //{ + // m = Mathf.Clamp(death.muscleFunction * 2f, 0f, 1f); + // if (death.dead) + // { + // return; + // } + //} + if (useX) + { + Vector3 vector = xVector; + if (xSpace == XSpace.self) + { + vector = base.transform.TransformDirection(vector); + } + base.transform.Rotate(vector * Input.GetAxis("Mouse X") * m * 0.8f, Space.World); + } + if (useY) + { + Vector3 vector2 = yVector; + if (ySpace == YSpace.self) + { + vector2 = base.transform.TransformDirection(vector2); + } + base.transform.Rotate(vector2 * Input.GetAxis("Mouse Y") * m * 0.8f, Space.World); + } + if (!freezeUnusedAngles) + { + return; + } + if (useY) + { + if (yVector.x == 0f) + { + base.transform.localRotation = Quaternion.Euler(0f, base.transform.localEulerAngles.y, base.transform.localEulerAngles.z); + } + if (yVector.y == 0f) + { + base.transform.localRotation = Quaternion.Euler(base.transform.localEulerAngles.x, 0f, base.transform.localEulerAngles.z); + } + if (yVector.z == 0f) + { + base.transform.localRotation = Quaternion.Euler(base.transform.localEulerAngles.x, base.transform.localEulerAngles.y, 0f); + } + } + if (useX) + { + if (xVector.x == 0f) + { + base.transform.localRotation = Quaternion.Euler(0f, base.transform.localEulerAngles.y, base.transform.localEulerAngles.z); + } + if (xVector.y == 0f) + { + base.transform.localRotation = Quaternion.Euler(base.transform.localEulerAngles.x, 0f, base.transform.localEulerAngles.z); + } + if (xVector.z == 0f) + { + base.transform.localRotation = Quaternion.Euler(base.transform.localEulerAngles.x, base.transform.localEulerAngles.y, 0f); + } + } + } + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/RotateByMouseInput.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/RotateByMouseInput.cs.meta new file mode 100644 index 0000000..8321f09 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/RotateByMouseInput.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a8f75acb6587ee74a9cfb051869e7a39 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Test.unity b/ActiveRagdoll/Assets/TABG/Test.unity index 2f78873..af3a164 100644 --- a/ActiveRagdoll/Assets/TABG/Test.unity +++ b/ActiveRagdoll/Assets/TABG/Test.unity @@ -123,6 +123,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &368451397 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} --- !u!850595691 &403353010 LightingSettings: m_ObjectHideFlags: 0 @@ -592,7 +598,13 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} ---- !u!1 &1848931106 +--- !u!4 &1300165644 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1300165644, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1414611728 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -600,102 +612,59 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1848931109} - - component: {fileID: 1848931108} - - component: {fileID: 1848931107} - - component: {fileID: 1848931111} - - component: {fileID: 1848931110} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera + - component: {fileID: 1414611729} + - component: {fileID: 1414611730} + m_Layer: 6 + m_Name: AvaragePosition + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1848931107 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848931106} - m_Enabled: 1 ---- !u!20 &1848931108 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848931106} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1848931109 +--- !u!4 &1414611729 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848931106} - m_LocalRotation: {x: 0.17066039, y: -0.4875977, z: 0.09782282, w: 0.8506199} - m_LocalPosition: {x: 2.20858, y: 2.5698051, z: -1.10273} + m_GameObject: {fileID: 1414611728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 368451397} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1848931110 +--- !u!114 &1414611730 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848931106} - m_Enabled: 0 + m_GameObject: {fileID: 1414611728} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 795911e4559bdc649bea6a391e6aef71, type: 3} + m_Script: {fileID: 11500000, guid: 50fcd30d4eaec244ba38c1a668d04cd7, type: 3} m_Name: m_EditorClassIdentifier: - movementSpeed: 10 - fastMovementSpeed: 100 - freeLookSensitivity: 3 - zoomSensitivity: 10 - fastZoomSensitivity: 50 ---- !u!114 &1848931111 + transforms: + - {fileID: 7163679047628771624} + - {fileID: 6887620786272290103} + offset: {x: 0, y: 0.6, z: 0.3} +--- !u!1 &1848931106 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1848931106, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} +--- !u!20 &1848931108 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 1848931108, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1848931112 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -704,30 +673,9 @@ MonoBehaviour: m_GameObject: {fileID: 1848931106} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Script: {fileID: 11500000, guid: eb842cd2348a82a4da482f35c434de80, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 --- !u!1 &1871198445 GameObject: m_ObjectHideFlags: 0 @@ -825,6 +773,28 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1932504147 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1932504147, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1932504149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1932504147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 334643b75d265f8409ae1340eda60cba, type: 3} + m_Name: + m_EditorClassIdentifier: + camera: {fileID: 1848931108} + positionTarget: {fileID: 1414611729} + rotationTarget: {fileID: 1300165644} + ADS: 0 --- !u!4 &543450652995596035 Transform: m_ObjectHideFlags: 0 @@ -1031,6 +1001,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1111946643, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1932504148, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.86 + objectReference: {fileID: 0} + - target: {fileID: 1932504148, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} propertyPath: m_RootOrder @@ -1091,16 +1073,16 @@ PrefabInstance: propertyPath: m_Name value: human_rigging objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, + - target: {fileID: 3422831897407596435, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: animationForceAmounts.values.Array.size - value: 2 + propertyPath: rotationTorque + value: 250 objectReference: {fileID: 0} - - target: {fileID: 3805300644640191623, guid: fce18bbf37be1384eb1a089a94aac81d, + - target: {fileID: 7846447219259762999, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: animationForceAmounts.values.Array.data[1] - value: 7 - objectReference: {fileID: 0} + propertyPath: rotationTarget + value: + objectReference: {fileID: 1300165644} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} --- !u!1001 &8277099497161960097 diff --git a/ActiveRagdoll/ProjectSettings/EditorBuildSettings.asset b/ActiveRagdoll/ProjectSettings/EditorBuildSettings.asset index ea88784..79cca05 100644 --- a/ActiveRagdoll/ProjectSettings/EditorBuildSettings.asset +++ b/ActiveRagdoll/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 99c9720ab356a0642a771bea13969a05 + path: Assets/TABG/Test.unity + guid: 911ae2cb89e713d45a4f0ca8bdad5400 m_configObjects: {} |