Skip to content

Commit e8cdb58

Browse files
authored
Merge pull request #2 from ChameleonO2/develop
バグの修正とレイアウトの更新
2 parents 26b7f97 + 301dd4d commit e8cdb58

File tree

9 files changed

+651
-40
lines changed

9 files changed

+651
-40
lines changed

Assets/AndroidTracking/Scenes/TrackingScene.unity

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ GameObject:
122122
m_Component:
123123
- component: {fileID: 32368565}
124124
m_Layer: 0
125-
m_Name: XOffsetGroup
125+
m_Name: XOffsetButton
126126
m_TagString: Untagged
127127
m_Icon: {fileID: 0}
128128
m_NavMeshLayer: 0
@@ -1049,7 +1049,7 @@ MonoBehaviour:
10491049
m_HorizontalOverflow: 0
10501050
m_VerticalOverflow: 0
10511051
m_LineSpacing: 1
1052-
m_Text: +
1052+
m_Text: "Down\n\u2193"
10531053
--- !u!222 &441876913
10541054
CanvasRenderer:
10551055
m_ObjectHideFlags: 0
@@ -1538,7 +1538,7 @@ GameObject:
15381538
m_Component:
15391539
- component: {fileID: 729002386}
15401540
m_Layer: 0
1541-
m_Name: ZOffsetGroup
1541+
m_Name: ZOffsetButton
15421542
m_TagString: Untagged
15431543
m_Icon: {fileID: 0}
15441544
m_NavMeshLayer: 0
@@ -1912,7 +1912,7 @@ RectTransform:
19121912
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
19131913
m_AnchorMin: {x: 0.5, y: 0.5}
19141914
m_AnchorMax: {x: 0.5, y: 0.5}
1915-
m_AnchoredPosition: {x: 745, y: 604}
1915+
m_AnchoredPosition: {x: 746, y: 604}
19161916
m_SizeDelta: {x: 60, y: 60}
19171917
m_Pivot: {x: 0.5, y: 0.5}
19181918
--- !u!114 &928353167
@@ -3196,6 +3196,36 @@ CanvasRenderer:
31963196
m_PrefabAsset: {fileID: 0}
31973197
m_GameObject: {fileID: 1691910814}
31983198
m_CullTransparentMesh: 0
3199+
--- !u!1 &1765663498
3200+
GameObject:
3201+
m_ObjectHideFlags: 0
3202+
m_CorrespondingSourceObject: {fileID: 0}
3203+
m_PrefabInstance: {fileID: 0}
3204+
m_PrefabAsset: {fileID: 0}
3205+
serializedVersion: 6
3206+
m_Component:
3207+
- component: {fileID: 1765663499}
3208+
m_Layer: 0
3209+
m_Name: OffsetTextBox
3210+
m_TagString: Untagged
3211+
m_Icon: {fileID: 0}
3212+
m_NavMeshLayer: 0
3213+
m_StaticEditorFlags: 0
3214+
m_IsActive: 1
3215+
--- !u!4 &1765663499
3216+
Transform:
3217+
m_ObjectHideFlags: 0
3218+
m_CorrespondingSourceObject: {fileID: 0}
3219+
m_PrefabInstance: {fileID: 0}
3220+
m_PrefabAsset: {fileID: 0}
3221+
m_GameObject: {fileID: 1765663498}
3222+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3223+
m_LocalPosition: {x: 719.4807, y: 512.7495, z: 0}
3224+
m_LocalScale: {x: 1, y: 1, z: 1}
3225+
m_Children: []
3226+
m_Father: {fileID: 0}
3227+
m_RootOrder: 6
3228+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
31993229
--- !u!1 &1850974303
32003230
GameObject:
32013231
m_ObjectHideFlags: 0
@@ -3283,7 +3313,7 @@ GameObject:
32833313
m_Component:
32843314
- component: {fileID: 1851173127}
32853315
m_Layer: 0
3286-
m_Name: YOffsetGroup
3316+
m_Name: YOffsetButton
32873317
m_TagString: Untagged
32883318
m_Icon: {fileID: 0}
32893319
m_NavMeshLayer: 0
@@ -3452,7 +3482,7 @@ MonoBehaviour:
34523482
m_HorizontalOverflow: 0
34533483
m_VerticalOverflow: 0
34543484
m_LineSpacing: 1
3455-
m_Text: '-'
3485+
m_Text: "\u2191\nUP"
34563486
--- !u!222 &1877884607
34573487
CanvasRenderer:
34583488
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)