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:
timote koenig
2026-03-10 15:26:52 +01:00
parent e07fb7dc4b 8c4c2b372b
commit 94e44ad7af
136 changed files with 11173 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Assets/Level/Scenes/SampleScene.unity
View File

@@ -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