빌드용 병합

Assets/Scenes/InGame.unity

@@ -999,100 +999,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _color: {r: 1, g: 0, b: 0, a: 1}
   _radius: 0.1
---- !u!1 &48749415
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 48749417}
-  - component: {fileID: 48749416}
-  m_Layer: 0
-  m_Name: Directional Light (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &48749416
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 48749415}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &48749417
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 48749415}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: -22.273777, y: 3.819654, z: -16.80272}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &65842798
 GameObject:
   m_ObjectHideFlags: 0
@@ -26367,4 +26273,3 @@ SceneRoots:
   - {fileID: 2029727132}
   - {fileID: 1644663425}
   - {fileID: 140916539}
-  - {fileID: 48749417}

Assets/Scripts/Interact/UIInteract/Inventory.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using static UnityEditor.Progress;
+// using static UnityEditor.Progress;
 
 //ItemQuickSlots에 들어가 있음
 public class Inventory : MonoBehaviour

Assets/Scripts/Interact/UIInteract/WeaponInventory.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor.UIElements;
+// using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UI;
-using static UnityEditor.Progress;
+// using static UnityEditor.Progress;
 
 public class WeaponInventory : MonoBehaviour
 {

Assets/Scripts/Network/LobbyPagePlayfab.cs

@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
-using static UnityEditor.FilePathAttribute;
-using UnityEditor.PackageManager;
+// using static UnityEditor.FilePathAttribute;
+// using UnityEditor.PackageManager;
 using System.Linq;
 
 public class LobbyPagePlayfab : MonoBehaviour

Assets/Scripts/Network/PhotonManager.cs

@@ -11,6 +11,8 @@ public class PhotonManager : MonoBehaviourPunCallbacks
 
     void Awake()
     {
+        PhotonNetwork.PhotonServerSettings.AppSettings.FixedRegion = "kr";
+
         Debug.Log("userID: " + GameManager.Instance.UserId);
         // 같은 룸의 유저들에게 자동으로 씬 로딩
         PhotonNetwork.AutomaticallySyncScene = true;

Assets/Scripts/Player/WeaponManager.cs

@@ -54,7 +54,8 @@ void OnTriggerEnter(Collider other){
             HpManager hpManager = other.GetComponent<HpManager>();
             PhotonView pv = other.GetComponent<PhotonView>();
 
-            if (hpManager != null) {
+            if (hpManager != null && GameManager.Instance.isPlaying) 
+            {
                 if (other.gameObject.tag == "Monster")
                 {
                     Debug.Log("Hit : " + damage);

Assets/Scripts/UI/DroppableUI.cs

@@ -5,7 +5,7 @@
 using UnityEngine.EventSystems;
 using System.Data.SqlTypes;
 using ExitGames.Client.Photon;
-using static UnityEditor.Progress;
+// using static UnityEditor.Progress;
 
 
 public class DroppableUI : MonoBehaviour, IPointerEnterHandler, IDropHandler, IPointerExitHandler