Merge pull request #11 from kou-yeung/develop

Develop
kou-yeung · May 18, 2019 · 1e3b4e7 · 1e3b4e7
2 parents d2de85f + 45da4eb
commit 1e3b4e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -317,7 +317,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -243, y: -114}
+  m_AnchoredPosition: {x: -243, y: -170}
   m_SizeDelta: {x: 272.5, y: 33.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &181394221
@@ -3799,7 +3799,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -243, y: -166}
+  m_AnchoredPosition: {x: -243, y: -233}
   m_SizeDelta: {x: 272.5, y: 33.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1976214887

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.4.16f1
+m_EditorVersion: 2017.4.27f1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2017.4.16f1
		m_EditorVersion: 2017.4.27f1