merge feat/level/create-level-1 : keep the most recent
This commit is contained in:
Pierre Ryssen
376
Assets/Level/Prefabs/Interactives/BigDoor.prefab
Normal file
376
Assets/Level/Prefabs/Interactives/BigDoor.prefab
Normal file
@@ -0,0 +1,376 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &6922175388650039756
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8500599826884145603}
|
||||
- component: {fileID: 5140597600133624551}
|
||||
- component: {fileID: 3884605895522482221}
|
||||
- component: {fileID: 16871832050785725}
|
||||
- component: {fileID: 7987102888823411772}
|
||||
- component: {fileID: 6921400718617286756}
|
||||
m_Layer: 0
|
||||
<<<<<<<< HEAD:Assets/Level/Prefabs/World/MovingDoor.prefab
|
||||
m_Name: MovingDoor
|
||||
========
|
||||
m_Name: BigDoor
|
||||
>>>>>>>> feat/level/create-level-1:Assets/Level/Prefabs/Interactives/BigDoor.prefab
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8500599826884145603
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -0.82162, y: 0, z: 0.17412949}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
--- !u!114 &5140597600133624551
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.ProBuilder::UnityEngine.ProBuilder.ProBuilderMesh
|
||||
m_MeshFormatVersion: 2
|
||||
m_Faces:
|
||||
- m_Indexes: 000000000100000002000000010000000300000002000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 040000000500000006000000050000000700000006000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 08000000090000000a000000090000000b0000000a000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 0c0000000d0000000e0000000d0000000f0000000e000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 100000001100000012000000110000001300000012000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 140000001500000016000000150000001700000016000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
m_SharedVertices:
|
||||
- m_Vertices: 000000000d00000016000000
|
||||
- m_Vertices: 010000000400000017000000
|
||||
- m_Vertices: 020000000f00000010000000
|
||||
- m_Vertices: 030000000600000011000000
|
||||
- m_Vertices: 050000000800000015000000
|
||||
- m_Vertices: 070000000a00000013000000
|
||||
- m_Vertices: 090000000c00000014000000
|
||||
- m_Vertices: 0b0000000e00000012000000
|
||||
m_SharedTextures: []
|
||||
m_Positions:
|
||||
- {x: -0.05, y: -1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: -0.5}
|
||||
- {x: 0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: 1, z: -0.5}
|
||||
- {x: 0.05, y: -1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: -0.5}
|
||||
- {x: 0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: 1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: 1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: -0.5}
|
||||
- {x: 0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: -0.5}
|
||||
- {x: 0.05, y: -1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: 0.5}
|
||||
m_Textures0:
|
||||
- {x: 0.1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 0}
|
||||
- {x: 0.1, y: 0}
|
||||
- {x: 0.1, y: 0}
|
||||
- {x: 0, y: 0}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
m_Textures2: []
|
||||
m_Textures3: []
|
||||
m_Tangents:
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
m_Colors: []
|
||||
m_UnwrapParameters:
|
||||
m_HardAngle: 88
|
||||
m_PackMargin: 20
|
||||
m_AngleError: 8
|
||||
m_AreaError: 15
|
||||
m_PreserveMeshAssetOnDestroy: 0
|
||||
assetGuid:
|
||||
m_Mesh: {fileID: 0}
|
||||
m_VersionIndex: 95
|
||||
m_IsSelectable: 1
|
||||
m_SelectedFaces:
|
||||
m_SelectedEdges: []
|
||||
m_SelectedVertices:
|
||||
--- !u!114 &3884605895522482221
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.ProBuilder::UnityEngine.ProBuilder.Shapes.ProBuilderShape
|
||||
m_Shape:
|
||||
rid: 1325630791375913023
|
||||
m_ShapeRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_UnmodifiedMeshVersion: 95
|
||||
m_Size: {x: 0.1, y: 2, z: 1}
|
||||
m_LocalCenter: {x: 0, y: 0, z: 0}
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 1325630791375913023
|
||||
type: {class: Cube, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder}
|
||||
data:
|
||||
--- !u!23 &16871832050785725
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: bb742d83ed804da40afff0bb98de17b3, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_MaskInteraction: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!65 &7987102888823411772
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.1, y: 2, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6921400718617286756
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cc6c36a261296f4c82e315da147ba93, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::SlidingDoor
|
||||
axis: 1
|
||||
direction: -1
|
||||
slideDistance: 2
|
||||
speed: 3
|
||||
startOpen: 0
|
||||
OnOpened:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
OnClosed:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
7
Assets/Level/Prefabs/Interactives/BigDoor.prefab.meta
Normal file
7
Assets/Level/Prefabs/Interactives/BigDoor.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2f9e8e4a19f939f43a84c1c7d0a0e185
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -113,31 +113,31 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: 0.165
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.421
|
||||
value: -0.36
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.475
|
||||
value: 3.94
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -145,7 +145,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
@@ -159,6 +159,9 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 4513738306462009106, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6096268390463610501}
|
||||
- targetCorrespondingSourceObject: {fileID: 4513738306462009106, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 5755554930316629681}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
--- !u!1 &4446703388580953019 stripped
|
||||
GameObject:
|
||||
@@ -184,8 +187,35 @@ BoxCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.79742086, y: 0.5844476, z: 0.75984764}
|
||||
m_Center: {x: -0.0018145442, y: 1.2922238, z: 0.060781002}
|
||||
m_Size: {x: 0.66390085, y: 0.5504439, z: 0.7120738}
|
||||
m_Center: {x: -0.0021908283, y: 1.2829982, z: 0.08466792}
|
||||
--- !u!54 &5755554930316629681
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4446703388580953019}
|
||||
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: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 112
|
||||
m_CollisionDetection: 0
|
||||
--- !u!4 &8079687630579216978 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8300425658720571131, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
|
||||
@@ -208,6 +238,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Body
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
@@ -226,15 +260,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@@ -564,21 +598,33 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: -30.76
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.5
|
||||
value: -0.00000057122224
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: -7.51
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
@@ -586,7 +632,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.7071068
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
@@ -598,7 +644,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
@@ -958,7 +1004,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 7f91586e8c2742341aa8f6925e597bf1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::PlayerMovement
|
||||
WalkSpeed: 7.5
|
||||
WalkSpeed: 10
|
||||
rotationSpeed: 10
|
||||
animator: {fileID: 144211389547005650}
|
||||
cameraTransform: {fileID: 8258725777112540271}
|
||||
@@ -976,9 +1022,10 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::PlayerHeadController
|
||||
Head: {fileID: 8079687630579216978}
|
||||
CameraTransform: {fileID: 8258725777112540271}
|
||||
ThrowForce: 10
|
||||
PickupDistance: 3
|
||||
isHoldingHead: 1
|
||||
BodyTransform: {fileID: 6975610370707183838}
|
||||
ThrowForce: 20
|
||||
PickupDistance: 10
|
||||
isHoldingHead: 0
|
||||
--- !u!114 &2936940972087595065
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
2261
Assets/Level/Prefabs/ROOM1.prefab
Normal file
2261
Assets/Level/Prefabs/ROOM1.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Level/Prefabs/ROOM1.prefab.meta
Normal file
7
Assets/Level/Prefabs/ROOM1.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e432ef0440d877645a18c87cd2c11379
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -15,7 +15,11 @@ GameObject:
|
||||
- component: {fileID: 7987102888823411772}
|
||||
- component: {fileID: 6921400718617286756}
|
||||
m_Layer: 0
|
||||
<<<<<<<< HEAD:Assets/Level/Prefabs/World/MovingDoor.prefab
|
||||
m_Name: MovingDoor
|
||||
========
|
||||
m_Name: BigDoor
|
||||
>>>>>>>> feat/level/create-level-1:Assets/Level/Prefabs/Interactives/BigDoor.prefab
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2f9e8e4a19f939f43a84c1c7d0a0e185
|
||||
guid: 1c118abd03461b8bf81ae24b3410a233
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
Reference in New Issue
Block a user