combine-mode resolve conflicts

AliMatias · Jun 29, 2019 · 326bb6e · 326bb6e
2 parents b944721 + e4d4f49
commit 326bb6e
Show file tree

Hide file tree

Showing 52 changed files with 42,748 additions and 6,804 deletions.
diff --git a/New Unity Project/Assets/Prefabs/ElementPrefab.prefab b/New Unity Project/Assets/Prefabs/ElementPrefab.prefab
@@ -374,6 +374,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parent: {fileID: 171082391575801109}
+  buttonPref: {fileID: 9096504253937252805}
 --- !u!1 &7375166009691424396
 GameObject:
   m_ObjectHideFlags: 0
@@ -406,10 +407,10 @@ RectTransform:
   m_Father: {fileID: 2875330828932066517}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -12, y: -15}
-  m_SizeDelta: {x: 25, y: 30}
+  m_AnchoredPosition: {x: -14.1, y: 0}
+  m_SizeDelta: {x: 25, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6837542905779584381
 CanvasRenderer:
@@ -452,7 +453,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1-1
+  m_Text: "1s2 \_2s2 2p6 3s2 3p6\r\n"
 --- !u!1 &8116659065929905492
 GameObject:
   m_ObjectHideFlags: 0
@@ -530,5 +531,5 @@ MonoBehaviour:
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
-    m_LineSpacing: 2
+    m_LineSpacing: 1
   m_Text: 1