Commit c64c5e7b authored by Sergey Paskhalov's avatar Sergey Paskhalov
Browse files

Merge branch 'NewARDesign' into 'master'

New ar design

See merge request avvy/mobile-app!339
parents f23e153f 32cd3ecb
No related merge requests found
Showing with 5641 additions and 1659 deletions
+5641 -1659
fileFormatVersion: 2
guid: e1cfe90b164619344b2ffb3b8099fa3c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
fileFormatVersion: 2
guid: dbd6e5cfe9fdfc344988c805bbc2cd6e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
svgType: 0
texturedSpriteMeshType: 0
svgPixelsPerUnit: 100
gradientResolution: 128
alignment: 0
customPivot: {x: 0, y: 0}
generatePhysicsShape: 0
viewportOptions: 0
preserveViewport: 0
advancedMode: 0
predefinedResolutionIndex: 1
targetResolution: 1080
resolutionMultiplier: 1
stepDistance: 10
samplingStepDistance: 100
maxCordDeviationEnabled: 0
maxCordDeviation: 1
maxTangentAngleEnabled: 0
maxTangentAngle: 5
keepTextureAspectRatio: 1
textureSize: 256
textureWidth: 256
textureHeight: 256
wrapMode: 0
filterMode: 1
sampleCount: 4
spriteData:
TessellationDetail: 0
SpriteRect:
name:
originalName:
pivot: {x: 0, y: 0}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
spriteID: b3880f8202c52cf46a8d8f9128a74224
internalID: 0
PhysicsOutlines: []
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
fileFormatVersion: 2
guid: 105b3caca7140fa4084135f2570fd992
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
svgType: 0
texturedSpriteMeshType: 0
svgPixelsPerUnit: 100
gradientResolution: 128
alignment: 0
customPivot: {x: 0, y: 0}
generatePhysicsShape: 0
viewportOptions: 0
preserveViewport: 0
advancedMode: 0
predefinedResolutionIndex: 1
targetResolution: 1080
resolutionMultiplier: 1
stepDistance: 10
samplingStepDistance: 100
maxCordDeviationEnabled: 0
maxCordDeviation: 1
maxTangentAngleEnabled: 0
maxTangentAngle: 5
keepTextureAspectRatio: 1
textureSize: 256
textureWidth: 256
textureHeight: 256
wrapMode: 0
filterMode: 1
sampleCount: 4
spriteData:
TessellationDetail: 0
SpriteRect:
name:
originalName:
pivot: {x: 0, y: 0}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
spriteID: 893c34a0fd7519d40b070bca0b346c50
internalID: 0
PhysicsOutlines: []
fileFormatVersion: 2
guid: 9fed301b234a915498c6b988911d1301
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
fileFormatVersion: 2
guid: eb0a1d1f764ce934494f965caa40d5a8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
svgType: 0
texturedSpriteMeshType: 0
svgPixelsPerUnit: 100
gradientResolution: 128
alignment: 0
customPivot: {x: 0, y: 0}
generatePhysicsShape: 0
viewportOptions: 0
preserveViewport: 0
advancedMode: 0
predefinedResolutionIndex: 1
targetResolution: 1080
resolutionMultiplier: 1
stepDistance: 10
samplingStepDistance: 100
maxCordDeviationEnabled: 0
maxCordDeviation: 1
maxTangentAngleEnabled: 0
maxTangentAngle: 5
keepTextureAspectRatio: 1
textureSize: 256
textureWidth: 256
textureHeight: 256
wrapMode: 0
filterMode: 1
sampleCount: 4
spriteData:
TessellationDetail: 0
SpriteRect:
name:
originalName:
pivot: {x: 0, y: 0}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
spriteID: 5564229304b10eb46b27cfa2cf27194c
internalID: 0
PhysicsOutlines: []
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
fileFormatVersion: 2
guid: a0e4425276e578e45b00894492056167
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
svgType: 0
texturedSpriteMeshType: 0
svgPixelsPerUnit: 100
gradientResolution: 128
alignment: 0
customPivot: {x: 0, y: 0}
generatePhysicsShape: 0
viewportOptions: 0
preserveViewport: 0
advancedMode: 0
predefinedResolutionIndex: 1
targetResolution: 1080
resolutionMultiplier: 1
stepDistance: 10
samplingStepDistance: 100
maxCordDeviationEnabled: 0
maxCordDeviation: 1
maxTangentAngleEnabled: 0
maxTangentAngle: 5
keepTextureAspectRatio: 1
textureSize: 256
textureWidth: 256
textureHeight: 256
wrapMode: 0
filterMode: 1
sampleCount: 4
spriteData:
TessellationDetail: 0
SpriteRect:
name:
originalName:
pivot: {x: 0, y: 0}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
spriteID: c215163f196834e40bc64aa9cd443071
internalID: 0
PhysicsOutlines: []
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
fileFormatVersion: 2
guid: 3481b87cfe001274f97a325d20523704
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
svgType: 0
texturedSpriteMeshType: 0
svgPixelsPerUnit: 100
gradientResolution: 128
alignment: 0
customPivot: {x: 0, y: 0}
generatePhysicsShape: 0
viewportOptions: 0
preserveViewport: 0
advancedMode: 0
predefinedResolutionIndex: 1
targetResolution: 1080
resolutionMultiplier: 1
stepDistance: 10
samplingStepDistance: 100
maxCordDeviationEnabled: 0
maxCordDeviation: 1
maxTangentAngleEnabled: 0
maxTangentAngle: 5
keepTextureAspectRatio: 1
textureSize: 256
textureWidth: 256
textureHeight: 256
wrapMode: 0
filterMode: 1
sampleCount: 4
spriteData:
TessellationDetail: 0
SpriteRect:
name:
originalName:
pivot: {x: 0, y: 0}
alignment: 0
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
spriteID: 0c1eaf713e6f51449b9a33be784873d5
internalID: 0
PhysicsOutlines: []
fileFormatVersion: 2
guid: 6ab746d096aae544091aba14f55080f6
guid: e16a0c2cb09ab7b45a845fc3e184b181
PrefabImporter:
externalObjects: {}
userData:
......
......@@ -250,242 +250,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &2854983929079501904
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 573998123355458477}
- component: {fileID: 6097657422062468297}
- component: {fileID: 7009292381991647086}
- component: {fileID: 8546742293642424891}
- component: {fileID: 1069657528616039592}
- component: {fileID: 8608132586420310725}
- component: {fileID: 4309948820081742958}
m_Layer: 0
m_Name: MaskAvatar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &573998123355458477
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8794248629194934110}
m_Father: {fileID: 6706248009487948572}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -4}
m_SizeDelta: {x: 46, y: 46}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6097657422062468297
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_CullTransparentMesh: 0
--- !u!114 &7009292381991647086
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: d14fd7f663c98f64eb3bb3c5315766ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &8546742293642424891
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1069657528616039592
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!114 &8608132586420310725
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AspectMode: 2
m_AspectRatio: 1
--- !u!114 &4309948820081742958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2854983929079501904}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7009292381991647086}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &8794248629194934111
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8794248629194934110}
- component: {fileID: 8794248629194934104}
- component: {fileID: 9076023188904108295}
m_Layer: 0
m_Name: Avatar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8794248629194934110
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8794248629194934111}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 573998123355458477}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8794248629194934104
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8794248629194934111}
m_CullTransparentMesh: 0
--- !u!114 &9076023188904108295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8794248629194934111}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Texture: {fileID: 2800000, guid: d14fd7f663c98f64eb3bb3c5315766ab, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &8794248629728260628
GameObject:
m_ObjectHideFlags: 0
......@@ -592,3 +356,152 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_containerSource: 2
--- !u!1001 &3336428303796125630
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6706248009487948572}
m_Modifications:
- target: {fileID: 708102104147307502, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_Name
value: MaskAvatar
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -4
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_SizeDelta.x
value: 46
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_SizeDelta.y
value: 46
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 43f6dfd949a7f454181f37fcc0110886, type: 3}
--- !u!224 &573998123355458477 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3006750464655258643, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
m_PrefabInstance: {fileID: 3336428303796125630}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4309948820081742958 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1557502478759865296, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
m_PrefabInstance: {fileID: 3336428303796125630}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &9076023188904108295 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6033096020161060537, guid: 43f6dfd949a7f454181f37fcc0110886,
type: 3}
m_PrefabInstance: {fileID: 3336428303796125630}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
This diff is collapsed.
fileFormatVersion: 2
guid: de0103d9f63cff34e969e28428f74df7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -225,7 +225,7 @@ PrefabInstance:
- target: {fileID: 1912955367787160680, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1912955367787160683, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
......@@ -360,7 +360,7 @@ PrefabInstance:
- target: {fileID: 1912955368379475617, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_SizeDelta.x
value: -84.03001
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1912955368379475619, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
......@@ -390,7 +390,7 @@ PrefabInstance:
- target: {fileID: 1912955367524150490, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_SizeDelta.y
value: -44.308273
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1912955367524150468, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
......@@ -425,7 +425,7 @@ PrefabInstance:
- target: {fileID: 1912955368622370856, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_SizeDelta.x
value: -104.72001
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1912955368622370858, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
......@@ -455,17 +455,17 @@ PrefabInstance:
- target: {fileID: 1912955368949975074, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1912955367769036525, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1912955368962972292, guid: a5719fe3c4b1aac428df8a0a761ef319,
type: 3}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a5719fe3c4b1aac428df8a0a761ef319, type: 3}
......@@ -860,7 +860,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 1599516883}
m_Material: {fileID: 1620216212}
m_Color: {r: 1, g: 1, b: 1, a: 0.101960786}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -991,7 +991,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 3
m_ScaleFactor: 2
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
......@@ -1311,7 +1311,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 3
m_ScaleFactor: 2
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
......@@ -2067,17 +2067,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1346272504}
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 4021139411616869366}
m_MethodName: SwitchTo
m_Mode: 5
......@@ -2116,7 +2105,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 41f1c5417c9d7ab4b84e531f83f60a4b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 1599516883}
m_Material: {fileID: 1620216212}
m_Color: {r: 0.050980393, g: 0.06666667, b: 0.10980392, a: 0.6}
m_RaycastTarget: 1
m_OnCullStateChanged:
......@@ -2575,7 +2564,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1587519161}
m_CullTransparentMesh: 0
--- !u!21 &1599516883
--- !u!21 &1620216212
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
......@@ -3027,7 +3016,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 3
m_ScaleFactor: 2
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
......@@ -4439,6 +4428,11 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6838013745777765659, guid: 8cf6311c508f0a64897cda4b9137708b,
type: 3}
propertyPath: m_PreserveAspect
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9107334494300405349, guid: 8cf6311c508f0a64897cda4b9137708b,
type: 3}
propertyPath: m_AnchorMin.x
......@@ -4479,11 +4473,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6838013745777765659, guid: 8cf6311c508f0a64897cda4b9137708b,
type: 3}
propertyPath: m_PreserveAspect
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8cf6311c508f0a64897cda4b9137708b, type: 3}
--- !u!114 &2376297259611494218
......
......@@ -12,12 +12,15 @@ namespace AvvyLand.AR
{
private IStructures structures;
private ARStructBinder structBinder;
private AvvyUserProvider userProvider;
[Inject]
private void Init(SculptSaverLoader sculptSaver, IStructures structures, ARStructBinder structBinder)
private void Init(SculptSaverLoader sculptSaver, IStructures structures, ARStructBinder structBinder,
AvvyUserProvider userProvider)
{
this.structures = structures;
this.structBinder = structBinder;
this.userProvider = userProvider;
sculptSaver.SculptSaved += OnSaved;
}
......@@ -26,6 +29,7 @@ namespace AvvyLand.AR
{
var structure = new Structure()
{
Owner = userProvider.User.Uid,
SculptId = sculpture.Id
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment