End of Day 8

Itsy bitsy teeny tiny work :(
Papiertig0r · Jan 8, 2018 · 67b8006 · 67b8006
1 parent 63875e3
commit 67b8006
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 100 deletions.
diff --git a/Assets/Editor/EffectEditor.cs b/Assets/Editor/EffectEditor.cs
@@ -25,12 +25,7 @@ public override void OnInspectorGUI()
 
             curveX = new AnimationCurve(keyframes.ToArray());
 
-            curveX = EditorGUILayout.CurveField(curveX, Color.green, new Rect(0f, 0f, 100f, 1f));
-
-            effect.minConc = curveX.keys[0].time;
-            effect.maxConc = curveX.keys[2].time;
-            effect.bestConc = curveX.keys[1].time;
-
+            EditorGUILayout.CurveField(curveX, Color.green, new Rect(0f, 0f, 100f, 1f));
         }
     }
 }
diff --git a/Assets/Prefabs/Herb.prefab b/Assets/Prefabs/Herb.prefab
@@ -36,8 +36,8 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1985862277652182}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 2.5, y: -1.7, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -91,26 +91,43 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6bae2ccb44839224d9240326cd2a603b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ingredientType: 0
+  concentration: 40
+  ingredientType: 2
   currentToolType: 0
   currentProgress: 0
   phaseTransition:
   - toolType: 0
     originalType: 0
     endType: 2
     endProductName: Healing Paste
+    endProductSprite: {fileID: 0}
   - toolType: 1
     originalType: 2
     endType: 1
     endProductName: Healing Potion
+    endProductSprite: {fileID: 0}
   - toolType: 2
     originalType: 1
     endType: 2
     endProductName: Healing Paste
+    endProductSprite: {fileID: 0}
   - toolType: 2
     originalType: 2
     endType: 3
     endProductName: Healing Powder
+    endProductSprite: {fileID: 0}
+  effectList:
+  - name: Healing
+    description: 
+    minConc: 20
+    maxConc: 70
+    bestConc: 50
+    tier: 1
+    phaseMultiplier:
+    - 1.25
+    - 1.25
+    - 1.5
+    - 1
 --- !u!212 &212897857411883538
 SpriteRenderer:
   m_ObjectHideFlags: 1

diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity
@@ -149,7 +149,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 143
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -263,7 +263,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 198
+      value: 83
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -377,7 +377,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 198
+      value: 83
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -491,7 +491,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 143
+      value: -27
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -633,6 +633,10 @@ Prefab:
       propertyPath: m_Name
       value: Herb
       objectReference: {fileID: 0}
+    - target: {fileID: 1985862277652182, guid: 3c03959f8a02e5640a90acf6b711af07, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3c03959f8a02e5640a90acf6b711af07, type: 2}
   m_IsPrefabParent: 0
@@ -651,7 +655,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 143
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -805,7 +809,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 33
+      value: -82
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -919,7 +923,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 88
+      value: -82
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -1143,7 +1147,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 290345893}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 331, y: 309.5, z: 0}
+  m_LocalPosition: {x: 331.5, y: 309.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 723556816}
@@ -1170,7 +1174,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: -379
+      value: 83
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -1658,7 +1662,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 143
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -1772,7 +1776,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 33
+      value: -82
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -1908,7 +1912,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: -560.5
+      value: 83
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -2039,11 +2043,6 @@ Prefab:
   m_Modification:
     m_TransformParent: {fileID: 275144410}
     m_Modifications:
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.size
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 4794889881020756, guid: 3c03959f8a02e5640a90acf6b711af07, type: 2}
       propertyPath: m_LocalPosition.x
       value: 2.5
@@ -2076,66 +2075,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[0].name
-      value: Healing
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[1].name
-      value: Healing
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[2].name
-      value: Healing
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[0].minConc
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[0].maxConc
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[0].bestConc
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[1].minConc
-      value: 9.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[1].maxConc
-      value: 50.12
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[1].bestConc
-      value: 27.96
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[2].maxConc
-      value: 50.12
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[2].bestConc
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 114910374100124286, guid: 3c03959f8a02e5640a90acf6b711af07,
-        type: 2}
-      propertyPath: effectList.Array.data[2].minConc
-      value: 9.8
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3c03959f8a02e5640a90acf6b711af07, type: 2}
   m_IsPrefabParent: 0
@@ -2445,7 +2384,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 88
+      value: -27
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -2559,7 +2498,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 143
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -2735,7 +2674,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 198
+      value: 83
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -2849,7 +2788,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 88
+      value: -27
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -2963,7 +2902,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 88
+      value: -27
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -3077,7 +3016,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 33
+      value: -82
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -3202,7 +3141,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 33
+      value: -82
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -3338,7 +3277,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 143
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -3452,7 +3391,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 198
+      value: 83
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -3729,7 +3668,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 198
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -3930,7 +3869,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 33
+      value: -82
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -4191,6 +4130,10 @@ Prefab:
       propertyPath: m_Name
       value: Herb
       objectReference: {fileID: 0}
+    - target: {fileID: 1985862277652182, guid: 3c03959f8a02e5640a90acf6b711af07, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3c03959f8a02e5640a90acf6b711af07, type: 2}
   m_IsPrefabParent: 0
@@ -4283,7 +4226,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 88
+      value: -27
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
@@ -4495,7 +4438,7 @@ Prefab:
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}
       propertyPath: m_LocalPosition.y
-      value: 88
+      value: -27
       objectReference: {fileID: 0}
     - target: {fileID: 224416919538803124, guid: 82a05ff82407a7049a08ca1e690aa3fe,
         type: 2}