OceanSlim/projectEli
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

resolving merge conflict

Browse Source
This commit is contained in:
tonyomendoza 2023-01-25 16:12:22 -08:00
commit 8a6fdd6156
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Scenes/NeoFPS Test.unity
View File

@ -43181,12 +43181,12 @@ PrefabInstance:
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
@ -43261,17 +43261,17 @@ PrefabInstance:
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606043385230, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -2500
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6, - target: {fileID: 2770326606050442471, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3} type: 3}

4
Assets/Scenes/NeoFPS Test.unity.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scenes/NeoFPS Test.unity.meta
guid: 0f1e233ae851c994889b469f04c18b47 guid: 0f1e233ae851c994889b469f04c18b47
========
guid: 7032d000d3add4948ae9729fff4b493a
>>>>>>>> 4f4efc8cd03b0cd98a37d61f29783464cefabc92:Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData: