From 6b5f2bcec3474c0c0685a168bdd7b47e2c681570 Mon Sep 17 00:00:00 2001 From: dydwo0809 Date: Fri, 15 Mar 2024 16:12:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=BD=94=EB=94=A9=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 인코딩 utf-8로 변경 --- Assets/Abandoned_Asylum/Materials/Box_V2.mat | 16 +++-- .../Abandoned_Asylum/Materials/Cupboard.mat | 16 +++-- Assets/Abandoned_Asylum/Materials/Tank_V2.mat | 1 + .../Scripts/CameraMovement.cs | 2 +- Assets/PBRMeleeWeaponsPack/Scripts/Weapon.cs | 2 +- .../Scripts/WeaponsChanger.cs | 2 +- .../Demos/DemoChat/ChannelSelector.cs | 2 +- .../Demos/DemoChat/ChatAppIdCheckerUI.cs | 2 +- .../PhotonChat/Demos/DemoChat/ChatGui.cs | 2 +- .../Photon/PhotonLibs/WebSocket/WebSocket.cs | 2 +- Assets/Resources/Prefabs/Player.prefab | 3 + .../Demo/DemoAssets/V_SMC_Camera.cs | 2 +- .../Demo/DemoAssets/V_SMC_Handler.cs | 2 +- Assets/Scripts/Network/PhotonManager.cs | 66 +++++++++---------- 14 files changed, 70 insertions(+), 50 deletions(-) diff --git a/Assets/Abandoned_Asylum/Materials/Box_V2.mat b/Assets/Abandoned_Asylum/Materials/Box_V2.mat index c80a4db941..3e332e5a48 100644 --- a/Assets/Abandoned_Asylum/Materials/Box_V2.mat +++ b/Assets/Abandoned_Asylum/Materials/Box_V2.mat @@ -2,19 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Box_V2 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _METALLICGLOSSMAP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -54,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -74,3 +81,4 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Abandoned_Asylum/Materials/Cupboard.mat b/Assets/Abandoned_Asylum/Materials/Cupboard.mat index e3d3be84f0..824c7fcdd2 100644 --- a/Assets/Abandoned_Asylum/Materials/Cupboard.mat +++ b/Assets/Abandoned_Asylum/Materials/Cupboard.mat @@ -2,19 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Cupboard m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _METALLICGLOSSMAP _NORMALMAP + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _METALLICGLOSSMAP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -54,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -74,3 +81,4 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Abandoned_Asylum/Materials/Tank_V2.mat b/Assets/Abandoned_Asylum/Materials/Tank_V2.mat index b97a603ff7..688803834e 100644 --- a/Assets/Abandoned_Asylum/Materials/Tank_V2.mat +++ b/Assets/Abandoned_Asylum/Materials/Tank_V2.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _METALLICGLOSSMAP + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/PBRMeleeWeaponsPack/Scripts/CameraMovement.cs b/Assets/PBRMeleeWeaponsPack/Scripts/CameraMovement.cs index 4ee09fe8ba..27e934590f 100644 --- a/Assets/PBRMeleeWeaponsPack/Scripts/CameraMovement.cs +++ b/Assets/PBRMeleeWeaponsPack/Scripts/CameraMovement.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; namespace HQWeaponsPack { diff --git a/Assets/PBRMeleeWeaponsPack/Scripts/Weapon.cs b/Assets/PBRMeleeWeaponsPack/Scripts/Weapon.cs index 2c02dc1e6b..5db1f91787 100644 --- a/Assets/PBRMeleeWeaponsPack/Scripts/Weapon.cs +++ b/Assets/PBRMeleeWeaponsPack/Scripts/Weapon.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; public class Weapon : MonoBehaviour { diff --git a/Assets/PBRMeleeWeaponsPack/Scripts/WeaponsChanger.cs b/Assets/PBRMeleeWeaponsPack/Scripts/WeaponsChanger.cs index bef0d4fa03..8417937b13 100644 --- a/Assets/PBRMeleeWeaponsPack/Scripts/WeaponsChanger.cs +++ b/Assets/PBRMeleeWeaponsPack/Scripts/WeaponsChanger.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; using UnityEngine.UI; namespace HQWeaponsPack diff --git a/Assets/Photon/PhotonChat/Demos/DemoChat/ChannelSelector.cs b/Assets/Photon/PhotonChat/Demos/DemoChat/ChannelSelector.cs index 4bf9644a30..dfc962b747 100644 --- a/Assets/Photon/PhotonChat/Demos/DemoChat/ChannelSelector.cs +++ b/Assets/Photon/PhotonChat/Demos/DemoChat/ChannelSelector.cs @@ -1,4 +1,4 @@ -// -------------------------------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------------------------------- // // Demo code for Photon Chat in Unity. // developer@exitgames.com diff --git a/Assets/Photon/PhotonChat/Demos/DemoChat/ChatAppIdCheckerUI.cs b/Assets/Photon/PhotonChat/Demos/DemoChat/ChatAppIdCheckerUI.cs index 0bef6116c6..4b693f4f10 100644 --- a/Assets/Photon/PhotonChat/Demos/DemoChat/ChatAppIdCheckerUI.cs +++ b/Assets/Photon/PhotonChat/Demos/DemoChat/ChatAppIdCheckerUI.cs @@ -1,4 +1,4 @@ -// -------------------------------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------------------------------- // // Demo code for Photon Chat in Unity. // developer@exitgames.com diff --git a/Assets/Photon/PhotonChat/Demos/DemoChat/ChatGui.cs b/Assets/Photon/PhotonChat/Demos/DemoChat/ChatGui.cs index 6eb444c628..0168e4fd8f 100644 --- a/Assets/Photon/PhotonChat/Demos/DemoChat/ChatGui.cs +++ b/Assets/Photon/PhotonChat/Demos/DemoChat/ChatGui.cs @@ -1,4 +1,4 @@ -// -------------------------------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------------------------------- // // Demo code for Photon Chat in Unity. // developer@exitgames.com diff --git a/Assets/Photon/PhotonLibs/WebSocket/WebSocket.cs b/Assets/Photon/PhotonLibs/WebSocket/WebSocket.cs index e8a4febad9..d167b87394 100644 --- a/Assets/Photon/PhotonLibs/WebSocket/WebSocket.cs +++ b/Assets/Photon/PhotonLibs/WebSocket/WebSocket.cs @@ -1,4 +1,4 @@ -#if UNITY_WEBGL || WEBSOCKET || WEBSOCKET_PROXYCONFIG +#if UNITY_WEBGL || WEBSOCKET || WEBSOCKET_PROXYCONFIG // -------------------------------------------------------------------------------------------------------------------- // diff --git a/Assets/Resources/Prefabs/Player.prefab b/Assets/Resources/Prefabs/Player.prefab index ba5f7be96f..5400d0f18b 100644 --- a/Assets/Resources/Prefabs/Player.prefab +++ b/Assets/Resources/Prefabs/Player.prefab @@ -1289,6 +1289,8 @@ MonoBehaviour: runBackSpeed: 5 crouchSpeed: 2 crouchBackSpeed: 1 + crouchFastSpeed: 2 + crouchFastBackSpeed: 2 jumpPower: 100 groundYOffset: -0.43 groundMask: @@ -1298,6 +1300,7 @@ MonoBehaviour: gravity: -9.81 jumped: 0 anim: {fileID: 0} + tempLayer: 0 --- !u!143 &8536026664842187324 CharacterController: m_ObjectHideFlags: 0 diff --git a/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Camera.cs b/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Camera.cs index 41775ae2d2..8a569c415c 100644 --- a/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Camera.cs +++ b/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Camera.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; diff --git a/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Handler.cs b/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Handler.cs index da8782b7c5..2609bbaf0f 100644 --- a/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Handler.cs +++ b/Assets/SMC Pack 1/Demo/DemoAssets/V_SMC_Handler.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/Scripts/Network/PhotonManager.cs b/Assets/Scripts/Network/PhotonManager.cs index c007bb4dac..4cd60793a6 100644 --- a/Assets/Scripts/Network/PhotonManager.cs +++ b/Assets/Scripts/Network/PhotonManager.cs @@ -6,84 +6,84 @@ public class PhotonManager : MonoBehaviourPunCallbacks { - // + // 버전 private readonly string version = "1.0f"; - // ̵ + // 사용자 아이디 public string userID = "inputYourName"; void Awake() { - // 鿡 ڵ ε + // 같은 룸의 유저들에게 자동으로 씬 로딩 PhotonNetwork.AutomaticallySyncScene = true; - // + // 같은 버전의 유저끼리 접속 허용 PhotonNetwork.GameVersion = version; - // ̵ Ҵ + // 유저 아이디 할당 PhotonNetwork.NickName = userID; - // Ƚ Ȯ. ʴ 30ȸ + // 포톤 서버와 통신 횟수 확인. 초당 30회 Debug.Log(PhotonNetwork.SendRate); - // + // 서버 접속 PhotonNetwork.ConnectUsingSettings(); } - // ȣǴ ݹ Լ + // 포톤 서버에 접속 후 호출되는 콜백 함수 public override void OnConnectedToMaster() { - // ƴ Ȯ - Debug.Log(" "); - // κ ߴ Ȯ, False - Debug.Log($"κ = {PhotonNetwork.InLobby}"); - // κ + // 잘 연결됐는지 확인 + Debug.Log("서버와 연결 성공"); + // 로비 입장했는지 확인, False + Debug.Log($"로비 입장 여부 = {PhotonNetwork.InLobby}"); + // 로비 입장 PhotonNetwork.JoinLobby(); } - // κ ȣǴ ݹ Լ + // 로비에 접속 후 호출되는 콜백 함수 public override void OnJoinedLobby() { - // κ ߴ Ȯ, True - Debug.Log($"κ = {PhotonNetwork.InLobby}"); - // Ǿ ִ ߿ ϰ + // 로비 입장했는지 확인, True + Debug.Log($"로비 입장 여부 = {PhotonNetwork.InLobby}"); + // 생성되어 있는 룸 중에서 랜덤하게 입장 PhotonNetwork.JoinRandomRoom(); } - // 忡 ȣǴ ݹ Լ + // 랜덤 룸 입장에 실패했을 떄 호출되는 콜백 함수 public override void OnJoinRandomFailed(short returnCode, string message) { - // ޼ - Debug.Log($" {returnCode}:{message}"); + // 에러 메세지 출력 + Debug.Log($"랜덤 룸 입장 실패 {returnCode}:{message}"); - // Ӽ + // 룸 속성 정의 RoomOptions ro = new RoomOptions(); - ro.MaxPlayers = 20; // ִ : 20 - ro.IsOpen = true; // - ro.IsVisible = true; // κ񿡼 + ro.MaxPlayers = 20; // 최대 동접자 수: 20명 + ro.IsOpen = true; // 룸의 오픈 여부 + ro.IsVisible = true; // 로비에서 룸 목록 노출 여부 - // + // 룸 생성 PhotonNetwork.CreateRoom("My Room", ro); } - // Ϸ ȣǴ ݹ Լ + // 룸 생성이 완료된 후 호출되는 콜백 함수 public override void OnCreatedRoom() { - Debug.Log(" "); - Debug.Log($" ̸ = {PhotonNetwork.CurrentRoom.Name}"); + Debug.Log("룸 생성"); + Debug.Log($"룸 이름 = {PhotonNetwork.CurrentRoom.Name}"); } - // 뿡 ȣǴ ݹ Լ + // 룸에 입장한 후 호출되는 콜백 함수 public override void OnJoinedRoom() { - Debug.Log($" = {PhotonNetwork.InRoom}"); - Debug.Log($" ο = {PhotonNetwork.CurrentRoom.PlayerCount}"); + Debug.Log($"룸 입장 여부 = {PhotonNetwork.InRoom}"); + Debug.Log($"현재 룸의 인원수 = {PhotonNetwork.CurrentRoom.PlayerCount}"); foreach (var player in PhotonNetwork.CurrentRoom.Players) { Debug.Log($"{player.Value.NickName}, {player.Value.ActorNumber}"); } - // ij 迭 + // 캐릭터 출현 정보 배열에 저장 Transform[] points = GameObject.Find("SpawnPointGroup").GetComponentsInChildren(); int idx = Random.Range(1, points.Length); - // ij + // 캐릭터 생성 PhotonNetwork.Instantiate("Prefabs/Player", points[idx].position, points[idx].rotation, 0); }