Skip to content

Commit

Permalink
Merge pull request #103 from Kapim/master
Browse files Browse the repository at this point in the history 
Bugfix for 0.4.0
  • Loading branch information
@Kapim
Kapim authored Apr 22, 2020
2 parents 0c05144 + 177143f commit 1afa457
Show file tree
Hide file tree
Showing 17 changed files with 929 additions and 731 deletions.
212 changes: 106 additions & 106 deletions arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab
View file

Large diffs are not rendered by default.

260 changes: 232 additions & 28 deletions arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/MainMenu Tablet.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ RectTransform:
- {fileID: 1861652865249003949}
- {fileID: 3850365649767114455}
m_Father: {fileID: 745754958250481375}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -858,8 +858,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 265, y: 0}
m_SizeDelta: {x: 530, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8732059655508387234
CanvasRenderer:
Expand Down Expand Up @@ -1202,11 +1202,11 @@ RectTransform:
- {fileID: 3968070834748230677}
- {fileID: 8723196978310527387}
- {fileID: 277037745054199612}
- {fileID: 2451322607190902694}
- {fileID: 2231509658131462721}
- {fileID: 7225437295222887261}
- {fileID: 1945109859009263100}
- {fileID: 1030801984328521105}
- {fileID: 2451322607190902694}
- {fileID: 2231509658131462721}
- {fileID: 420465013591562516}
- {fileID: 548804833002054957}
- {fileID: 6902955182425355826}
Expand Down Expand Up @@ -1745,7 +1745,7 @@ RectTransform:
- {fileID: 4891674933368983626}
- {fileID: 5940109961825414571}
m_Father: {fileID: 745754958250481375}
m_RootOrder: 5
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -1895,8 +1895,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 3420929669001438319}
m_HandleRect: {fileID: 3700317571809720166}
m_Direction: 2
m_Value: 0.99999994
m_Size: 0.6169649
m_Value: 1
m_Size: 0.5638378
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -2163,7 +2163,7 @@ RectTransform:
- {fileID: 2732263201233664100}
- {fileID: 4684478540388696103}
m_Father: {fileID: 745754958250481375}
m_RootOrder: 4
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -2538,7 +2538,7 @@ PrefabInstance:
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
Expand Down Expand Up @@ -2997,6 +2997,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3}
--- !u!224 &283490897199036940 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
m_PrefabInstance: {fileID: 2016716778844809324}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5482851328996412875 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6335387108731086247, guid: c77917a7826c62e419cc9a2867495b1f,
Expand All @@ -3009,12 +3015,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &283490897199036940 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
m_PrefabInstance: {fileID: 2016716778844809324}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2609160504771275944
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3419,7 +3419,7 @@ PrefabInstance:
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
Expand Down Expand Up @@ -4697,6 +4697,210 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3}
--- !u!1001 &5279815339322241687
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6388302462012475654}
m_Modifications:
- target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_Navigation.m_Mode
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnimationTriggers.m_SelectedTrigger
value: Selected
objectReference: {fileID: 0}
- target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: SaveLogs
objectReference: {fileID: 0}
- target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1349415282727003576}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalScale.x
value: 1.0008987
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalScale.y
value: 1.0008987
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_LocalScale.z
value: 1.0008987
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_textInfo.characterCount
value: 9
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_textInfo.wordCount
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_textInfo.lineCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_textInfo.pageCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_text
value: Save logs
objectReference: {fileID: 0}
- target: {fileID: 5060721638544296042, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_fontSize
value: 50
objectReference: {fileID: 0}
- target: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_Name
value: SaveLogs
objectReference: {fileID: 0}
- target: {fileID: 8389814341572876305, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 9193862448044351243, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c77917a7826c62e419cc9a2867495b1f, type: 3}
--- !u!1001 &5713371717440154494
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4767,7 +4971,7 @@ PrefabInstance:
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
Expand Down Expand Up @@ -5495,7 +5699,7 @@ PrefabInstance:
- target: {fileID: 8888084865542841249, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8888084865542841249, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
Expand Down Expand Up @@ -5579,9 +5783,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 962caad8dd1393d4d91494c0abe624cc, type: 3}
--- !u!224 &9056115924848578177 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2662123842529454726, guid: 962caad8dd1393d4d91494c0abe624cc,
--- !u!1 &6168760762578877045 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 920948528114228850, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
m_PrefabInstance: {fileID: 6439033612322694151}
m_PrefabAsset: {fileID: 0}
Expand All @@ -5591,9 +5795,9 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6439033612322694151}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6168760762578877045 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 920948528114228850, guid: 962caad8dd1393d4d91494c0abe624cc,
--- !u!224 &9056115924848578177 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2662123842529454726, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
m_PrefabInstance: {fileID: 6439033612322694151}
m_PrefabAsset: {fileID: 0}
Expand Down Expand Up @@ -5879,7 +6083,7 @@ PrefabInstance:
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1735003242729280096, guid: c77917a7826c62e419cc9a2867495b1f,
type: 3}
Expand Down Expand Up @@ -6193,7 +6397,7 @@ PrefabInstance:
- target: {fileID: 8888084865542841249, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8888084865542841249, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
Expand Down Expand Up @@ -6425,7 +6629,7 @@ PrefabInstance:
- target: {fileID: 6474265387134195502, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6843065873936781589, guid: 962caad8dd1393d4d91494c0abe624cc,
type: 3}
Expand Down
Loading

0 comments on commit 1afa457

Please sign in to comment.