From 04ed79438f615091ea89bf36310fb439d24befa0 Mon Sep 17 00:00:00 2001 From: haitem Date: Sat, 29 Jan 2022 15:08:02 +0100 Subject: [PATCH] Remake prefabs --- Assets/Prefabs/Platform_Blue.prefab | 13 +- Assets/Prefabs/Platform_Green.prefab | 13 +- Assets/Prefabs/Platform_Orange.prefab | 13 +- .../{Platform.prefab => Platform_Red.prefab} | 15 ++- ...m.prefab.meta => Platform_Red.prefab.meta} | 0 Assets/Prefabs/Platform_yellow.prefab | 13 +- Assets/Prefabs/Player.prefab | 33 +---- Assets/Scenes/Haitem.unity | 118 +++++++++--------- Assets/Scripts/PlayerController.cs | 16 ++- 9 files changed, 106 insertions(+), 128 deletions(-) rename Assets/Prefabs/{Platform.prefab => Platform_Red.prefab} (96%) rename Assets/Prefabs/{Platform.prefab.meta => Platform_Red.prefab.meta} (100%) diff --git a/Assets/Prefabs/Platform_Blue.prefab b/Assets/Prefabs/Platform_Blue.prefab index 8217189..b32fb45 100644 --- a/Assets/Prefabs/Platform_Blue.prefab +++ b/Assets/Prefabs/Platform_Blue.prefab @@ -96,7 +96,7 @@ GameObject: - component: {fileID: 8768991388683709950} - component: {fileID: 8768991388683709948} - component: {fileID: 1430690303722568316} - - component: {fileID: 2146042823296892020} + - component: {fileID: 8238111678033492397} m_Layer: 0 m_Name: Platform_Blue m_TagString: platform @@ -200,8 +200,8 @@ MonoBehaviour: m_EditorClassIdentifier: type: 0 speed: 5 ---- !u!64 &2146042823296892020 -MeshCollider: +--- !u!65 &8238111678033492397 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -210,7 +210,6 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 8e5a3b6be3a077042965d2dbb744c259, type: 3} + serializedVersion: 2 + m_Size: {x: 5.03, y: 0.5, z: 5} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Platform_Green.prefab b/Assets/Prefabs/Platform_Green.prefab index fafad45..177c061 100644 --- a/Assets/Prefabs/Platform_Green.prefab +++ b/Assets/Prefabs/Platform_Green.prefab @@ -112,7 +112,7 @@ GameObject: - component: {fileID: 8768991388683709951} - component: {fileID: 8768991388683709950} - component: {fileID: 3339862426328537977} - - component: {fileID: 7752117488709240220} + - component: {fileID: 3865253352867341094} m_Layer: 0 m_Name: Platform_Green m_TagString: platform @@ -201,8 +201,8 @@ MonoBehaviour: m_EditorClassIdentifier: type: 1 speed: 5 ---- !u!64 &7752117488709240220 -MeshCollider: +--- !u!65 &3865253352867341094 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -211,10 +211,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 8e5a3b6be3a077042965d2dbb744c259, type: 3} + serializedVersion: 2 + m_Size: {x: 5.03, y: 0.5, z: 5} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8985668614484660023 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Platform_Orange.prefab b/Assets/Prefabs/Platform_Orange.prefab index 9270f8f..d2009a6 100644 --- a/Assets/Prefabs/Platform_Orange.prefab +++ b/Assets/Prefabs/Platform_Orange.prefab @@ -112,7 +112,7 @@ GameObject: - component: {fileID: 6650340373999088094} - component: {fileID: 6650340373999088095} - component: {fileID: 1183598848765291555} - - component: {fileID: 6476892361395494252} + - component: {fileID: 6218203028538785626} m_Layer: 0 m_Name: Platform_Orange m_TagString: platform @@ -200,8 +200,8 @@ MonoBehaviour: m_EditorClassIdentifier: type: 5 speed: 5 ---- !u!64 &6476892361395494252 -MeshCollider: +--- !u!65 &6218203028538785626 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -210,7 +210,6 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 8e5a3b6be3a077042965d2dbb744c259, type: 3} + serializedVersion: 2 + m_Size: {x: 5.03, y: 0.5, z: 5} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Platform.prefab b/Assets/Prefabs/Platform_Red.prefab similarity index 96% rename from Assets/Prefabs/Platform.prefab rename to Assets/Prefabs/Platform_Red.prefab index 67ec88b..a72ef33 100644 --- a/Assets/Prefabs/Platform.prefab +++ b/Assets/Prefabs/Platform_Red.prefab @@ -112,9 +112,9 @@ GameObject: - component: {fileID: 8768991388683709951} - component: {fileID: 8768991388683709950} - component: {fileID: 3861707493128515586} - - component: {fileID: 550944827697777431} + - component: {fileID: 5316890779910729157} m_Layer: 0 - m_Name: Platform + m_Name: Platform_Red m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -200,8 +200,8 @@ MonoBehaviour: m_EditorClassIdentifier: type: 0 speed: 5 ---- !u!64 &550944827697777431 -MeshCollider: +--- !u!65 &5316890779910729157 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -210,7 +210,6 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 8e5a3b6be3a077042965d2dbb744c259, type: 3} + serializedVersion: 2 + m_Size: {x: 5.03, y: 0.5, z: 5} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Platform.prefab.meta b/Assets/Prefabs/Platform_Red.prefab.meta similarity index 100% rename from Assets/Prefabs/Platform.prefab.meta rename to Assets/Prefabs/Platform_Red.prefab.meta diff --git a/Assets/Prefabs/Platform_yellow.prefab b/Assets/Prefabs/Platform_yellow.prefab index a720bdd..f595b41 100644 --- a/Assets/Prefabs/Platform_yellow.prefab +++ b/Assets/Prefabs/Platform_yellow.prefab @@ -112,7 +112,7 @@ GameObject: - component: {fileID: 8768991388683709951} - component: {fileID: 8768991388683709950} - component: {fileID: 7821003709828495146} - - component: {fileID: 3256094515767824394} + - component: {fileID: 4344779564172896453} m_Layer: 0 m_Name: Platform_yellow m_TagString: platform @@ -200,8 +200,8 @@ MonoBehaviour: m_EditorClassIdentifier: type: 4 speed: 500 ---- !u!64 &3256094515767824394 -MeshCollider: +--- !u!65 &4344779564172896453 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -210,7 +210,6 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300000, guid: 8e5a3b6be3a077042965d2dbb744c259, type: 3} + serializedVersion: 2 + m_Size: {x: 5.03, y: 0.5, z: 5} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 0399421..97068d7 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1373,11 +1373,9 @@ GameObject: - component: {fileID: 3244356566819001085} - component: {fileID: 3244356566819001074} - component: {fileID: 3244356566819001073} - - component: {fileID: 3244356566819001072} - component: {fileID: 3244356566819001087} - component: {fileID: 3244356566819001086} - component: {fileID: 1172583624} - - component: {fileID: 5651099808780516101} m_Layer: 0 m_Name: Body m_TagString: Untagged @@ -1393,7 +1391,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3244356566819001084} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.11, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1451,20 +1449,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!136 &3244356566819001072 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3244356566819001084} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} --- !u!54 &3244356566819001087 Rigidbody: m_ObjectHideFlags: 0 @@ -1505,19 +1489,6 @@ MonoBehaviour: jump: 0 isRunning: 0 --- !u!65 &1172583624 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3244356566819001084} - m_Material: {fileID: 13400000, guid: 055b414bc685d41409a41f4ea2d64231, type: 2} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 2, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &5651099808780516101 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1847,7 +1818,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3244356567913423209} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.55, z: 0.5} + m_LocalPosition: {x: 0, y: 0.55, z: -0.877} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/Haitem.unity b/Assets/Scenes/Haitem.unity index 46b978c..ca71f8a 100644 --- a/Assets/Scenes/Haitem.unity +++ b/Assets/Scenes/Haitem.unity @@ -123,63 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &359653079 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3244356567786994344, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalPosition.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} --- !u!1 &447415686 GameObject: m_ObjectHideFlags: 0 @@ -401,7 +344,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8768991388683709944, guid: 97d4c453fb5affa448968cb5ce9ca2f4, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8768991388683709944, guid: 97d4c453fb5affa448968cb5ce9ca2f4, type: 3} propertyPath: m_LocalPosition.x @@ -519,7 +462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6650340373999088089, guid: 76b3e3235b07ca04f91c9b020603e1dd, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6650340373999088089, guid: 76b3e3235b07ca04f91c9b020603e1dd, type: 3} propertyPath: m_LocalPosition.x @@ -567,3 +510,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 76b3e3235b07ca04f91c9b020603e1dd, type: 3} +--- !u!1001 &9031117423312889080 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3244356567786994344, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalPosition.y + value: 1.562 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index bc6eacc..971034e 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -111,7 +111,13 @@ public class PlayerController : MonoBehaviour return; } - if (other.GetContact(0).normal == other.transform.forward || other.GetContact(0).normal == -other.transform.forward) + if (other.GetContact(0).normal == other.transform.forward + || other.GetContact(0).normal == -other.transform.forward + || (other.GetContact(0).normal != -other.transform.up + && other.GetContact(0).normal != other.transform.up + && other.GetContact(0).normal != other.transform.right + && other.GetContact(0).normal != -other.transform.right) + ) { return; } @@ -127,7 +133,13 @@ public class PlayerController : MonoBehaviour if (other.gameObject.tag == "platform") { - if (other.GetContact(0).normal == other.transform.forward || other.GetContact(0).normal == -other.transform.forward) + if (other.GetContact(0).normal == other.transform.forward + || other.GetContact(0).normal == -other.transform.forward + || (other.GetContact(0).normal != -other.transform.up + && other.GetContact(0).normal != other.transform.up + && other.GetContact(0).normal != other.transform.right + && other.GetContact(0).normal != -other.transform.right) + ) { return; }