Merge branch 'main' of https://github.com/gghteam/ServerDevelopmentLaborUnity into main

Author: paul050210

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

@@ -1,8 +1,14 @@
+// ¹Ú»óºó °³¹ß
+
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class Archer : CharactorBase
 {
-   
+    public override void OnSkillHit(SkillEnum skillEnum)
+    {
+        base.OnSkillHit(skillEnum);
+        TakeDamage(LastHitSkill.damage);
+    }
 }

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

@@ -1,3 +1,5 @@
+// ¹Ú»óºó °³¹ß
+
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

MaybeBossRaid/Jemmun/Assets/01_Script/Charactor/Archer/ArrowMove.cs.meta

@@ -1,9 +1,14 @@
+// À̼ºÇö °³¹ß
+
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class Cleric : CharactorBase
 {
-
-
+    public override void OnSkillHit(SkillEnum skillEnum)
+    {
+        base.OnSkillHit(skillEnum);
+        TakeDamage(LastHitSkill.damage);
+    }
 }

MaybeBossRaid/Jemmun/Assets/01_Script/Charactor/Cleric/Cleric.cs

@@ -1,8 +1,14 @@
+// À¯¿ø¼® °³¹ß
+
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class MagePlayer : CharactorBase
 {
-    
+    public override void OnSkillHit(SkillEnum skillEnum)
+    {
+        base.OnSkillHit(skillEnum);
+        TakeDamage(LastHitSkill.damage);
+    }
 }

MaybeBossRaid/Jemmun/Assets/01_Script/Charactor/MagePlayer.cs

@@ -1,24 +1,14 @@
+// õ½ÂÇö °³¹ß
+
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class WarriorPlayer : CharactorBase
 {
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
-    public void OnDamage(int damage)
+    public override void OnSkillHit(SkillEnum skillEnum)
     {
-        hp -= damage;
-        Debug.Log($"Hit, hp: {hp}, damage: {damage}");
+        base.OnSkillHit(skillEnum);
+        TakeDamage(LastHitSkill.damage);
     }
 }

MaybeBossRaid/Jemmun/Assets/01_Script/Charactor/WarriorPlayer.cs

@@ -1,3 +1,5 @@
+// ÀÓÅÂÈÆ °³¹ß
+
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

MaybeBossRaid/Jemmun/Assets/01_Script/Charactor/Wizard/Wizard.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameStartHandler : MonoBehaviour, IBufHandler
+{
+    bool bStarted = false;
+
+    public void HandleBuffer(string payload)
+    {
+        bStarted = true;
+    }
+
+    private void FixedUpdate()
+    {
+        if (bStarted)
+        {
+            UnityEngine.SceneManagement.SceneManager.LoadScene("Battle");
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MatchMakingHandler : MonoBehaviour, IBufHandler
+{
+    public void HandleBuffer(string payload)
+    {
+        MatchMakingVO vo = JsonUtility.FromJson<MatchMakingVO>(payload);
+
+        MatchMakingManager.SetMatchMakingStatus(vo.players, vo.start);
+    }
+}