fix/dev-room #5

Merged
Antoine2507 merged 31 commits from fix/dev-room into Prototype 2026-03-17 10:49:58 +01:00
6 changed files with 948 additions and 839 deletions
Showing only changes of commit fff812bd03 - Show all commits

View File

@@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 7188501903215599936} - component: {fileID: 7188501903215599936}
- component: {fileID: 2249752946204529007} - component: {fileID: 2249752946204529007}
- component: {fileID: 8097217384448450469} - component: {fileID: 8097217384448450469}
- component: {fileID: 3970929985668534253} - component: {fileID: 513860795296143253}
- component: {fileID: 9200216552899707794} - component: {fileID: 9200216552899707794}
- component: {fileID: 3436190445336344638} - component: {fileID: 3436190445336344638}
m_Layer: 0 m_Layer: 0
@@ -34078,8 +34078,8 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6532970485135766022} m_GameObject: {fileID: 6532970485135766022}
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!64 &3970929985668534253 --- !u!135 &513860795296143253
MeshCollider: SphereCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -34096,10 +34096,9 @@ MeshCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 3
m_Convex: 0 m_Radius: 0.5
m_CookingOptions: 30 m_Center: {x: 0, y: 0, z: 0}
m_Mesh: {fileID: 0}
--- !u!135 &9200216552899707794 --- !u!135 &9200216552899707794
SphereCollider: SphereCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 3884605895522482221} - component: {fileID: 3884605895522482221}
- component: {fileID: 16871832050785725} - component: {fileID: 16871832050785725}
- component: {fileID: 8512140229507148937} - component: {fileID: 8512140229507148937}
- component: {fileID: 6734862024670495346} - component: {fileID: 5304359845802383427}
- component: {fileID: 6921400718617286756} - component: {fileID: 6921400718617286756}
m_Layer: 0 m_Layer: 0
m_Name: Door m_Name: Door
@@ -335,8 +335,8 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6922175388650039756} m_GameObject: {fileID: 6922175388650039756}
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
--- !u!64 &6734862024670495346 --- !u!65 &5304359845802383427
MeshCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -353,10 +353,9 @@ MeshCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 5 serializedVersion: 3
m_Convex: 0 m_Size: {x: 0.1, y: 2, z: 1}
m_CookingOptions: 30 m_Center: {x: 0, y: 0, z: 0}
m_Mesh: {fileID: 0}
--- !u!114 &6921400718617286756 --- !u!114 &6921400718617286756
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f7ddf8204ae4327bb84e928c9ae561d4 guid: f5c0ebee25ced1d42b0312b27d0aad54
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 13400000 mainObjectFileID: 13400000

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f7ddf8204ae4327bb84e928c9ae561d4 guid: 7c0881b5a8885c9f0a5954bd7ca490b4
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 13400000 mainObjectFileID: 13400000

View File

@@ -1,3 +1,4 @@
<Solution> <Solution>
<Project Path="MerryYellow.CodeAssist.Editor.csproj" />
<Project Path="Assembly-CSharp.csproj" /> <Project Path="Assembly-CSharp.csproj" />
</Solution> </Solution>