diff --git a/Assets/Scenes/BobberTest.unity b/Assets/Scenes/BobberTest.unity index 33c187fc4..be39f47bf 100644 --- a/Assets/Scenes/BobberTest.unity +++ b/Assets/Scenes/BobberTest.unity @@ -2884,25 +2884,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3481fc2889d14a00a9de205cc39d9c33, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::CentimeterBuoyancy - waterDensity: 1000 - buoyancyScale: 2 - dragScale: 1 - waterLevel: 0 - waterLayer: - m_Bits: 16 - showDebugInfo: 1 - debugColor: - r: 0 - g: 1 - b: 1 - a: 1 - rb: {fileID: 0} - objCollider: {fileID: 0} - volumeInCm: 0 - samplePoints: [] - localBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} --- !u!4 &1948332548 stripped Transform: m_CorrespondingSourceObject: {fileID: 8356280719142672529, guid: 84f17dfc7c7a7485296643a4e64d6200, type: 3} @@ -4063,7 +4044,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!33 &2096859472366292387 MeshFilter: m_ObjectHideFlags: 0 @@ -6526,7 +6507,7 @@ MonoBehaviour: uprightAxis: 1 extraDragInWater: 0.8 extraAngularDragInWater: 0.8 - Water: {fileID: 0} + Water: {fileID: 4652288250947343381} _Layer: 1 _ObjectWidth: 3 drawDebug: 0 @@ -7333,15 +7314,15 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 verticalDamping: 3 - angularDamping: 0.6 + angularDamping: 0.1 uprightSpring: 0 uprightDamping: 0.5 uprightAxis: 1 extraDragInWater: 0.8 extraAngularDragInWater: 0.8 - Water: {fileID: 2531380344179187550} + Water: {fileID: 4652288250947343381} _Layer: 1 - _ObjectWidth: 0.2 + _ObjectWidth: 3 drawDebug: 0 --- !u!153 &8264839114692736908 ConfigurableJoint: diff --git a/Assets/Scripts/Test/CapsuleBuoyancyStable.cs b/Assets/Scripts/Test/CapsuleBuoyancyStable.cs index a5d152043..fbcb7b309 100644 --- a/Assets/Scripts/Test/CapsuleBuoyancyStable.cs +++ b/Assets/Scripts/Test/CapsuleBuoyancyStable.cs @@ -79,6 +79,7 @@ public class CapsuleBuoyancyStable : MonoBehaviour _QueryResultNormal = new Vector3[length]; if(Water) _waterRenderer = Water.GetComponent(); + var code = this.GetHashCode(); } void FixedUpdate() diff --git a/Assets/UMotionEditor/Data/EditorStates.asset b/Assets/UMotionEditor/Data/EditorStates.asset index 4524d0214..1c681bc3c 100644 --- a/Assets/UMotionEditor/Data/EditorStates.asset +++ b/Assets/UMotionEditor/Data/EditorStates.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: "UMotionEditor.dll::\u0389\u038A\u038A\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u038A\u038A\u038A\u0389\u038A\u038A\u038A\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u0389" GeneralStates: LoadedProjectGUID: - valueInternal: cb2a26e96dc371540865105d88443361 + valueInternal: RecentlyOpenedProjectPath: valueInternal: Assets\ResRaw\AnimEditor RecentlyOpenedProjectGUIDsList: diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user index 77aeab82d..8a4dadb3f 100644 --- a/Fishing2.sln.DotSettings.user +++ b/Fishing2.sln.DotSettings.user @@ -53,6 +53,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded