슬프게도 배틀 관련을 끝내지 못햇스빈다.

Author: notdevblue

MaybeBossRaid/Jemmun/Assets/01_Script/Charactor/Archer/ArcherSkill.cs

@@ -21,8 +21,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "속사", SkillA);
+        SetButton(1, "강사", SkillB);
 
     }
 

MaybeBossRaid/Jemmun/Assets/01_Script/Handler/BattleStartHandler.cs

@@ -15,6 +15,7 @@ private void FixedUpdate()
     {
         if (signaled)
         {
+            signaled = false;
             UnityEngine.SceneManagement.SceneManager.LoadScene("Battle");
         }
     }

MaybeBossRaid/Jemmun/Assets/01_Script/Handler/GameStartHandler.cs

@@ -16,7 +16,7 @@ private void FixedUpdate()
         if (bStarted)
         {
             bStarted = false;
-            UnityEngine.SceneManagement.SceneManager.LoadScene("Battle");
+            UnityEngine.SceneManagement.SceneManager.LoadScene("BattlePrepare");
         }
     }
 }

MaybeBossRaid/Jemmun/Assets/01_Script/Manager/TurnManager.cs

@@ -4,6 +4,8 @@
 
 public class TurnManager : MonoBehaviour
 {
+    [SerializeField] private Transform trmTurnIndicator = null;
+
     // Singleton?
     public static TurnManager instance;
 
@@ -19,17 +21,21 @@ public class TurnManager : MonoBehaviour
 
     private void Awake()
     {
+        NullChecker.CheckNULL(trmTurnIndicator, true);
+
         // 사실 체크를 하나 해 줘야 하는데 귀찮았스빈다.
         instance = this;
 
-        SocketClient.Send(JsonUtility.ToJson(new DataVO("gamestart", "null")));
-
         turn = 0;
     }
 
     private void Start()
     {
+        SocketClient.Send(JsonUtility.ToJson(new DataVO("gamestart", "")));
+
         playerList = UserManager.GetAllPlayerBase();
+        SetTurnStatus(); // 처음에 설정해줘야죠...
+        SetTurnIndicatorLocation();
     }
 
 
@@ -59,6 +65,8 @@ public void AddMidTask(TurnTask task)
     public void EndTurn()
     {
         ++turn;
+        SetTurnStatus();
+        SetTurnIndicatorLocation();
         DoTurnEndTasks();
     }
 
@@ -98,6 +106,23 @@ private void DoMidTurnTasks()
     // 캐릭터들의 턴 상태를 설정함
     private void SetTurnStatus()
     {
-        // 턴
+        for (int i = 0; i < playerList.Count; ++i)
+        {
+            playerList[i].isTurn = false;
+        }
+
+        playerList[playerList.Count == 0 ? 0 : turn % playerList.Count].isTurn = true;
+    }
+
+
+
+    // 턴 인디케이터 움직임
+    private void SetTurnIndicatorLocation()
+    {
+        Vector2 targetPos = playerList[turn % playerList.Count].gameObject.transform.position;
+        targetPos.y += 2.5f;
+
+        trmTurnIndicator.position = targetPos;
     }
+
 }

MaybeBossRaid/Jemmun/Assets/01_Script/Manager/UserManager.cs

@@ -19,10 +19,6 @@ public partial class UserManager : MonoBehaviour
     private void Awake()
     {
         instance = this;
-    }
-
-    private void Start()
-    {
         InitData();
     }
 
@@ -49,9 +45,20 @@ private void InitData()
     /// <param name="vo">PlayerDataVO</param>
     static public void InitPlayerData(PlayerDataVO vo)
     {
-        instance.players[instance.playerIndex].hp = vo.hp;
-        instance.players[instance.playerIndex].mp = vo.mp;
-        instance.players[instance.playerIndex].id = vo.id;
+        int targetIdx = -1;
+
+        for (int i = 0; i < instance.players.Count; ++i)
+        {
+            if (instance.players[i].job == vo.job)
+            {
+                targetIdx = i;
+                break;
+            }
+        }
+
+        instance.players[targetIdx].hp = vo.hp;
+        instance.players[targetIdx].mp = vo.mp;
+        instance.players[targetIdx].id = vo.id;
     }
     #endregion
 
@@ -91,7 +98,7 @@ public partial class UserManager : MonoBehaviour
     public object lockObj = new object();
 
     // 만약 공격당한경우 true 가 되는 변수에요.
-    public bool attacked = false;
+    [HideInInspector] public bool attacked = false;
 
     public Queue<AttackVO> atkQueue = new Queue<AttackVO>();
 

MaybeBossRaid/Jemmun/Assets/01_Script/Skills/ArcherSkills.cs

@@ -31,8 +31,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "속사", SkillA);
+        SetButton(1, "강사", SkillB);
 
     }
 

MaybeBossRaid/Jemmun/Assets/01_Script/Skills/ClericSkill.cs

@@ -24,8 +24,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "힐", SkillA);
+        SetButton(1, "강화", SkillB);
     }
 
     private void Start()

MaybeBossRaid/Jemmun/Assets/01_Script/Skills/MageSkills.cs

@@ -24,8 +24,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "폭렬 마법", SkillA);
+        SetButton(1, "마법 연습", SkillB);
     }
 
     private void Start()

MaybeBossRaid/Jemmun/Assets/01_Script/Skills/WarriorSkills.cs

@@ -30,8 +30,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "휘두르기",  SkillA);
+        SetButton(1, "용기의 함성", SkillB);
     }
 
     private void Start()

MaybeBossRaid/Jemmun/Assets/01_Script/Skills/WizardSkills.cs

@@ -32,8 +32,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "파이어볼", SkillA);
+        SetButton(1, "비전", SkillB);
     }
 
     private void Start()

MaybeBossRaid/Jemmun/Assets/01_Script/VO/PlayerDataVO.cs

@@ -1,16 +1,19 @@
 using System;
+using System.Collections.Generic;
 
 [Serializable]
 public class PlayerDataVO
 {
     public int hp;
     public int mp;
     public int id;
+    public JobList job;
 
-    public PlayerDataVO(int id, int hp, int mp)
+    public PlayerDataVO(int id, int hp, int mp, JobList job)
     {
         this.hp = hp;
         this.mp = mp;
         this.id = id;
+        this.job = job;
     }
-}
+}

MaybeBossRaid/Jemmun/Assets/01_Script/_Base/Player/CharactorBase.cs

@@ -8,6 +8,9 @@ abstract public partial class CharactorBase : MonoBehaviour
     public int mp  = 100;
     public int pos = 0; // 뭐 하는 변수인지는 이번 동아리 시간에 설명 해 드리겠슴
     public int id;
+
+    public JobList job = JobList.JOB_END;
+    
     //protected string name; // 일단 주석처리 해 두겟스빈다.
 
     // 스텟

MaybeBossRaid/Jemmun/Assets/01_Script/_Base/Skill/Skills.cs

@@ -6,10 +6,20 @@ abstract public class Skills : SkillBase
 {
     [Header("스킬 시전 버튼들")]
     [SerializeField] protected UnityEngine.UI.Button[] btnSkills = new UnityEngine.UI.Button[2];
+                     protected UnityEngine.UI.Text[] txtBtnSkill = new UnityEngine.UI.Text[2];
 
     protected override void Awake()
     {
         base.Awake();
+
+        if (charactor.isRemote) return;
+
+        // 버튼 텍스트 가져옴
+        for (int i = 0; i < btnSkills.Length; ++i)
+        {
+            txtBtnSkill[i] = btnSkills[i].transform.GetChild(0).GetComponent<UnityEngine.UI.Text>();
+        }
+
     }
 
     /// <summary>
@@ -19,7 +29,9 @@ protected override void Awake()
     /// <param name="skillEnum">스킬의 Enum</param>
     public void Skill(SkillEnum skillEnum)
     {
-        
+        // 자신의 턴이 아니면 실행하지 않음
+        if (!charactor.isTurn) return;
+
         CharactorBase damage = selectedTarget.GetComponent<CharactorBase>();
         if (damage == null) return;
         SkillData skillData = SkillManager.instance.GetSkillData(skillEnum);
@@ -33,15 +45,18 @@ public void Skill(SkillEnum skillEnum)
         DataVO vo = new DataVO("attack", JsonUtility.ToJson(new AttackVO((int)(damage.id * charactor.atk), skillEnum)));
 
         SocketClient.Send(JsonUtility.ToJson(vo));
+
+        TurnManager.instance.EndTurn();
     }
 
     /// <summary>
     /// 버튼에 스킬을 묶어주는 함수
     /// </summary>
     /// <param name="btnIndex">버튼의 인덱스. 0 ~ 1</param>
     /// <param name="function">버튼을 눌렀을 때 실행할 함수</param>
-    protected void SetButton(int btnIndex, UnityEngine.Events.UnityAction function)
+    protected void SetButton(int btnIndex, string skillName, UnityEngine.Events.UnityAction function)
     {
         btnSkills[btnIndex].onClick.AddListener(function);
+        txtBtnSkill[btnIndex].text = skillName;
     }
 }

MaybeBossRaid/Jemmun/Assets/01_Script/_Base/_Example/ExampleSkill.cs

@@ -22,8 +22,8 @@ sealed protected override void Awake()
 
         if (charactor.isRemote) return;
 
-        SetButton(0, SkillA);
-        SetButton(1, SkillB);
+        SetButton(0, "매우 강력한 공격", SkillA);
+        SetButton(1, "매우 강력한 힐링", SkillB);
     }
 
     private void Start()