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

Author: notdevblue

SDLU_Shooting_Server/Types/Type.js

@@ -21,6 +21,8 @@ class User {
         this.kill = kill;
         this.death = death;
         this.exp = exp;
+        /** @type {number} */
+        this.hp = 100;
 
         /** @type {GameUser} */
         this.gameUser = null;

SDLU_Shooting_Server/Utils/UserUtil.js

@@ -64,6 +64,9 @@ class UserUtil
         console.log("userNotFinded...: " + this.userArr[i]);
         return null;
     }
+    /** 
+     * @returns {User}
+     */
     getUserBySessionId(sessionId)
     {
         for (var i = 0; i < this.userArr.length; i++) {

SDLU_Shooting_Server/server.js

@@ -72,13 +72,18 @@ wsServer.on("connection", socket => {
                         broadcast(JSON.stringify(new DataVO(type, payload)));
                         break;
                     case "damage":
-                        console.log(`[${socket.sessionId}] ${type}: ${payload}`);
+                        console.log(`[${socket.sessionId}] ${type}: ${payload}` + ", HP: " + UserUtil.getUserBySessionId(id).hp);
+                        if (isNaN(UserUtil.getUserBySessionId(id).hp))
+                            UserUtil.getUserBySessionId(id).hp = 100;
                         var { id, damage } = payload;
-                        UserUtil.getUserBySessionId(id).hp -= damage;
+                        damage = Number(damage);
+                        UserUtil.getUserBySessionId(id).hp -= 20;
 
                         if (UserUtil.getUserBySessionId(id).hp <= 0)
                         {
+                            console.log("dead: " + id);
                             broadcast(JSON.stringify(new DataVO("dead", payload)));
+                            socket.disconnect();
                         }
                         else
                             broadcast(JSON.stringify(new DataVO(type, payload)));