v0.8

bionicl · Sep 9, 2018 · d4b7e6d · d4b7e6d
2 parents 916f9c1 + 4ed7d25
commit d4b7e6d
Show file tree

Hide file tree

Showing 63 changed files with 21,618 additions and 7,856 deletions.
diff --git a/Assets/Animations/ActivityUI/Activity.controller b/Assets/Animations/ActivityUI/Activity.controller
@@ -13,25 +13,25 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Highlighted
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Pressed
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Disabled
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -453,7 +453,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.21960784
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -469,7 +469,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19215687
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -485,7 +485,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.14901961
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -501,7 +501,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19607843
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -517,7 +517,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19215687
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -533,7 +533,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19215687
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -644,7 +644,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.21960784
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -660,7 +660,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19215687
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -676,7 +676,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.14901961
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -692,7 +692,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19607843
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -708,7 +708,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19215687
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -724,7 +724,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: 0.19215687
+        value: 1
         inSlope: 0
         outSlope: 0
         tangentMode: 136

diff --git a/Assets/Animations/TabBox/Open.anim b/Assets/Animations/TabBox/Open.anim
@@ -21,9 +21,9 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -31
-        inSlope: -210.07977
-        outSlope: -210.07977
+        value: -40
+        inSlope: -74.65718
+        outSlope: -74.65718
         tangentMode: 0
       - serializedVersion: 2
         time: 0.41666666
@@ -65,35 +65,13 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -114.1
+        value: 132.3077
         inSlope: 0
         outSlope: 0
         tangentMode: 136
       - serializedVersion: 2
         time: 0.41666666
-        value: -114.099976
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 245.9231
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 0.41666666
-        value: 230.9231
+        value: 131.3077
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -126,13 +104,6 @@ AnimationClip:
       typeID: 225
       customType: 0
       isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 0
-      attribute: 1460864421
-      script: {fileID: 0}
-      typeID: 224
-      customType: 0
-      isPPtrCurve: 0
     - serializedVersion: 2
       path: 0
       attribute: 3762036201
@@ -167,9 +138,9 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -31
-        inSlope: -210.07977
-        outSlope: -210.07977
+        value: -40
+        inSlope: -74.65718
+        outSlope: -74.65718
         tangentMode: 0
       - serializedVersion: 2
         time: 0.41666666
@@ -211,35 +182,13 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -114.1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      - serializedVersion: 2
-        time: 0.41666666
-        value: -114.099976
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_AnchoredPosition.x
-    path: 
-    classID: 224
-    script: {fileID: 0}
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 2
-        time: 0
-        value: 245.9231
+        value: 132.3077
         inSlope: 0
         outSlope: 0
         tangentMode: 136
       - serializedVersion: 2
         time: 0.41666666
-        value: 230.9231
+        value: 131.3077
         inSlope: 0
         outSlope: 0
         tangentMode: 136

diff --git a/Assets/ButtonTabs.cs b/Assets/ButtonTabs.cs
@@ -4,12 +4,17 @@
 using UnityEngine.UI;
 
 public class ButtonTabs : MonoBehaviour {
+	public static ButtonTabs instance;
 
 	public TabsButton[] buttons;
 	public GameObject[] tabs;
 	int? currentlyOpened;
 	public Text saveButtonText;
 
+	void Awake() {
+		instance = this;
+	}
+
 	void Start () {
 		foreach (var item in tabs) {
 			item.SetActive(false);
@@ -18,11 +23,18 @@ void Start () {
 	}
 
 	public void Open(int id) {
+		if (currentlyOpened == 3) {
+			Calendar.instance.ResetActivityListPadding();
+		}
+
 		if (currentlyOpened == id) {
 			buttons[id].Disable();
 			tabs[id].SetActive(false);
 			currentlyOpened = null;
 		} else {
+			if (id == 3) {
+				Calendar.instance.OnCalendarEnable();
+			}
 			if (currentlyOpened.HasValue) {
 				buttons[currentlyOpened.Value].Disable();
 				tabs[currentlyOpened.Value].SetActive(false);
@@ -34,12 +46,20 @@ public void Open(int id) {
 	}
 
 	public void Save() {
-		SaveSystem.Save();
-		saveButtonText.text = "Saved!";
+		saveButtonText.gameObject.SetActive(true);
+		saveButtonText.text = "Saving...";
 		StartCoroutine(RevertAfterTime());
 	}
 	IEnumerator RevertAfterTime() {
+		yield return new WaitForEndOfFrame();
+		SaveSystem.Save();
+		saveButtonText.text = "Saved!";
 		yield return new WaitForSeconds(1.5f);
-		saveButtonText.text = "Save";
+		saveButtonText.gameObject.SetActive(false);
+	}
+
+	public void ClearCalendarView() {
+		if (currentlyOpened == 3)
+			Open(3);
 	}
 }