From 5506f1be595ed0188dd2ca9b871503ee904c4f62 Mon Sep 17 00:00:00 2001 From: cailean Date: Tue, 19 Mar 2024 13:41:33 +0000 Subject: [PATCH] small update --- .../Physics Materials/Actor.physicMaterial | 4 +- .../Physics Materials/Ground.physicMaterial | 4 +- Assets/6_Scenes/Beep.unity | 101 ++++++++++++++++-- 3 files changed, 94 insertions(+), 15 deletions(-) diff --git a/Assets/3_Materials/Physics Materials/Actor.physicMaterial b/Assets/3_Materials/Physics Materials/Actor.physicMaterial index 383f4d6..c642c87 100644 --- a/Assets/3_Materials/Physics Materials/Actor.physicMaterial +++ b/Assets/3_Materials/Physics Materials/Actor.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Actor - dynamicFriction: 2 - staticFriction: 2 + dynamicFriction: 0 + staticFriction: 0 bounciness: 0 frictionCombine: 2 bounceCombine: 0 diff --git a/Assets/3_Materials/Physics Materials/Ground.physicMaterial b/Assets/3_Materials/Physics Materials/Ground.physicMaterial index 4e13ab4..2ad8e74 100644 --- a/Assets/3_Materials/Physics Materials/Ground.physicMaterial +++ b/Assets/3_Materials/Physics Materials/Ground.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Ground - dynamicFriction: 1000 - staticFriction: 1000 + dynamicFriction: 0 + staticFriction: 0 bounciness: 0 frictionCombine: 0 bounceCombine: 2 diff --git a/Assets/6_Scenes/Beep.unity b/Assets/6_Scenes/Beep.unity index c0379fd..2e5b354 100644 --- a/Assets/6_Scenes/Beep.unity +++ b/Assets/6_Scenes/Beep.unity @@ -392,7 +392,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 155411616} serializedVersion: 2 - m_LocalRotation: {x: 0.032237116, y: 0.96677077, z: -0.15566999, w: 0.20020495} + m_LocalRotation: {x: 0.03223712, y: 0.96677077, z: -0.15566999, w: 0.20020498} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1212,7 +1212,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377437129} serializedVersion: 2 - m_LocalRotation: {x: -0.03783877, y: 0.8817097, z: -0.07178479, w: -0.46476156} + m_LocalRotation: {x: -0.037838772, y: 0.8817097, z: -0.071784794, w: -0.46476156} m_LocalPosition: {x: -128.4, y: 13, z: -248.6} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1329,17 +1329,17 @@ PrefabInstance: - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.x - value: -245.97 + value: -258.72 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.y - value: 6.0099983 + value: 8.5 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} propertyPath: m_LocalPosition.z - value: 504.51 + value: 517.25 objectReference: {fileID: 0} - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4, type: 3} @@ -2599,6 +2599,33 @@ MonoBehaviour: m_ModelName: Walker m_Index: 11 m_Touched: 0 +--- !u!1 &826176554 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4696612012800796863, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} +--- !u!65 &826176560 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826176554} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.19282301, y: 0.12901592, z: 0.40628543} + m_Center: {x: -0.032046385, y: 0.00019456641, z: 0.15389557} --- !u!1 &834841055 GameObject: m_ObjectHideFlags: 0 @@ -3159,6 +3186,33 @@ Transform: - {fileID: 2025628616} m_Father: {fileID: 953333220} m_LocalEulerAnglesHint: {x: 36.471, y: -133.004, z: -0.795} +--- !u!1 &1233601541 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3282135612778010942, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + m_PrefabInstance: {fileID: 8839643052404795280} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1233601547 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233601541} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.18489853, y: 0.15691361, z: 0.15091242} + m_Center: {x: 0.002403283, y: 0.005637576, z: -0.0044443775} --- !u!1 &1337085230 GameObject: m_ObjectHideFlags: 0 @@ -4487,7 +4541,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2072680723 Transform: m_ObjectHideFlags: 0 @@ -4868,7 +4922,7 @@ PrefabInstance: - target: {fileID: 1082572882027964806, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2913576066548479887, guid: 796c0c7bfd2e89547bd866eedcc6d386, type: 3} @@ -5023,10 +5077,15 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} + - target: {fileID: 1364780833493223077, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Mass + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1804160633990764388, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.z - value: 0.072899885 + value: 0.096 objectReference: {fileID: 0} - target: {fileID: 1809839302208431530, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -5124,7 +5183,12 @@ PrefabInstance: - target: {fileID: 3228041511559138902, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_LocalPosition.z - value: 0.1009 + value: 0.118 + objectReference: {fileID: 0} + - target: {fileID: 3754507585550600873, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.018 objectReference: {fileID: 0} - target: {fileID: 3910738680306197312, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} @@ -5221,6 +5285,11 @@ PrefabInstance: value: objectReference: {fileID: 13400000, guid: 71fe46a17b76949b8afeae23a29f44b1, type: 2} + - target: {fileID: 6840533361944322401, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + propertyPath: m_Mass + value: 3 + objectReference: {fileID: 0} - target: {fileID: 7103911475574101348, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} propertyPath: m_Material @@ -5256,10 +5325,20 @@ PrefabInstance: propertyPath: m_Name value: Environment objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7684624534499053204, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} + - {fileID: 5535385608223175193, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3282135612778010942, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1233601547} + - targetCorrespondingSourceObject: {fileID: 4696612012800796863, guid: 14d8283abcefffd4a916b8611ccd49fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 826176560} m_SourcePrefab: {fileID: 100100000, guid: 14d8283abcefffd4a916b8611ccd49fa, type: 3} --- !u!4 &8839643052404795281 stripped Transform: