summaryrefslogtreecommitdiff
path: root/Assets/Scripts/Test 1
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scripts/Test 1')
-rw-r--r--Assets/Scripts/Test 1/TestCamera.cs5
-rw-r--r--Assets/Scripts/Test 1/TestErika.cs2
2 files changed, 4 insertions, 3 deletions
diff --git a/Assets/Scripts/Test 1/TestCamera.cs b/Assets/Scripts/Test 1/TestCamera.cs
index 62b3a2d9..8e4ba89e 100644
--- a/Assets/Scripts/Test 1/TestCamera.cs
+++ b/Assets/Scripts/Test 1/TestCamera.cs
@@ -6,10 +6,9 @@ public class TestCamera : MonoBehaviour
{
public Vector3 offset = Vector3.zero;
- // Start is called before the first frame update
- void Start()
+ void Awake()
{
-
+ SceneManager.Instance.SetMainCamera(this.gameObject.GetComponent<Camera>());
}
// Update is called once per frame
diff --git a/Assets/Scripts/Test 1/TestErika.cs b/Assets/Scripts/Test 1/TestErika.cs
index 90ac0499..9f889934 100644
--- a/Assets/Scripts/Test 1/TestErika.cs
+++ b/Assets/Scripts/Test 1/TestErika.cs
@@ -30,12 +30,14 @@ public class TestErika : SingletonMB<TestErika>
{
public UnitSetUp erika;
public UnitSetUp monster;
+ public GameObject unitEffect;
protected override void Awake()
{
base.Awake();
SetupErika();
SetupMonster();
+ UnitEffect.effectPlane = unitEffect;
}
private void Update()