GJP
/
GGJ2022
4
0
Fork 0
Code Issues 4 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022

This commit is contained in:
haitem 2022-01-29 12:50:32 +01:00
parent 435fea4669 a16598060b
commit 217cd09194
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/Prefabs/Player.prefab
View File

@ -94,6 +94,7 @@ GameObject:
- component: {fileID: 3244356566819001072} - component: {fileID: 3244356566819001072}
- component: {fileID: 3244356566819001087} - component: {fileID: 3244356566819001087}
- component: {fileID: 3244356566819001086} - component: {fileID: 3244356566819001086}
- component: {fileID: 1172583624}
m_Layer: 0 m_Layer: 0
m_Name: Body m_Name: Body
m_TagString: Untagged m_TagString: Untagged
@ -132,7 +133,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3244356566819001084} m_GameObject: {fileID: 3244356566819001084}
m_Enabled: 1 m_Enabled: 0
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_DynamicOccludee: 1 m_DynamicOccludee: 1
@ -176,7 +177,7 @@ CapsuleCollider:
m_GameObject: {fileID: 3244356566819001084} m_GameObject: {fileID: 3244356566819001084}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 0
m_Radius: 0.5 m_Radius: 0.5
m_Height: 2 m_Height: 2
m_Direction: 1 m_Direction: 1
@ -196,7 +197,7 @@ Rigidbody:
m_IsKinematic: 0 m_IsKinematic: 0
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 112 m_Constraints: 112
m_CollisionDetection: 0 m_CollisionDetection: 2
--- !u!114 &3244356566819001086 --- !u!114 &3244356566819001086
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -211,16 +212,29 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
walkSpeed: 7.5 walkSpeed: 7.5
runningSpeed: 7.5 runningSpeed: 7.5
jumpSpeed: 0.8 jumpSpeed: 3
lookSpeed: 7.5 lookSpeed: 7.5
lookXLimit: 7.5 lookXLimit: 7.5
playerCamera: {fileID: 3244356567913423211} playerCamera: {fileID: 3244356567913423211}
runningParticles: {fileID: 1608137079} runningParticles: {fileID: 1608137079}
rotationX: 0 rotationX: 0
mainObject: {fileID: 3244356567786994345} mainObject: {fileID: 3244356567786994345}
jump: {x: 0, y: 2, z: 0} jump: {x: 0, y: 20, z: 0}
jumpForce: 2 jumpForce: 5
isRunning: 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!1 &3244356567246256140 --- !u!1 &3244356567246256140
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -536,7 +550,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3244356567913423209} m_GameObject: {fileID: 3244356567913423209}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.534, z: 1.52} m_LocalPosition: {x: 0, y: 0.55, z: -0.68}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []