git : Merge branch 'feat/level/create-level-1' into fix/dev-room
This commit is contained in:
Thibault Pouch
File diff suppressed because it is too large
Load Diff
@@ -13,8 +13,8 @@ GameObject:
|
||||
- component: {fileID: 3884605895522482221}
|
||||
- component: {fileID: 16871832050785725}
|
||||
- component: {fileID: 8512140229507148937}
|
||||
- component: {fileID: 5304359845802383427}
|
||||
- component: {fileID: 6921400718617286756}
|
||||
- component: {fileID: 7987102888823411772}
|
||||
m_Layer: 0
|
||||
m_Name: Door
|
||||
m_TagString: Untagged
|
||||
@@ -30,7 +30,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
|
||||
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
|
||||
@@ -47,7 +47,7 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3}
|
||||
m_Name:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.ProBuilder::UnityEngine.ProBuilder.ProBuilderMesh
|
||||
m_MeshFormatVersion: 2
|
||||
m_Faces:
|
||||
@@ -154,84 +154,80 @@ MonoBehaviour:
|
||||
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_Vertices: 00000000020000000d000000000000000000000000000000
|
||||
- m_Vertices: 010000000300000004000000000000000000000000000000
|
||||
- m_Vertices: 050000000700000008000000000000000000000000000000
|
||||
- m_Vertices: 090000000b0000000c000000000000000000000000000000
|
||||
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}
|
||||
- {x: -0.05, y: -4, z: 4}
|
||||
- {x: 0.05, y: -4, z: 4}
|
||||
- {x: -0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: -4, z: 4}
|
||||
- {x: 0.05, y: -4, z: -4}
|
||||
- {x: 0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: 4, z: -4}
|
||||
- {x: 0.05, y: -4, z: -4}
|
||||
- {x: -0.05, y: -4, z: -4}
|
||||
- {x: 0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: -4, z: -4}
|
||||
- {x: -0.05, y: -4, z: 4}
|
||||
- {x: -0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: 4, z: 4}
|
||||
- {x: -0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: 4, z: 4}
|
||||
- {x: -0.05, y: 4, z: -4}
|
||||
- {x: 0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: -4, z: -4}
|
||||
- {x: 0.05, y: -4, z: -4}
|
||||
- {x: -0.05, y: -4, z: 4}
|
||||
- {x: 0.05, y: -4, z: 4}
|
||||
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: -7}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 8, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 8, y: 1}
|
||||
- {x: 0, y: 0}
|
||||
- {x: 0.1, y: 0}
|
||||
- {x: 0.1, y: 0}
|
||||
- {x: 0, y: 0}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 8, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 8, y: 0}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {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: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, 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}
|
||||
@@ -247,13 +243,13 @@ MonoBehaviour:
|
||||
m_AngleError: 8
|
||||
m_AreaError: 15
|
||||
m_PreserveMeshAssetOnDestroy: 0
|
||||
assetGuid:
|
||||
assetGuid:
|
||||
m_Mesh: {fileID: 0}
|
||||
m_VersionIndex: 23
|
||||
m_VersionIndex: 59
|
||||
m_IsSelectable: 1
|
||||
m_SelectedFaces:
|
||||
m_SelectedFaces:
|
||||
m_SelectedEdges: []
|
||||
m_SelectedVertices:
|
||||
m_SelectedVertices:
|
||||
--- !u!114 &3884605895522482221
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -264,20 +260,20 @@ MonoBehaviour:
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3}
|
||||
m_Name:
|
||||
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: 23
|
||||
m_Size: {x: 0.1, y: 2, z: 1}
|
||||
m_UnmodifiedMeshVersion: 59
|
||||
m_Size: {x: 0.1, y: 8, z: 8}
|
||||
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:
|
||||
data:
|
||||
--- !u!23 &16871832050785725
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -335,7 +331,30 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!65 &5304359845802383427
|
||||
--- !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: 10
|
||||
speed: 3
|
||||
startOpen: 0
|
||||
OnOpened:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
OnClosed:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!65 &7987102888823411772
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -354,28 +373,5 @@ BoxCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.1, y: 2, z: 1}
|
||||
m_Size: {x: 0.1, y: 8, z: 8}
|
||||
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: []
|
||||
|
||||
Reference in New Issue
Block a user