gav/real-shooter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' into krazerleo/core/1

Browse Source
This commit is contained in:
Andrey Gumirov
2022-04-19 19:28:44 +07:00
parent dfdd018a5f d911dce62a
commit 39d29da2be
3 changed files with 715 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity generated
View File

@ -1253,6 +1253,12 @@ Transform:
m_Father: {fileID: 671439045}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!4 &868386701 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
m_PrefabInstance: {fileID: 1809549197}
m_PrefabAsset: {fileID: 0}
--- !u!1 &884498019
GameObject:
m_ObjectHideFlags: 0
@ -1286,6 +1292,80 @@ Transform:
m_Father: {fileID: 782729761}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1061293905
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 868386701}
m_Modifications:
- target: {fileID: 2836004473841745626, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: 95a44e56d04c7d248ba723eda9611c51, type: 2}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591197023, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2836004475591695743, guid: f432554f564e69242897607d34218939,
type: 3}
propertyPath: m_Name
value: DragonFucker
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f432554f564e69242897607d34218939, type: 3}
--- !u!1 &1116745543
GameObject:
m_ObjectHideFlags: 0
@ -2132,6 +2212,105 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1663305221}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &1809549197
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -4942972567661207728, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.x
value: 42.23
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.z
value: -15.91
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763689, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763699, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: playerStance
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763700, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: playerCrouchStance.CameraHeight
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 4528203470625763703, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4528203471293941515, guid: 99bb17a23a489624baeaf337f91a4f84,
type: 3}
propertyPath: m_LocalPosition.z
value: -2.417
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99bb17a23a489624baeaf337f91a4f84, type: 3}
--- !u!1 &1858987083
GameObject:
m_ObjectHideFlags: 0