summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <215380520@qq.com>2024-04-17 11:08:32 +0800
committerchai <215380520@qq.com>2024-04-17 11:08:32 +0800
commit8a78f4750a64324cd93308894ef10e474d4881bc (patch)
tree5be20a2d235f4e0cbc35eba3ad88d52c9b3a65ed
parent623cb6dfb717b1d8ad4c42e9ede4507ba5611c07 (diff)
*misc
-rw-r--r--ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab32
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs51
-rw-r--r--ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs.meta11
-rw-r--r--ActiveRagdoll/Assets/TABG/Test.unity186
4 files changed, 195 insertions, 85 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab
index 60c25bb..52c0a89 100644
--- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab
+++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab
@@ -151,7 +151,7 @@ MonoBehaviour:
yVector: {x: -1, y: 0, z: 0}
needControl: 1
needAlive: 1
- freezeUnusedAngles: 0
+ freezeUnusedAngles: 1
--- !u!1 &679016040
GameObject:
m_ObjectHideFlags: 0
@@ -1514,7 +1514,7 @@ MonoBehaviour:
- minTime: 0
maxTime: 0
minAngle: 0
- - minTime: 0.25
+ - minTime: 0.3
maxTime: 1
minAngle: 40
isLeft: 1
@@ -3665,8 +3665,8 @@ MonoBehaviour:
forwardForce: {x: 0, y: 0, z: 0}
backwardsForce: {x: 0, y: 0, z: 0}
forceSpace: 0
- - forwardTorque: {x: 500, y: 0, z: 0}
- backwardsTorque: {x: -500, y: 0, z: 0}
+ - forwardTorque: {x: -5000, y: 0, z: 0}
+ backwardsTorque: {x: 3000, y: 0, z: 0}
torqueSpace: 0
forwardForce: {x: 0, y: 0, z: 0}
backwardsForce: {x: 0, y: 0, z: 0}
@@ -4212,8 +4212,8 @@ MonoBehaviour:
forwardForce: {x: 0, y: 0, z: 0}
backwardsForce: {x: 0, y: 0, z: 0}
forceSpace: 0
- - forwardTorque: {x: 500, y: 0, z: 0}
- backwardsTorque: {x: -500, y: 0, z: 0}
+ - forwardTorque: {x: -5000, y: 0, z: 0}
+ backwardsTorque: {x: 3000, y: 0, z: 0}
torqueSpace: 0
forwardForce: {x: 0, y: 0, z: 0}
backwardsForce: {x: 0, y: 0, z: 0}
@@ -4365,10 +4365,10 @@ ConfigurableJoint:
m_GameObject: {fileID: 5658401667225277159}
m_ConnectedBody: {fileID: 7724590171357447542}
m_ConnectedArticulationBody: {fileID: 0}
- m_Anchor: {x: 0, y: 0, z: -0.1}
+ m_Anchor: {x: 0, y: 0, z: -0.05}
m_Axis: {x: 0, y: -1, z: 0}
m_AutoConfigureConnectedAnchor: 1
- m_ConnectedAnchor: {x: 0.116635986, y: 0, z: -0.017830601}
+ m_ConnectedAnchor: {x: 0.16663599, y: 0, z: -0.017830608}
serializedVersion: 2
m_SecondaryAxis: {x: 0, y: 1, z: 0}
m_XMotion: 0
@@ -4392,14 +4392,14 @@ ConfigurableJoint:
bounciness: 0
contactDistance: 0
m_HighAngularXLimit:
- limit: 35
+ limit: 10.6301
bounciness: 0
contactDistance: 0
m_AngularYZLimitSpring:
spring: 0
damper: 0
m_AngularYLimit:
- limit: 65
+ limit: 80.4147
bounciness: 0
contactDistance: 0
m_AngularZLimit:
@@ -4732,7 +4732,7 @@ MonoBehaviour:
forwardForce: {x: 0, y: 0, z: 0}
backwardsForce: {x: 0, y: 0, z: 0}
forceSpace: 0
- - forwardTorque: {x: -4000, y: 0, z: 0}
+ - forwardTorque: {x: -2500, y: 0, z: 0}
backwardsTorque: {x: 4000, y: 0, z: 0}
torqueSpace: 0
forwardForce: {x: 0, y: 0, z: 0}
@@ -4975,7 +4975,7 @@ MonoBehaviour:
forwardForce: {x: 0, y: 0, z: 0}
backwardsForce: {x: 0, y: 0, z: 0}
forceSpace: 0
- - forwardTorque: {x: -4000, y: 0, z: 0}
+ - forwardTorque: {x: -2500, y: 0, z: 0}
backwardsTorque: {x: 4000, y: 0, z: 0}
torqueSpace: 0
forwardForce: {x: 0, y: 0, z: 0}
@@ -5113,10 +5113,10 @@ ConfigurableJoint:
m_GameObject: {fileID: 7307037826757058977}
m_ConnectedBody: {fileID: 7724590171357447542}
m_ConnectedArticulationBody: {fileID: 0}
- m_Anchor: {x: 0, y: 0, z: -0.1}
+ m_Anchor: {x: 0, y: 0, z: -0.05}
m_Axis: {x: 0, y: 1, z: 0}
m_AutoConfigureConnectedAnchor: 1
- m_ConnectedAnchor: {x: -0.116635986, y: 0, z: 0}
+ m_ConnectedAnchor: {x: -0.16663599, y: 0, z: -0.017830608}
serializedVersion: 2
m_SecondaryAxis: {x: 0, y: 1, z: 0}
m_XMotion: 0
@@ -5140,14 +5140,14 @@ ConfigurableJoint:
bounciness: 0
contactDistance: 0
m_HighAngularXLimit:
- limit: 35
+ limit: 10.630102
bounciness: 0
contactDistance: 0
m_AngularYZLimitSpring:
spring: 0
damper: 0
m_AngularYLimit:
- limit: 65
+ limit: 80.414696
bounciness: 0
contactDistance: 0
m_AngularZLimit:
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs
new file mode 100644
index 0000000..992c1c7
--- /dev/null
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs
@@ -0,0 +1,51 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+public class DebugSceneCamera : MonoBehaviour
+{
+ public Transform target;
+
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ //var camera = SceneView.lastActiveSceneView.camera;
+ //if(camera != null)
+ //{
+ // Debug.Log("asdasd");
+
+ // Vector3 pos = target.position;
+
+ // camera.transform.position = pos + target.right * -10;
+ // camera.transform.forward = target.right;
+
+ //}
+
+ //Camera cameraMain = Camera.main;
+ //var sceneView = SceneView.lastActiveSceneView;
+ //if (sceneView != null)
+ //{
+ // sceneView.cameraSettings.nearClip = cameraMain.nearClipPlane;
+ // sceneView.cameraSettings.fieldOfView = cameraMain.fieldOfView;
+ // sceneView.pivot = cameraMain.transform.position +
+ // cameraMain.transform.forward * sceneView.cameraDistance;
+ // sceneView.rotation = cameraMain.transform.rotation;
+ //}
+
+ var sceneView = SceneView.lastActiveSceneView;
+ if (sceneView != null)
+ {
+ sceneView.pivot = target.position;
+ Quaternion rot = Quaternion.LookRotation(target.right);
+ sceneView.LookAtDirect(target.position, rot);
+ }
+
+ }
+}
diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs.meta
new file mode 100644
index 0000000..f090602
--- /dev/null
+++ b/ActiveRagdoll/Assets/TABG/Scripts/Debug/DebugSceneCamera.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0b267f121234256468abce167290624b
+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 24378b7..12a2d5b 100644
--- a/ActiveRagdoll/Assets/TABG/Test.unity
+++ b/ActiveRagdoll/Assets/TABG/Test.unity
@@ -123,6 +123,51 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &23701354
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 23701356}
+ - component: {fileID: 23701355}
+ m_Layer: 0
+ m_Name: SceneCamera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!114 &23701355
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 23701354}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0b267f121234256468abce167290624b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ target: {fileID: 8128778564773403801}
+--- !u!4 &23701356
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 23701354}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -1.6151596, y: 0.62225217, z: 0.94675076}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!850595691 &403353010
LightingSettings:
m_ObjectHideFlags: 0
@@ -203,7 +248,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!65 &705426290
BoxCollider:
m_ObjectHideFlags: 0
@@ -274,13 +319,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705426289}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.168, y: -0.08, z: 0.14327973}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_Father: {fileID: 1061905091}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &705806567
GameObject:
@@ -372,13 +417,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705806567}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 1, z: 100}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_Father: {fileID: 1061905091}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &814323549
GameObject:
@@ -469,13 +514,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814323549}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.727, y: 0.295, z: 0.49133635}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_Father: {fileID: 1061905091}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &981251352
GameObject:
@@ -569,8 +614,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_Father: {fileID: 1061905091}
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &981251355
MonoBehaviour:
@@ -592,6 +637,42 @@ MonoBehaviour:
m_ShadowLayerMask: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
+--- !u!1 &1061905090
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1061905091}
+ m_Layer: 0
+ m_Name: Env
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1061905091
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1061905090}
+ 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: 705806571}
+ - {fileID: 1871198449}
+ - {fileID: 705426293}
+ - {fileID: 814323553}
+ - {fileID: 981251354}
+ m_Father: {fileID: 0}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1871198445
GameObject:
m_ObjectHideFlags: 0
@@ -681,13 +762,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1871198445}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.68, y: 0.291, z: 0.709}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_Father: {fileID: 1061905091}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &543450652995596035
Transform:
@@ -703,7 +784,7 @@ Transform:
m_Children:
- {fileID: 3078023919892016089}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &919132148792948153
GameObject:
@@ -895,64 +976,15 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 336585837, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
- propertyPath: freezeUnusedAngles
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1323609233965017470, guid: fce18bbf37be1384eb1a089a94aac81d,
+ - target: {fileID: 1267741373379440053, guid: fce18bbf37be1384eb1a089a94aac81d,
type: 3}
- propertyPath: m_Anchor.z
- value: -0.05
- objectReference: {fileID: 0}
- - target: {fileID: 1323609233965017470, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_ConnectedAnchor.x
- value: -0.16663599
- objectReference: {fileID: 0}
- - target: {fileID: 1323609233965017470, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_ConnectedAnchor.z
- value: -0.017830608
- objectReference: {fileID: 0}
- - target: {fileID: 1323609233965017470, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_AngularYLimit.limit
- value: 80.414696
- objectReference: {fileID: 0}
- - target: {fileID: 1323609233965017470, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_HighAngularXLimit.limit
- value: 10.630102
- objectReference: {fileID: 0}
- - target: {fileID: 1657485011335605418, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_Anchor.z
- value: -0.05
- objectReference: {fileID: 0}
- - target: {fileID: 1657485011335605418, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_ConnectedAnchor.x
- value: 0.16663599
- objectReference: {fileID: 0}
- - target: {fileID: 1657485011335605418, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_ConnectedAnchor.z
- value: -0.017830608
- objectReference: {fileID: 0}
- - target: {fileID: 1657485011335605418, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_AngularYLimit.limit
- value: 80.4147
- objectReference: {fileID: 0}
- - target: {fileID: 1657485011335605418, guid: fce18bbf37be1384eb1a089a94aac81d,
- type: 3}
- propertyPath: m_HighAngularXLimit.limit
- value: 10.6301
+ propertyPath: m_LowAngularXLimit.limit
+ value: -65.55581
objectReference: {fileID: 0}
- target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d,
type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d,
type: 3}
@@ -1009,8 +1041,19 @@ PrefabInstance:
propertyPath: m_Name
value: human_rigging
objectReference: {fileID: 0}
+ - target: {fileID: 7089674069800452097, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ propertyPath: m_LowAngularXLimit.limit
+ value: -65.80322
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3}
+--- !u!4 &8128778564773403801 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1414611729, guid: fce18bbf37be1384eb1a089a94aac81d,
+ type: 3}
+ m_PrefabInstance: {fileID: 8128778564773403800}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &8277099497161960097
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1078,6 +1121,11 @@ PrefabInstance:
propertyPath: m_Name
value: human_no_flat
objectReference: {fileID: 0}
+ - target: {fileID: 9088057279845887177, guid: c21b1754a609d0b409dd8c8e90321803,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c21b1754a609d0b409dd8c8e90321803, type: 3}
--- !u!4 &8659986707249222520 stripped