Merge pull request #93 from 2024FALL-SWPP/constants

fix: changed constants
2024FALL-SWPP · Dec 18, 2024 · 903ac0f · 903ac0f
2 parents f365ce0 + ebe4ac8
commit 903ac0f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 33 deletions.
diff --git a/Assets/SWPPT3/Prefabs/TestPlayer2.prefab b/Assets/SWPPT3/Prefabs/TestPlayer2.prefab
@@ -15,7 +15,7 @@ GameObject:
   - component: {fileID: 5865617930821872788}
   - component: {fileID: 5865617930821872779}
   - component: {fileID: 5865617930821872786}
-  - component: {fileID: 5865617930821872787}
+  - component: {fileID: -3614967427876102556}
   m_Layer: 0
   m_Name: TestPlayer2
   m_TagString: Untagged
@@ -32,8 +32,8 @@ Transform:
   m_GameObject: {fileID: 5865617930821872778}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.25, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -96,8 +96,8 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5865617930821872778}
   serializedVersion: 2
-  m_Mass: 4
-  m_Drag: 0
+  m_Mass: 0.1
+  m_Drag: 2
   m_AngularDrag: 0.05
   m_UseGravity: 1
   m_IsKinematic: 0
@@ -117,8 +117,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _playerScript: {fileID: 11400000, guid: f12859c2ce46745c0a5a97778dd768ae, type: 2}
-  _player: {fileID: 5865617930821872779}
-  _rb: {fileID: 5865617930821872789}
   _cameraTransform: {fileID: 0}
 --- !u!114 &5865617930821872779
 MonoBehaviour:
@@ -136,9 +134,6 @@ MonoBehaviour:
   _slimeMaterial: {fileID: 2100000, guid: 7ea5cfe07ca064031985a22bef0fec2b, type: 2}
   _rubberMaterial: {fileID: 2100000, guid: 21165d66baa9949edbc4302d0636e546, type: 2}
   _metalMaterial: {fileID: 2100000, guid: 264f74bf3bd1b48c199dabcbaf507a00, type: 2}
-  _rb: {fileID: 5865617930821872789}
-  _physicMaterial: {fileID: 13400000, guid: 006a6404c0e8f45bc8b514672d2031d2, type: 2}
-  _collider: {fileID: 5865617930821872787}
 --- !u!114 &5865617930821872786
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -151,16 +146,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c09447a90b2486dbaf0f9f60b29ab64, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!135 &5865617930821872787
-SphereCollider:
+--- !u!114 &-3614967427876102556
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5865617930821872778}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0a2e5935e3c8414d84013fe0a3407d69, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _script: {fileID: 11400000, guid: 9a8ab858636d14f22a69db749d270fec, type: 2}
diff --git a/Assets/SWPPT3/Scripts/Main/ScriptableObjects/CameraScript.asset b/Assets/SWPPT3/Scripts/Main/ScriptableObjects/CameraScript.asset
@@ -14,4 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   mouseSensitivity: 0.2
   distanceFromPlayer: 2
-  cameraHeight: 2
+  cameraHeight: 1.1
diff --git a/Assets/SWPPT3/Scripts/Main/ScriptableObjects/PlayerScript.asset b/Assets/SWPPT3/Scripts/Main/ScriptableObjects/PlayerScript.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7cbae8c0fef54416928371022a21f4fa, type: 3}
   m_Name: PlayerScript
   m_EditorClassIdentifier: 
-  _moveSpeed: 0.05
-  _jumpForce: 5
-  _rotationSpeed: 5
+  _moveSpeed: 0.02
+  _jumpForce: 6
+  _rotationSpeed: 1.5210001
   _normalcriteria: 0.7
diff --git a/Assets/SWPPT3/Scripts/Main/ScriptableObjects/SoftbodyScript.asset b/Assets/SWPPT3/Scripts/Main/ScriptableObjects/SoftbodyScript.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1473d3df9778433e9c9a8f1015f8a109, type: 3}
   m_Name: SoftbodyScript
   m_EditorClassIdentifier: 
-  mass: 2
+  mass: 0.1
   physicsRoughness: 2
-  softness: 2
+  softness: 1
   damp: 0.5
diff --git a/Assets/SWPPT3/Scripts/SoftbodyPhysics/SoftbodyGenerator.cs b/Assets/SWPPT3/Scripts/SoftbodyPhysics/SoftbodyGenerator.cs
@@ -770,14 +770,14 @@ public class DebugColorGameObject : MonoBehaviour
         public Color Color { get; set; }
     }
 
-    [CustomEditor(typeof(SoftbodyGenerator))]
-    public class LookAtPointEditor : Editor
-    {
-        public override void OnInspectorGUI()
-        {
-            SoftbodyGenerator softbody = target as SoftbodyGenerator;
-
-            softbody.DebugMode = EditorGUILayout.Toggle("#Debug mod", softbody.DebugMode);
-        }
-    }
+    // [CustomEditor(typeof(SoftbodyGenerator))]
+    // public class LookAtPointEditor : Editor
+    // {
+    //     public override void OnInspectorGUI()
+    //     {
+    //         SoftbodyGenerator softbody = target as SoftbodyGenerator;
+
+    //         softbody.DebugMode = EditorGUILayout.Toggle("#Debug mod", softbody.DebugMode);
+    //     }
+    // }
 }