diff --git a/Assets/Materials/PlayerMaterial.physicMaterial b/Assets/Materials/PlayerMaterial.physicMaterial index 519c956..7e88d8b 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: 0.6 - staticFriction: 0.6 + dynamicFriction: 0 + staticFriction: 0 bounciness: 0 - frictionCombine: 1 + frictionCombine: 0 bounceCombine: 0 diff --git a/Assets/Prefabs/Platform.prefab b/Assets/Prefabs/Platform.prefab index 011a3d1..d14b736 100644 --- a/Assets/Prefabs/Platform.prefab +++ b/Assets/Prefabs/Platform.prefab @@ -93,7 +93,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 @@ -128,3 +128,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: type: 0 + speed: 5 diff --git a/Assets/Prefabs/Platform_Blue.prefab b/Assets/Prefabs/Platform_Blue.prefab index 13d3118..c90309d 100644 --- a/Assets/Prefabs/Platform_Blue.prefab +++ b/Assets/Prefabs/Platform_Blue.prefab @@ -93,7 +93,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 227ba93..9876860 100644 --- a/Assets/Prefabs/Platform_Green.prefab +++ b/Assets/Prefabs/Platform_Green.prefab @@ -94,7 +94,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 @@ -129,6 +129,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: type: 1 + speed: 5 --- !u!1 &8985668614484660023 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Platform_yellow.prefab b/Assets/Prefabs/Platform_yellow.prefab index f6c83b2..793b338 100644 --- a/Assets/Prefabs/Platform_yellow.prefab +++ b/Assets/Prefabs/Platform_yellow.prefab @@ -93,7 +93,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 @@ -128,3 +128,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: type: 4 + speed: 500 diff --git a/Assets/Scenes/Haitem.unity b/Assets/Scenes/Haitem.unity index b6a1906..46ace55 100644 --- a/Assets/Scenes/Haitem.unity +++ b/Assets/Scenes/Haitem.unity @@ -136,7 +136,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} propertyPath: m_LocalPosition.x @@ -274,6 +274,120 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &1347970546 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalPosition.x + value: -12.36 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalPosition.z + value: 0.04 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709947, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + propertyPath: m_Name + value: Platform + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} +--- !u!1001 &1482214481 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalPosition.x + value: 11.95907 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalPosition.z + value: 0.24445581 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709944, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768991388683709947, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + propertyPath: m_Name + value: Platform_Green + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} --- !u!1001 &1599610786 PrefabInstance: m_ObjectHideFlags: 0 @@ -283,7 +397,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8768991388683709944, guid: 97d4c453fb5affa448968cb5ce9ca2f4, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8768991388683709944, guid: 97d4c453fb5affa448968cb5ce9ca2f4, type: 3} propertyPath: m_LocalPosition.x @@ -340,7 +454,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8768991388683709944, guid: 1e3f34788e0cb3f49a0bef285d5b059a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8768991388683709944, guid: 1e3f34788e0cb3f49a0bef285d5b059a, type: 3} propertyPath: m_LocalPosition.x