merge fix
This commit is contained in:
parent
a4b72a33f4
commit
1097262dae
7
Assets/GoogleVR/GVRVideoPlayer.unitypackage.meta
Normal file
7
Assets/GoogleVR/GVRVideoPlayer.unitypackage.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 39850532bc74a4078a24832112e8aef3
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: dc278786e6540af428ccbf7825495004
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -417,7 +417,6 @@ CircleCollider2D:
|
|||||||
m_UsedByComposite: 0
|
m_UsedByComposite: 0
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
<<<<<<< HEAD
|
|
||||||
m_Radius: 0.1
|
m_Radius: 0.1
|
||||||
--- !u!114 &150834722
|
--- !u!114 &150834722
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -519,58 +518,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: b5ec14cccdc625049a7deb31b2b0aa76, type: 3}
|
m_Script: {fileID: 11500000, guid: b5ec14cccdc625049a7deb31b2b0aa76, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
=======
|
|
||||||
m_Modification:
|
|
||||||
m_TransformParent: {fileID: 0}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_RootOrder
|
|
||||||
value: 12
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4444700130726422, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4444700130726422, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 5
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 4444700130726422, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: -6
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2}
|
|
||||||
m_IsPrefabAsset: 0
|
|
||||||
>>>>>>> 5d0857d75672407557626a26bd2f3f0a042f1872
|
|
||||||
--- !u!1 &409506796
|
--- !u!1 &409506796
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1093,13 +1040,8 @@ Transform:
|
|||||||
m_PrefabInternal: {fileID: 0}
|
m_PrefabInternal: {fileID: 0}
|
||||||
m_GameObject: {fileID: 534664144}
|
m_GameObject: {fileID: 534664144}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
<<<<<<< HEAD
|
|
||||||
m_LocalPosition: {x: 1.3059263, y: 0.32, z: 15.21}
|
m_LocalPosition: {x: 1.3059263, y: 0.32, z: 15.21}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
=======
|
|
||||||
m_LocalPosition: {x: 0, y: 0, z: -6}
|
|
||||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
|
||||||
>>>>>>> 5d0857d75672407557626a26bd2f3f0a042f1872
|
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 11
|
||||||
|
Loading…
Reference in New Issue
Block a user