From 120fa2a82b8c9a1c7612d15039b6f51127d54aa7 Mon Sep 17 00:00:00 2001 From: haitem Date: Sat, 29 Jan 2022 15:34:38 +0100 Subject: [PATCH] Some prefabs edit --- Assets/Materials/PlayerMaterial.physicMaterial | 4 ++-- Assets/Prefabs/Platform_Blue.prefab | 2 +- Assets/Prefabs/Platform_Green.prefab | 2 +- Assets/Prefabs/Platform_Orange.prefab | 2 +- Assets/Prefabs/Platform_Red.prefab | 2 +- Assets/Prefabs/Platform_yellow.prefab | 2 +- Assets/Scenes/Haitem.unity | 8 ++++++++ Assets/Scripts/PlayerController.cs | 2 ++ UserSettings/EditorUserSettings.asset | 7 +++++-- 9 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Assets/Materials/PlayerMaterial.physicMaterial b/Assets/Materials/PlayerMaterial.physicMaterial index 0162417..63d9048 100644 --- a/Assets/Materials/PlayerMaterial.physicMaterial +++ b/Assets/Materials/PlayerMaterial.physicMaterial @@ -7,8 +7,8 @@ PhysicMaterial: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlayerMaterial - dynamicFriction: 1 - staticFriction: 1 + dynamicFriction: 0 + staticFriction: 0 bounciness: 0 frictionCombine: 0 bounceCombine: 1 diff --git a/Assets/Prefabs/Platform_Blue.prefab b/Assets/Prefabs/Platform_Blue.prefab index 093a580..1597bfa 100644 --- a/Assets/Prefabs/Platform_Blue.prefab +++ b/Assets/Prefabs/Platform_Blue.prefab @@ -207,7 +207,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8768991388683709947} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 diff --git a/Assets/Prefabs/Platform_Green.prefab b/Assets/Prefabs/Platform_Green.prefab index 12dfdd7..f351146 100644 --- a/Assets/Prefabs/Platform_Green.prefab +++ b/Assets/Prefabs/Platform_Green.prefab @@ -208,7 +208,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8768991388683709947} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 diff --git a/Assets/Prefabs/Platform_Orange.prefab b/Assets/Prefabs/Platform_Orange.prefab index 5a38062..ec875ef 100644 --- a/Assets/Prefabs/Platform_Orange.prefab +++ b/Assets/Prefabs/Platform_Orange.prefab @@ -207,7 +207,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6650340373999088090} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 diff --git a/Assets/Prefabs/Platform_Red.prefab b/Assets/Prefabs/Platform_Red.prefab index 6978838..58c1c3f 100644 --- a/Assets/Prefabs/Platform_Red.prefab +++ b/Assets/Prefabs/Platform_Red.prefab @@ -207,7 +207,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8768991388683709947} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 diff --git a/Assets/Prefabs/Platform_yellow.prefab b/Assets/Prefabs/Platform_yellow.prefab index 7b3d4a5..e2c18ee 100644 --- a/Assets/Prefabs/Platform_yellow.prefab +++ b/Assets/Prefabs/Platform_yellow.prefab @@ -207,7 +207,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8768991388683709947} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 diff --git a/Assets/Scenes/Haitem.unity b/Assets/Scenes/Haitem.unity index ca71f8a..2c8c294 100644 --- a/Assets/Scenes/Haitem.unity +++ b/Assets/Scenes/Haitem.unity @@ -281,6 +281,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3339862426328537977, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3339862426328537977, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: speed + value: 50 + objectReference: {fileID: 0} - target: {fileID: 7752117488709240220, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} propertyPath: m_Convex value: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 971034e..38ec3d6 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -121,6 +121,8 @@ public class PlayerController : MonoBehaviour { return; } + this.downDirection = -other.GetContact(0).normal; + saveDirection = -other.GetContact(0).normal; // TODO: Handle other PlatformTypes Physics.gravity = -other.GetContact(0).normal * 9.81f; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 748f800..8158427 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5b53500307070b0b0b0f5a2648735a4412154f737d2b2536782f1e32e0b86c3a + value: 5150040003515f5f585f552011755e4446154e2e2a2a7e347c2c4965b1b4366a flags: 0 RecentlyUsedSceneGuid-1: - value: 50080c5756540a5e095b0d7a11210644154f1b7f782922642f281b35b0b86c6d + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + flags: 0 + RecentlyUsedSceneGuid-2: + value: 5b53500307070b0b0b0f5a2648735a4412154f737d2b2536782f1e32e0b86c3a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d