summaryrefslogtreecommitdiff
path: root/Assets/Scripts
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts')
-rw-r--r--Assets/Scripts/Test 1/TestCamera.cs6
-rw-r--r--Assets/Scripts/Unit/AnimationData.cs2
2 files changed, 6 insertions, 2 deletions
diff --git a/Assets/Scripts/Test 1/TestCamera.cs b/Assets/Scripts/Test 1/TestCamera.cs
index 340a2eb5..62b3a2d9 100644
--- a/Assets/Scripts/Test 1/TestCamera.cs
+++ b/Assets/Scripts/Test 1/TestCamera.cs
@@ -20,8 +20,10 @@ public class TestCamera : MonoBehaviour
return;
}
Vector3 pos = transform.position;
- pos.x = TestErika.Instance.erika.unitController.GetComponent<UnitController>().center.x;
- pos.y = TestErika.Instance.erika.unitController.GetComponent<UnitController>().center.y;
+ //pos.x = TestErika.Instance.erika.unitController.GetComponent<UnitController>().center.x;
+ //pos.y = TestErika.Instance.erika.unitController.GetComponent<UnitController>().center.y;
+ pos.x = TestErika.Instance.erika.unitController.transform.position.x;
+ pos.y = TestErika.Instance.erika.unitController.transform.position.y;
transform.position = pos + offset;
}
}
diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs
index 213b652a..784acf05 100644
--- a/Assets/Scripts/Unit/AnimationData.cs
+++ b/Assets/Scripts/Unit/AnimationData.cs
@@ -185,6 +185,8 @@ public class AnimationData : ScriptableObject
public string animationName;
public string animationPath;
+ public string note;
+
public List<AnimationEventBase> animationEvents;
public List<ColliderData> hurtBoxes;