Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR

# Conflicts:
#	Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity

Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/Dolphin/Dolphin2.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4cd22234f967e8a41ac9cd66c91788b6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/whaleEffect/StarWhale.vfx

@@ -2053,6 +2053,9 @@ MonoBehaviour:
     position: {x: 455, y: 290}
     expandedSlots:
     - {fileID: 8926484042661614573}
+    - {fileID: 8926484042661614574}
+    - {fileID: 8926484042661614578}
+    - {fileID: 8926484042661614582}
     expanded: 1
     supecollapsed: 0
 --- !u!114 &8926484042661614573

Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto looking for something.fbx.meta

@@ -59,7 +59,7 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto1.vfx.meta

@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: 82f1b099e4c38ce48b51f75ef2e0cb48
+VisualEffectImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  template:
+    name: 
+    category: 
+    description: 
+    icon: {instanceID: 0}
+    thumbnail: {instanceID: 0}
+  useAsTemplate: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: