Merge pull request #15 from kookmin-sw/teamFnc

Team fnc Merge
kookmin-sw · Apr 24, 2024 · f043f16 · f043f16
2 parents b059533 + f6dbd6c
commit f043f16
Show file tree

Hide file tree

Showing 20 changed files with 2,495 additions and 458 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Assets/1Scenes/Game.unity b/Assets/1Scenes/Game.unity
@@ -8084,6 +8084,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c9938fc2d46440b4f9a275413d1248f4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isTeamMode: 0
+  redTeam1: 0
+  blueTeam2: 0
   spawnPoints:
   - {fileID: 1233092371}
   - {fileID: 1233092370}

diff --git a/Assets/1Scenes/Intro.unity b/Assets/1Scenes/Intro.unity
@@ -1198,6 +1198,74 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!1 &556501504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 556501507}
+  - component: {fileID: 556501506}
+  - component: {fileID: 556501505}
+  m_Layer: 0
+  m_Name: Data Manager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &556501505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556501504}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ObservedComponentsFoldoutOpen: 1
+  Group: 0
+  prefixField: -1
+  Synchronization: 3
+  OwnershipTransfer: 0
+  observableSearch: 2
+  ObservedComponents: []
+  sceneViewId: 111
+  InstantiationId: 0
+  isRuntimeInstantiated: 0
+--- !u!114 &556501506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556501504}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3861dc4ff54641758009e894e32db51, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  roomSlots: []
+--- !u!4 &556501507
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556501504}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -5.7624817, y: -1.87769, z: -0.72396386}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &614537451
 GameObject:
   m_ObjectHideFlags: 0
@@ -4564,8 +4632,9 @@ MonoBehaviour:
   loadingTime: 0.5
   isResult: 0
   result: 
-  isTestMode: 1
-  testCreateRoom: 1
+  resultText: 
+  isTestMode: 0
+  testCreateRoom: 0
   testJoinRoom: 0
 --- !u!4 &1657573346
 Transform:
@@ -5802,3 +5871,4 @@ SceneRoots:
   - {fileID: 279167244}
   - {fileID: 659720117}
   - {fileID: 1570513673}
+  - {fileID: 556501507}