git : Merge branch 'Prototype' into feat/level/create-level-1
This commit is contained in:
@@ -493,17 +493,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::PlayerMovement
|
||||
InputActions: {fileID: 0}
|
||||
CameraTransform: {fileID: 0}
|
||||
MaxLookAngle: 90
|
||||
WalkSpeed: 10
|
||||
RotateSpeed: 5
|
||||
JumpForce: 5
|
||||
GroundCheck: {fileID: 0}
|
||||
GroundCheckRadius: 0.2
|
||||
animator: {fileID: 0}
|
||||
Head: {fileID: 0}
|
||||
ThrowForce: 10
|
||||
PickupDistance: 3
|
||||
--- !u!114 &43211589 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 6921400718617286756, guid: 2f9e8e4a19f939f43a84c1c7d0a0e185, type: 3}
|
||||
@@ -936,6 +925,9 @@ PrefabInstance:
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 762199654}
|
||||
- targetCorrespondingSourceObject: {fileID: 1446289441119343760, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 36927862}
|
||||
@@ -37018,6 +37010,38 @@ Mesh:
|
||||
- serializedVersion: 1
|
||||
m_IndexStart: 0
|
||||
m_IndexCount: 0
|
||||
--- !u!1 &762199651 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
m_PrefabInstance: {fileID: 99539971}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!54 &762199654
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 762199651}
|
||||
serializedVersion: 5
|
||||
m_Mass: 1
|
||||
m_LinearDamping: 0
|
||||
m_AngularDamping: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!1 &818197916
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -37814,7 +37838,7 @@ GameObject:
|
||||
- component: {fileID: 1173887971}
|
||||
- component: {fileID: 1173887970}
|
||||
- component: {fileID: 1173887969}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Plate
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@@ -38238,7 +38262,7 @@ GameObject:
|
||||
- component: {fileID: 1225232290}
|
||||
- component: {fileID: 1225232289}
|
||||
- component: {fileID: 1225232288}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Floor
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@@ -72873,7 +72897,7 @@ MeshCollider:
|
||||
serializedVersion: 5
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 163208307}
|
||||
m_Mesh: {fileID: 1925451917}
|
||||
--- !u!33 &1434828806
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 10
|
||||
@@ -107201,7 +107225,7 @@ GameObject:
|
||||
- component: {fileID: 1524676968}
|
||||
- component: {fileID: 1524676967}
|
||||
- component: {fileID: 1524676966}
|
||||
m_Layer: 0
|
||||
m_Layer: 3
|
||||
m_Name: Plate
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@@ -109741,7 +109765,7 @@ MeshCollider:
|
||||
serializedVersion: 5
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 1076043271}
|
||||
m_Mesh: {fileID: 163208307}
|
||||
--- !u!33 &2017727403
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 10
|
||||
|
||||
@@ -246,6 +246,11 @@ MonoBehaviour:
|
||||
m_ShadowLayerMask: 1
|
||||
m_RenderingLayers: 1
|
||||
m_ShadowRenderingLayers: 1
|
||||
--- !u!4 &573532104 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8258725777112540271, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
m_PrefabInstance: {fileID: 762024470}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &762024470
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -254,10 +259,38 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3047743202467582630, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: InputActions
|
||||
- target: {fileID: 2343678334924127783, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: animator
|
||||
value:
|
||||
objectReference: {fileID: -944628639613478452, guid: b319948d6750538498f201a24c05aef3, type: 3}
|
||||
objectReference: {fileID: 2044346512}
|
||||
- target: {fileID: 2343678334924127783, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: cameraTransform
|
||||
value:
|
||||
objectReference: {fileID: 573532104}
|
||||
- target: {fileID: 3702287221525863218, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_Constraints
|
||||
value: 112
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4313489822343726709, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: isHoldingHead
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6096268390463610501, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_Size.y
|
||||
value: 0.5844476
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6096268390463610501, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_Size.z
|
||||
value: 0.75984764
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6096268390463610501, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_Center.y
|
||||
value: 1.2922238
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6096268390463610501, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_Center.z
|
||||
value: 0.060781002
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6544026473454475707, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Player
|
||||
@@ -302,8 +335,13 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8258725777112540271, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.3157
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 472912051752212496, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
@@ -575,12 +613,17 @@ Transform:
|
||||
m_GameObject: {fileID: 1430443543}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.3763, y: 3.05, z: 10}
|
||||
m_LocalPosition: {x: 0.3763, y: 0, z: 4.34}
|
||||
m_LocalScale: {x: 12.810944, y: 5.8166175, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &2044346512 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 144211389547005650, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3}
|
||||
m_PrefabInstance: {fileID: 762024470}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user