From 3108389742dcd50b3ef968d4c7a8d28c73a641a2 Mon Sep 17 00:00:00 2001 From: woojin211 Date: Thu, 30 May 2024 20:41:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=BB=A8=EB=B2=A4=EC=85=98?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=5F4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 코드컨벤션적용_4 --- Assets/2Scripts/Lobby/LobbyManager.cs | 7 +++++-- Assets/2Scripts/NetworkManager.cs | 6 ++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/2Scripts/Lobby/LobbyManager.cs b/Assets/2Scripts/Lobby/LobbyManager.cs index 0c595fdca4..434660a789 100644 --- a/Assets/2Scripts/Lobby/LobbyManager.cs +++ b/Assets/2Scripts/Lobby/LobbyManager.cs @@ -369,9 +369,12 @@ public void SetRoomList(List roomInfos) aiCount++; // 방 리스트에서 방 찾아서 활성화 - if ((bool)properties["isTeamMode"] == true) { + if ((bool)properties["isTeamMode"] == true) + { roomList[roomInfos.IndexOf(room)].transform.GetChild(0).GetComponent().color = new Color(.8f, .4f, .8f); - } else { + } + else + { roomList[roomInfos.IndexOf(room)].transform.GetChild(0).GetComponent().color = new Color(.7f, .7f, .7f); } roomList[roomInfos.IndexOf(room)].Active(room.Name, room.PlayerCount + aiCount); diff --git a/Assets/2Scripts/NetworkManager.cs b/Assets/2Scripts/NetworkManager.cs index 1191b02974..50bcbb2f38 100644 --- a/Assets/2Scripts/NetworkManager.cs +++ b/Assets/2Scripts/NetworkManager.cs @@ -200,7 +200,8 @@ public void CreateRoom(string roomName) var roomOptions = new RoomOptions { CustomRoomPropertiesForLobby = new[] {IsStarted, IsTeamMode, "GameMode", Slot0, Slot1, Slot2, Slot3, Slot4, Slot5, Slot6, Slot7, "team"+Slot1, "team"+Slot2, "team"+Slot3, "team"+Slot4, "team"+Slot5, "team"+Slot6, "team"+Slot7,"name"+Slot1, "name"+Slot2, "name"+Slot3, "name"+Slot4, "name"+Slot5, "name"+Slot6, "name"+Slot7}, - CustomRoomProperties = new Hashtable { + CustomRoomProperties = new Hashtable + { {IsStarted, false}, {IsTeamMode, LobbyManager.IT.isTeamMode}, {"GameMode", 1}, {Slot0, 1}, {Slot1, -1}, {Slot2, -1}, {Slot3, -1}, {Slot4, -1}, {Slot5, -1}, {Slot6, -1}, {Slot7, -1}, {"team"+Slot0, LobbyManager.IT.roomPlayerSlots[0].teamNumber}, {"team"+Slot1, 0}, {"team"+Slot2, 0}, {"team"+Slot3, 0}, {"team"+Slot4, 0}, {"team"+Slot5, 0}, {"team"+Slot6, 0}, {"team"+Slot7, 0}, @@ -329,7 +330,6 @@ public void SetSlotToAI(int slotNumber) var slot = LobbyManager.IT.roomPlayerSlots[slotNumber]; LobbyManager.IT.SetSlotAI(slotNumber); // 슬롯 // slot.actorNumber = 99; // AI 번호인 99로 설정 - if (LobbyManager.IT.isTeamMode == true) SetSlotPp(slot.slotName, 99, "AI_"+slotNumber, 1); // 슬롯 설정 @@ -362,8 +362,6 @@ public void SetChangeTeam() { var slot = LobbyManager.IT.roomPlayerSlots.Find(a => a.actorNumber == player.ActorNumber); // 슬롯 var cProperties = PhotonNetwork.CurrentRoom.CustomProperties; - // Debug.Log(player); - // Debug.Log(slot); // Debug.Log(LobbyManager.IT.roomPlayerSlots[0].actorNumber); Debug.Log("Change Team To " + (int)cProperties["team"+slot.slotName] + ", Slot: " + slot.slotName); if ((int)cProperties["team"+slot.slotName] == 1)