Merge pull request #303 from kookmin-sw/feature/pages

Feature/pages 업데이트
kookmin-sw · May 24, 2024 · c9bbbcd · c9bbbcd
2 parents b9fd87c + f6838da
commit c9bbbcd
Show file tree

Hide file tree

Showing 86 changed files with 4,876 additions and 870 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Assets/MonsterCollider.cs b/Assets/MonsterCollider.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MonsterCollider : MonoBehaviour
+{
+    void OnCollisionEnter(Collision collision)
+    {
+        if (collision.gameObject.tag == "Player" || collision.gameObject.tag == "Monster")
+        {
+            Physics.IgnoreCollision(gameObject.GetComponent<Collider>(), collision.gameObject.GetComponent<Collider>());
+        }
+    }
+}
diff --git a/Assets/MonsterCollider.cs.meta b/Assets/MonsterCollider.cs.meta
diff --git a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset
@@ -70,6 +70,15 @@ MonoBehaviour:
   - EnableSpawnerWorkingRPC
   - RpcGameOver
   - RpcAllDie
+  - GameStart
+  - RPCEscapeWin
+  - RPCOnLightening
+  - RpcAbandonedItem
+  - AttackTrig
+  - SpawnItemAll
+  - SpawnItemSmall
+  - RpcAudio
+  - RpcHit
   DisableAutoOpenWizard: 1
   ShowSettings: 1
   DevRegionSetOnce: 1