Ending game update (Testable. Maybe.)

ISEKAI/Assets/ISEKAI_VIEW/EventManager.cs

@@ -141,8 +141,6 @@ public class EventManager : MonoBehaviour
             }
         }
                 
-
-
         //for full script
         if(c.commandNumber != 0) //if not explanation
         {
@@ -150,30 +148,6 @@ public class EventManager : MonoBehaviour
             _scriptLength = 4;
         }
 
-        if(c.choiceDependency == (-1, -1))
-        {
-            //아무것도 안-함
-        }
-        else if(c.choiceDependency.Item1 == -1)     //choice dependency is (-1, n)
-        {
-            string currentEvent;
-            currentEvent = GameManager.instance.currentEvent.eventName;
-
-            List<(int, int)> choiceHistory = GameManager.instance.game.choiceHistories[currentEvent];
-
-            int choiceBranch;
-            choiceBranch = choiceHistory[choiceHistory.Count - 1].Item2;
-
-            if (c.choiceDependency.Item2 != choiceBranch)
-            {
-                return;
-            }
-        }
-        else
-        {
-            
-        }
-
         switch (c.commandNumber)
         {
             case 0:

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/EndingGameManager.cs

@@ -35,9 +35,11 @@ public class EndingGameManager : MonoBehaviour
         
         InitGameInfo();
         UpdatePanel();
-        StartCoroutine(StartMakingUnits());
+        TurnOnAndOffNextWaveButton();
     }
 
+    public bool isInWave = false;
+
     public Transform unitPrefab;
 
     public static EndingGameManager instance;
@@ -48,7 +50,7 @@ public class EndingGameManager : MonoBehaviour
     public List<Queue<string>> waves = new List<Queue<string>>();
 
     public Image[] productionQueueImage;
-
+    public Button nextWave;
     public int riflemanCount = 3;
     public int currentWaveNumber = 0;
 
@@ -59,6 +61,9 @@ public class EndingGameManager : MonoBehaviour
 
     public Button meleeButton, archerButton, riflemanButton, knightButton;
     public string meleeUnit, archerUnit, rifleUnit, knightUnit = "기사";
+
+    private EndingGameUnit _justMadeAllyUnit = null, _justMadeEnemyUnit = null;
+
     public void UpdatePanel()
     {
         food.text = "음식: " + game.town.remainFoodAmount;
@@ -130,14 +135,47 @@ public class EndingGameManager : MonoBehaviour
         waves.Add(wave1);
         waves.Add(wave2);
     }
+
     public void MakeAllyUnit(string unitName)
     {
         var unitObject = Instantiate(unitPrefab.GetChild(_GetUnitNumber(unitName)), new Vector3(AllyStartPosition, -4f, 0), Quaternion.identity);
         unitObject.GetComponent<EndingGameUnit>().endingGame = this;
+        unitObject.GetComponent<EndingGameUnit>().frontUnit = _justMadeAllyUnit;
         unitObject.gameObject.SetActive(true);
         unitObject.GetChild(0).GetComponent<TextMesh>().text = "HP: " + unitObject.GetComponent<EndingGameUnit>().hp;
         deployedAllyUnits.Enqueue(unitObject.gameObject);
+        _justMadeAllyUnit = unitObject.GetComponent<EndingGameUnit>();
+    }
+
+    public void MakeEnemyUnit(string unitName)
+    {
+        var unitObject = Instantiate(unitPrefab.GetChild(_GetUnitNumber(unitName)), new Vector3(EnemyStartPosition, -4f, 0), Quaternion.identity);
+        unitObject.GetComponent<EndingGameUnit>().endingGame = this;
+        unitObject.GetComponent<EndingGameUnit>().frontUnit = _justMadeEnemyUnit;
+        unitObject.gameObject.SetActive(true);
+        unitObject.GetChild(0).GetComponent<TextMesh>().text = "HP: " + unitObject.GetComponent<EndingGameUnit>().hp;
+        deployedEnemyUnits.Enqueue(unitObject.gameObject);
+        _justMadeEnemyUnit = unitObject.GetComponent<EndingGameUnit>();
+    }
+
+    public void ProceedWave()
+    {
+        isInWave = true;
+        TurnOnAndOffNextWaveButton();
+        StartCoroutine(_StartWave());
+        StartCoroutine(StartMakingUnits());
+    }
+
+    private IEnumerator _StartWave()
+    {
+        foreach (string unitName in waves[currentWaveNumber])
+        {
+            MakeEnemyUnit(unitName);
+            yield return new WaitForSeconds(1f);
+        }
+        currentWaveNumber++;
     }
+
     private bool _IsUnitProducible(string unitName)
     {
         switch (unitName)
@@ -354,4 +392,22 @@ public class EndingGameManager : MonoBehaviour
         }
         progressBar.value = progressBar.minValue;
     }
+
+    public void TurnOnAndOffNextWaveButton()
+    {
+        nextWave.interactable = !isInWave;
+        meleeButton.interactable = isInWave;
+        archerButton.interactable = isInWave;
+        riflemanButton.interactable = isInWave;
+        knightButton.interactable = isInWave;
+    }
+
+    public void CleanUpAllyUnits()
+    {
+        foreach (GameObject e in deployedAllyUnits)
+            Destroy(e);
+        while (deployedAllyUnits.Count == 0)
+            deployedEnemyUnits.Dequeue();
+        StopCoroutine(StartMakingUnits());
+    }
 }

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/EndingGameUnit.cs

@@ -9,13 +9,24 @@ public abstract class EndingGameUnit : MonoBehaviour
     public abstract int unitNumber { get; }
     public abstract string unitName { get; }
     public int hp;
-    public abstract int attackPower { get; }
+    public int attackPower;
     public abstract int attackSpeed { get; }
     public abstract int attackRange { get; }
     public const int speed = 2;
     public bool isInBattleState = false;
     public abstract bool isAllyUnit { get; }
 
+    public virtual float unitSize => 2;
+
+    public bool isTooCloseFrontUnit { get
+        {
+            if (frontUnit == null)
+                return false;
+            else
+                return (Mathf.Abs(frontUnit.transform.position.x - transform.position.x) <= (unitSize + frontUnit.unitSize) / 2);
+        }
+    }
+
     public EndingGameUnit frontUnit;
     public EndingGameManager endingGame;
     public EndingGameUnit attackTarget { get
@@ -47,8 +58,15 @@ public abstract class EndingGameUnit : MonoBehaviour
             CancelInvoke("Attack");
         }
 
-        if (!isInBattleState)
-            transform.Translate(speed * Time.deltaTime, 0, 0);
+        int moveSpeed;
+
+        if (isAllyUnit)
+            moveSpeed = speed;
+        else
+            moveSpeed = -speed;
+
+        if (!isInBattleState && !isTooCloseFrontUnit)
+            transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
     }
 
     public void Attack()
@@ -60,48 +78,21 @@ public abstract class EndingGameUnit : MonoBehaviour
         attackTarget.transform.GetChild(0).GetComponent<TextMesh>().text = "HP: " + attackTarget.hp;
         if (attackTarget.hp <= 0)
         {
+            Destroy(attackTarget.gameObject);
             if (isAllyUnit)
-                endingGame.deployedEnemyUnits.Dequeue();
-            else
-                endingGame.deployedAllyUnits.Dequeue();
-
-            Destroy(attackTarget);
-        }
-    }
-
-    /*public void TryEnterBattleState()
             {
-        isInBattleState = true;
-        if (attackTarget == null)
+                endingGame.deployedEnemyUnits.Dequeue();
+                if (EndingGameManager.instance.isInWave && endingGame.deployedEnemyUnits.Count == 0)
                 {
-            isInBattleState = false;
-            return;
-        }
-        StartCoroutine(StartBattle());
+                    EndingGameManager.instance.isInWave = false;
+                    EndingGameManager.instance.TurnOnAndOffNextWaveButton();
+                    EndingGameManager.instance.CleanUpAllyUnits();
                 }
                     
-    public virtual IEnumerator StartBattle()
-    {
-        while(attackTarget != null)
-        {
-            attackTarget.hp -= attackPower;
-            if (attackTarget.hp <= 0)
-            {
-                if (isAllyUnit)
-                    endingGame.deployedEnemyUnits.Dequeue();
+            }
             else
                 endingGame.deployedAllyUnits.Dequeue();
-
-                Destroy(attackTarget.gameObject);
-                ExitBattleState();
-                yield break;
-            }
-            yield return new WaitForSeconds(attackSpeed);
         }
     }
 
-    public void ExitBattleState()
-    {
-        isInBattleState = false;
-    }*/
 }

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Archer.cs

@@ -5,7 +5,6 @@ public class Archer : EndingGameUnit
 {
     public override int unitNumber => 3;
     public override string unitName { get { return "궁병"; } }
-    public override int attackPower { get { return 6; } }
     public override int attackSpeed { get { return 1; } }
     public override int attackRange { get { return 20; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Crossbowman.cs

@@ -5,7 +5,6 @@ public class Crossbowman : EndingGameUnit
 {
     public override int unitNumber => 4;
     public override string unitName { get { return "석궁병"; } }
-    public override int attackPower { get { return 10; } }
     public override int attackSpeed { get { return 3; } }
     public override int attackRange { get { return 5; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Farmer.cs

@@ -7,7 +7,6 @@ public class Farmer : EndingGameUnit
 {
     public override int unitNumber => 0;
     public override string unitName { get { return "농민"; } }
-    public override int attackPower { get { return 5; } }
     public override int attackSpeed { get { return 2; } }
     public override int attackRange { get { return 1; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/IronCrossbowman.cs

@@ -5,7 +5,6 @@ public class IronCrossbowman : EndingGameUnit
 {
     public override int unitNumber => 5;
     public override string unitName { get { return "석궁병(철)"; } }
-    public override int attackPower { get { return 20; } }
     public override int attackSpeed { get { return 4; } }
     public override int attackRange { get { return 15; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/IronRifleman.cs

@@ -7,7 +7,6 @@ public class IronRifleman : EndingGameUnit
 {
     public override int unitNumber => 7;
     public override string unitName { get { return "소총병(철)"; } }
-    public override int attackPower { get { return 20; } }
     public override int attackSpeed { get { return 3; } }
     public override int attackRange { get { return 20; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Knight.cs

@@ -7,9 +7,9 @@ public class Knight : EndingGameUnit
 {
     public override int unitNumber => 8;
     public override string unitName { get { return "기사"; } }
-    public override int attackPower { get { return 25; } }
     public override int attackSpeed { get { return 2; } }
     public override int attackRange { get { return 1; } }
     public override bool isAllyUnit => true;
+    public override float unitSize => 6;
 
 }

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/NKLieutenant.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Linq;
+
+public class NKLieutenant : EndingGameUnit
+{
+    public override int unitNumber => 10;
+    public override string unitName { get { return "북한 장교"; } }
+    public override int attackSpeed { get { return 2; } }
+    public override int attackRange { get { return 10; } }
+    public override bool isAllyUnit => false;
+
+    private void Start()
+    {
+        foreach(GameObject unit in endingGame.deployedEnemyUnits)
+        {
+            if (unit.GetComponent<EndingGameUnit>().unitNumber == 10)
+                return;
+
+            unit.GetComponent<EndingGameUnit>().attackPower *= 2;
+        }
+    }
+
+}

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/NKLieutenant.cs.meta

+fileFormatVersion: 2
+guid: a13c82786fad785418474bbe47cd4fc3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/NKSoldier.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Linq;
+public class NKSoldier : EndingGameUnit
+{
+    public override int unitNumber => 9;
+    public override string unitName { get { return "북한 군인"; } }
+    public override int attackSpeed { get { return 2; } }
+    public override int attackRange { get { return 10; } }
+    public override bool isAllyUnit => false;
+
+    public override void Update()
+    {
+        if (attackTarget != null && !isInBattleState)
+        {
+            InvokeRepeating("Attack", 0.5f, attackSpeed);
+            isInBattleState = true;
+        }
+
+        if (attackTarget == null)
+        {
+            isInBattleState = false;
+            CancelInvoke("Attack");
+        }
+
+        int moveSpeed;
+
+        if (isAllyUnit)
+            moveSpeed = speed;
+        else
+            moveSpeed = -speed;
+
+        if (!isInBattleState && !isTooCloseFrontUnit)
+            transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
+
+        if (endingGame.deployedAllyUnits.Count > 0)
+            if (endingGame.deployedAllyUnits.Peek().GetComponent<EndingGameUnit>().unitNumber == 8 
+                && !endingGame.deployedEnemyUnits.Any(u => u.GetComponent<EndingGameUnit>().unitNumber == 10))
+            {
+                endingGame.deployedEnemyUnits.Dequeue();
+                Destroy(gameObject);
+            }
+    }
+}

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/NKSoldier.cs.meta

+fileFormatVersion: 2
+guid: 5a59ea19886295d4fb7e66cb59077708
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Pikeman.cs

@@ -7,7 +7,6 @@ public class Pikeman : EndingGameUnit
 {
     public override int unitNumber => 2;
     public override string unitName { get { return "파이크병"; } }
-    public override int attackPower { get { return 25; } }
     public override int attackSpeed { get { return 2; } }
     public override int attackRange { get { return 1; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Rifleman.cs

@@ -7,7 +7,6 @@ public class Rifleman : EndingGameUnit
 {
     public override int unitNumber => 6;
     public override string unitName { get { return "소총병"; } }
-    public override int attackPower { get { return 20; } }
     public override int attackSpeed { get { return 3; } }
     public override int attackRange { get { return 20; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Spearman.cs

@@ -5,7 +5,6 @@ public class Spearman : EndingGameUnit
 {
     public override int unitNumber => 1;
     public override string unitName { get { return "창병"; } }
-    public override int attackPower { get { return 10; } }
     public override int attackSpeed { get { return 2; } }
     public override int attackRange { get { return 1; } }
     public override bool isAllyUnit => true;

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Tank.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Linq;
+
+public class Tank : EndingGameUnit
+{
+    public override int unitNumber => 11;
+    public override string unitName { get { return "T-34 탱크"; } }
+    public override int attackSpeed { get { return 5; } }
+    public override int attackRange { get { return 20; } }
+    public override bool isAllyUnit => false;
+    public override float unitSize => 6;
+
+
+    /*
+    public override void Update()
+    {
+        if (attackTarget != null && !isInBattleState)
+        {
+            InvokeRepeating("Attack", 0.5f, attackSpeed);
+            isInBattleState = true;
+        }
+
+        if (attackTarget == null)
+        {
+            isInBattleState = false;
+            CancelInvoke("Attack");
+        }
+
+        int moveSpeed;
+
+        if (isAllyUnit)
+            moveSpeed = speed;
+        else
+            moveSpeed = -speed;
+
+        if (!isInBattleState && !isTooCloseFrontUnit)
+            transform.Translate(moveSpeed * Time.deltaTime, 0, 0);
+    }
+    */
+}

ISEKAI/Assets/ISEKAI_VIEW/Minigames/EndingGame/Units/Tank.cs.meta

+fileFormatVersion: 2
+guid: a13c30bcf3822f8489c08b1fa651bd00
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ISEKAI/Assets/Resources/Sprites/EndingGame/Tank.png.meta

+fileFormatVersion: 2
+guid: 213c077947032494b8213b5b59617f72
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: e1802e255de3f5b4a8c42d6ce5462eb8
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ISEKAI/Assets/Scenes/EndingGameScene.unity

@@ -543,6 +543,135 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 217557719}
   m_CullTransparentMesh: 0
+--- !u!1 &247065145
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 247065146}
+  - component: {fileID: 247065149}
+  - component: {fileID: 247065148}
+  - component: {fileID: 247065147}
+  m_Layer: 5
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &247065146
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247065145}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1333193283}
+  m_Father: {fileID: 567504591}
+  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: 316.1, y: -174.1}
+  m_SizeDelta: {x: 126.42, y: 59.74}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &247065147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247065145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 247065148}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1822139048}
+        m_MethodName: ProceedWave
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &247065148
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247065145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!222 &247065149
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247065145}
+  m_CullTransparentMesh: 0
 --- !u!1 &300201339
 GameObject:
   m_ObjectHideFlags: 0
@@ -936,6 +1065,7 @@ RectTransform:
   - {fileID: 18214172}
   - {fileID: 330774154}
   - {fileID: 1078245493}
+  - {fileID: 247065146}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1600,6 +1730,85 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1333193282
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1333193283}
+  - component: {fileID: 1333193285}
+  - component: {fileID: 1333193284}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1333193283
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1333193282}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 247065146}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1333193284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1333193282}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 8018e05d598d37e4f8ac6aff9632ccd6, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 47
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Next wave
+--- !u!222 &1333193285
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1333193282}
+  m_CullTransparentMesh: 0
 --- !u!1 &1343998906
 GameObject:
   m_ObjectHideFlags: 0
@@ -2539,6 +2748,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   progressBar: {fileID: 1343998908}
+  isInWave: 0
   unitPrefab: {fileID: 2914501908961386575, guid: 87c1b8fbb9598274580c2adb668471f7,
     type: 3}
   productionQueueImage:
@@ -2547,6 +2757,7 @@ MonoBehaviour:
   - {fileID: 1840327841}
   - {fileID: 1383618688}
   - {fileID: 217557721}
+  nextWave: {fileID: 247065147}
   riflemanCount: 3
   currentWaveNumber: 0
   food: {fileID: 1686207435}

ISEKAI/Assets/Scenes/EventScene.unity

@@ -697,7 +697,7 @@ MonoBehaviour:
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
-    m_LineSpacing: 1
+    m_LineSpacing: 1.5
   m_Text: New Text
 --- !u!222 &902959467
 CanvasRenderer:
@@ -1010,7 +1010,7 @@ MonoBehaviour:
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
-    m_LineSpacing: 1
+    m_LineSpacing: 1.5
   m_Text: "\uAC00\uB098\uB2E4\uB77C\uB9C8\uBC14\uC0AC\uC544\uC790\uCC28\uCE74\uD0C0\uD30C\uD558\n\uB2E4\uB78C\uC950
     \uD5CC \uCCC7\uBC14\uD034 \uD0C0\uACE0 \uD30C"
 --- !u!222 &1126384284