2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
이상윤
ee6e2f06 2 parents 59e4a6a8 9fc607a4

Merge branch 'master' of http://khuhub.khu.ac.kr/2020-1-capstone-design1/LSK_Project1

Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
...@@ -226,7 +226,7 @@ RectTransform: ...@@ -226,7 +226,7 @@ RectTransform:
226 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 226 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
227 m_AnchorMin: {x: 0.5, y: 0.5} 227 m_AnchorMin: {x: 0.5, y: 0.5}
228 m_AnchorMax: {x: 0.5, y: 0.5} 228 m_AnchorMax: {x: 0.5, y: 0.5}
229 - m_AnchoredPosition: {x: 400, y: 110} 229 + m_AnchoredPosition: {x: 280, y: -300}
230 m_SizeDelta: {x: 160, y: 30} 230 m_SizeDelta: {x: 160, y: 30}
231 m_Pivot: {x: 0.5, y: 0.5} 231 m_Pivot: {x: 0.5, y: 0.5}
232 --- !u!114 &22123171 232 --- !u!114 &22123171
...@@ -251,7 +251,7 @@ MonoBehaviour: ...@@ -251,7 +251,7 @@ MonoBehaviour:
251 m_FontData: 251 m_FontData:
252 m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} 252 m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
253 m_FontSize: 25 253 m_FontSize: 25
254 - m_FontStyle: 0 254 + m_FontStyle: 1
255 m_BestFit: 0 255 m_BestFit: 0
256 m_MinSize: 0 256 m_MinSize: 0
257 m_MaxSize: 40 257 m_MaxSize: 40
...@@ -457,7 +457,7 @@ GameObject: ...@@ -457,7 +457,7 @@ GameObject:
457 m_Icon: {fileID: 0} 457 m_Icon: {fileID: 0}
458 m_NavMeshLayer: 0 458 m_NavMeshLayer: 0
459 m_StaticEditorFlags: 0 459 m_StaticEditorFlags: 0
460 - m_IsActive: 0 460 + m_IsActive: 1
461 --- !u!224 &109009051 461 --- !u!224 &109009051
462 RectTransform: 462 RectTransform:
463 m_ObjectHideFlags: 0 463 m_ObjectHideFlags: 0
...@@ -779,7 +779,7 @@ GameObject: ...@@ -779,7 +779,7 @@ GameObject:
779 m_Icon: {fileID: 0} 779 m_Icon: {fileID: 0}
780 m_NavMeshLayer: 0 780 m_NavMeshLayer: 0
781 m_StaticEditorFlags: 0 781 m_StaticEditorFlags: 0
782 - m_IsActive: 0 782 + m_IsActive: 1
783 --- !u!224 &310358199 783 --- !u!224 &310358199
784 RectTransform: 784 RectTransform:
785 m_ObjectHideFlags: 0 785 m_ObjectHideFlags: 0
...@@ -787,13 +787,13 @@ RectTransform: ...@@ -787,13 +787,13 @@ RectTransform:
787 m_PrefabInstance: {fileID: 0} 787 m_PrefabInstance: {fileID: 0}
788 m_PrefabAsset: {fileID: 0} 788 m_PrefabAsset: {fileID: 0}
789 m_GameObject: {fileID: 310358198} 789 m_GameObject: {fileID: 310358198}
790 - m_LocalRotation: {x: 0, y: 0, z: 0.3420201, w: 0.9396927} 790 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
791 m_LocalPosition: {x: 0, y: 0, z: 0} 791 m_LocalPosition: {x: 0, y: 0, z: 0}
792 m_LocalScale: {x: 1, y: 1, z: 1} 792 m_LocalScale: {x: 1, y: 1, z: 1}
793 m_Children: [] 793 m_Children: []
794 m_Father: {fileID: 1679758666} 794 m_Father: {fileID: 1679758666}
795 m_RootOrder: 18 795 m_RootOrder: 18
796 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 40} 796 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
797 m_AnchorMin: {x: 0.5, y: 0.5} 797 m_AnchorMin: {x: 0.5, y: 0.5}
798 m_AnchorMax: {x: 0.5, y: 0.5} 798 m_AnchorMax: {x: 0.5, y: 0.5}
799 m_AnchoredPosition: {x: 290, y: 100} 799 m_AnchoredPosition: {x: 290, y: 100}
...@@ -850,7 +850,7 @@ GameObject: ...@@ -850,7 +850,7 @@ GameObject:
850 m_Icon: {fileID: 0} 850 m_Icon: {fileID: 0}
851 m_NavMeshLayer: 0 851 m_NavMeshLayer: 0
852 m_StaticEditorFlags: 0 852 m_StaticEditorFlags: 0
853 - m_IsActive: 0 853 + m_IsActive: 1
854 --- !u!224 &395084096 854 --- !u!224 &395084096
855 RectTransform: 855 RectTransform:
856 m_ObjectHideFlags: 0 856 m_ObjectHideFlags: 0
...@@ -938,7 +938,7 @@ RectTransform: ...@@ -938,7 +938,7 @@ RectTransform:
938 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 938 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
939 m_AnchorMin: {x: 0.5, y: 0.5} 939 m_AnchorMin: {x: 0.5, y: 0.5}
940 m_AnchorMax: {x: 0.5, y: 0.5} 940 m_AnchorMax: {x: 0.5, y: 0.5}
941 - m_AnchoredPosition: {x: -159, y: 180} 941 + m_AnchoredPosition: {x: 0, y: -300}
942 m_SizeDelta: {x: 160, y: 30} 942 m_SizeDelta: {x: 160, y: 30}
943 m_Pivot: {x: 0.5, y: 0.5} 943 m_Pivot: {x: 0.5, y: 0.5}
944 --- !u!114 &433964839 944 --- !u!114 &433964839
...@@ -963,7 +963,7 @@ MonoBehaviour: ...@@ -963,7 +963,7 @@ MonoBehaviour:
963 m_FontData: 963 m_FontData:
964 m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} 964 m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
965 m_FontSize: 25 965 m_FontSize: 25
966 - m_FontStyle: 0 966 + m_FontStyle: 1
967 m_BestFit: 0 967 m_BestFit: 0
968 m_MinSize: 0 968 m_MinSize: 0
969 m_MaxSize: 40 969 m_MaxSize: 40
...@@ -1662,7 +1662,7 @@ GameObject: ...@@ -1662,7 +1662,7 @@ GameObject:
1662 m_Icon: {fileID: 0} 1662 m_Icon: {fileID: 0}
1663 m_NavMeshLayer: 0 1663 m_NavMeshLayer: 0
1664 m_StaticEditorFlags: 0 1664 m_StaticEditorFlags: 0
1665 - m_IsActive: 0 1665 + m_IsActive: 1
1666 --- !u!224 &1089006721 1666 --- !u!224 &1089006721
1667 RectTransform: 1667 RectTransform:
1668 m_ObjectHideFlags: 0 1668 m_ObjectHideFlags: 0
...@@ -2175,7 +2175,7 @@ GameObject: ...@@ -2175,7 +2175,7 @@ GameObject:
2175 m_Icon: {fileID: 0} 2175 m_Icon: {fileID: 0}
2176 m_NavMeshLayer: 0 2176 m_NavMeshLayer: 0
2177 m_StaticEditorFlags: 0 2177 m_StaticEditorFlags: 0
2178 - m_IsActive: 0 2178 + m_IsActive: 1
2179 --- !u!224 &1484596776 2179 --- !u!224 &1484596776
2180 RectTransform: 2180 RectTransform:
2181 m_ObjectHideFlags: 0 2181 m_ObjectHideFlags: 0
......