Merge pull request #258 from fga-gpp-mds/development

Atualização da Branch Master para gerar uma nova release
fga-eps-mds · Jun 11, 2018 · a14b2cc · a14b2cc
2 parents bfc7a72 + 4ea44e4
commit a14b2cc
Show file tree

Hide file tree

Showing 72 changed files with 10,390 additions and 1,179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,9 @@ Assets/AssetStoreTools*
 .consulo/
 *.tmp
 *.svd
+InitTest*.unity*
 Reabilitacao-Motora/Assets/Movimentos/
+*tech.db
 Reabilitacao-Motora/Assets/Exercicios/
 log.txt
 Reabilitacao-Motora/log.txt

diff --git a/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel1.png b/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel1.png
diff --git a/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel1.png.meta b/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel1.png.meta
diff --git a/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel2.png b/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel2.png
diff --git a/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel2.png.meta b/Reabilitacao-Motora/Assets/Imgs/bgHelpMovementLabel2.png.meta
diff --git a/Reabilitacao-Motora/Assets/Prefabs/PhysioPrefab.prefab b/Reabilitacao-Motora/Assets/Prefabs/PhysioPrefab.prefab
@@ -286,7 +286,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 100, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!224 &224342991691188298
 RectTransform:

diff --git a/Reabilitacao-Motora/Assets/Scenes/ChoiceSensor.unity b/Reabilitacao-Motora/Assets/Scenes/ChoiceSensor.unity
@@ -474,17 +474,17 @@ RectTransform:
   m_GameObject: {fileID: 424782929}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -23.13143}
-  m_LocalScale: {x: 0.68856996, y: 0.68856996, z: 0.68856996}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 975248145}
   m_Father: {fileID: 1624486615}
   m_RootOrder: 3
   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: 264.96, y: -145.3714}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -20, y: 10}
   m_SizeDelta: {x: 100, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 1, y: 0}
 --- !u!114 &424782931
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -493,7 +493,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 424782929}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 44c896e5a7451724baeec2561faff773, type: 3}
+  m_Script: {fileID: 11500000, guid: 9a33cb0c7f084f74786e0fd41835b5c5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   nextPage: {fileID: 424782932}
@@ -765,11 +765,11 @@ RectTransform:
   m_Father: {fileID: 1624486615}
   m_RootOrder: 0
   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: -180, y: -50}
-  m_SizeDelta: {x: 190, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 75, y: 0}
+  m_SizeDelta: {x: 200, y: 40}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &790931320
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -790,7 +790,7 @@ MonoBehaviour:
   m_Transition: 1
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.56078434, g: 0.90196085, b: 0.9568628, a: 1}
+    m_HighlightedColor: {r: 0.6544118, g: 0.6544118, b: 0.6544118, a: 1}
     m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
     m_DisabledColor: {r: 1, g: 1, b: 1, a: 0.5019608}
     m_ColorMultiplier: 1
@@ -1019,7 +1019,7 @@ GameObject:
   - component: {fileID: 975248147}
   - component: {fileID: 975248146}
   m_Layer: 5
-  m_Name: TextMoves
+  m_Name: TextBt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1064,7 +1064,7 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 6bbad337ba6f03b4abeaffdf79e7e069, type: 3}
-    m_FontSize: 14
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -1223,11 +1223,11 @@ RectTransform:
   m_Father: {fileID: 1624486615}
   m_RootOrder: 2
   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: -298.05716, y: 169.14288}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 5, y: -5}
   m_SizeDelta: {x: 50, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!114 &1371992082
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1362,7 +1362,7 @@ Camera:
     y: 0
     width: 1
     height: 1
-  near clip plane: 0.3
+  near clip plane: 0.1
   far clip plane: 1000
   field of view: 36
   orthographic: 0
@@ -1425,11 +1425,11 @@ RectTransform:
   m_Father: {fileID: 1624486615}
   m_RootOrder: 1
   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: -220, y: 120}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 40, y: -5}
   m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!114 &1480393201
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Reabilitacao-Motora/Assets/Scenes/EndSession.unity b/Reabilitacao-Motora/Assets/Scenes/EndSession.unity
@@ -1086,7 +1086,7 @@ MonoBehaviour:
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 0
-    m_HorizontalOverflow: 1
+    m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
@@ -1509,7 +1509,7 @@ MonoBehaviour:
   m_InputType: 0
   m_AsteriskChar: 42
   m_KeyboardType: 0
-  m_LineType: 0
+  m_LineType: 2
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0