Merge pull request #8 from AliMatias/ShowInfoBasicTper

Show info basic tper
AliMatias · Jun 14, 2019 · dd93149 · dd93149
2 parents 1d1398e + 1f7766e
commit dd93149
Show file tree

Hide file tree

Showing 18 changed files with 1,897 additions and 218 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,11 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+
+#vscode
+*.vscode/*
+*.vscode/settings.json
+*.vscode/tasks.json
+*.vscode/launch.json
+*.vscode/extensions.json
+New Unity Project/.vscode/settings.json
diff --git a/DB Scripts/DDL_create_tables_elementosTP.sql b/DB Scripts/DDL_create_tables_elementosTP.sql
@@ -9,7 +9,7 @@ CREATE TABLE "elementos_info_basica"(
 	"fase" TEXT NULL,
 	"estructura_cristalina" TEXT NULL,
 	"color" TEXT NULL,
-	"valencia" INTEGER NULL,
+	"valencia" TEXT NULL,
 	"numeros_oxidacion" TEXT NULL,
 	"configuracion_electronica_abreviada" TEXT NULL,
 	"configuracion_electronica" TEXT NULL,

diff --git a/DB Scripts/INSERT_elementos_info_basica.sql b/DB Scripts/INSERT_elementos_info_basica.sql
diff --git a/New Unity Project/Assets/Prefabs/ElementPrefab.prefab b/New Unity Project/Assets/Prefabs/ElementPrefab.prefab
@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 7128743440240980142}
   - component: {fileID: 4385820789787708559}
   - component: {fileID: 9096504253937252805}
+  - component: {fileID: 340006341194339952}
   m_Layer: 5
   m_Name: ElementPrefab
   m_TagString: Untagged
@@ -118,6 +119,23 @@ MonoBehaviour:
   m_Interactable: 1
   m_TargetGraphic: {fileID: 4385820789787708559}
   m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &340006341194339952
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 171082391575801109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 91e37e7d2c001a346a73024dc3c1ecc6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onLeft:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 4257166569370380754}
@@ -131,7 +149,28 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  onRight:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 4257166569370380754}
+        m_MethodName: GetInfoBasic
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+  onMiddle:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!1 &347300794931205690
 GameObject:

diff --git a/New Unity Project/Assets/SIAMM.db b/New Unity Project/Assets/SIAMM.db