Crowmate/HeadlessHazard
7
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts using incoming branch

Browse Source
This commit is contained in:
Antoine Papillon
2026-03-16 11:32:15 +01:00
parent e3852c7f60 7a281dcb6c
commit d906c93460
8 changed files with 212 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Assets/Level/Prefabs/Player/Player.prefab
View File

@@ -71,6 +71,10 @@ PrefabInstance:
propertyPath: m_Name
value: Head
objectReference: {fileID: 0}
- target: {fileID: 4513738306462009106, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 4522719369371878407, guid: 8ae6d0072edd3ef6a8e8fab748ba5098, type: 3}
propertyPath: m_LocalPosition.y
value: 0
@@ -248,8 +252,29 @@ PrefabInstance:
m_RemovedGameObjects:
- {fileID: 2059550454731354505, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 1015176535145037065, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
insertIndex: -1
addedObject: {fileID: 2084843937911841166}
m_SourcePrefab: {fileID: 100100000, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
--- !u!1 &1446289441119343760 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1015176535145037065, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
m_PrefabInstance: {fileID: 1874870990122559897}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2084843937911841166
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1446289441119343760}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1d8f349ed7dc088a4a6e2690ee87094a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PlayerMovement
InputActions: {fileID: 0}
--- !u!4 &6975610370707183838 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8848088476524540231, guid: 459ef74c4ee79d3eb8e1ba6a0f06c9a7, type: 3}
@@ -545,15 +570,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalPosition.y
value: 1.48
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalPosition.z
value: -6.57
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalRotation.x
@@ -561,7 +586,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalRotation.z
@@ -573,7 +598,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: 90
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3}
propertyPath: m_LocalEulerAnglesHint.z

4
Assets/Level/Scenes/DevRoom.unity
View File

@@ -5577,7 +5577,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}
@@ -7285,7 +7285,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}