Skip to content

Commit 5aba9ca

Browse files
authored
Merge pull request #2 from jmJang00/develop
feat: lobby ui
2 parents f5b655a + 1ce72b4 commit 5aba9ca

File tree

91 files changed

+253264
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+253264
-223
lines changed

Client/Assets/Scenes/Game.unity

Lines changed: 0 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ GameObject:
177177
m_Component:
178178
- component: {fileID: 705507995}
179179
- component: {fileID: 705507994}
180-
- component: {fileID: 705507996}
181180
m_Layer: 0
182181
m_Name: Directional Light
183182
m_TagString: Untagged
@@ -262,29 +261,6 @@ Transform:
262261
m_Children: []
263262
m_Father: {fileID: 0}
264263
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
265-
--- !u!114 &705507996
266-
MonoBehaviour:
267-
m_ObjectHideFlags: 0
268-
m_CorrespondingSourceObject: {fileID: 0}
269-
m_PrefabInstance: {fileID: 0}
270-
m_PrefabAsset: {fileID: 0}
271-
m_GameObject: {fileID: 705507993}
272-
m_Enabled: 1
273-
m_EditorHideFlags: 0
274-
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
275-
m_Name:
276-
m_EditorClassIdentifier:
277-
m_Version: 3
278-
m_UsePipelineSettings: 1
279-
m_AdditionalLightsShadowResolutionTier: 2
280-
m_LightLayerMask: 1
281-
m_RenderingLayers: 1
282-
m_CustomShadowLayers: 0
283-
m_ShadowLayerMask: 1
284-
m_ShadowRenderingLayers: 1
285-
m_LightCookieSize: {x: 1, y: 1}
286-
m_LightCookieOffset: {x: 0, y: 0}
287-
m_SoftShadowQuality: 0
288264
--- !u!1 &782522263
289265
GameObject:
290266
m_ObjectHideFlags: 3
@@ -294,8 +270,6 @@ GameObject:
294270
serializedVersion: 6
295271
m_Component:
296272
- component: {fileID: 782522264}
297-
- component: {fileID: 782522266}
298-
- component: {fileID: 782522265}
299273
m_Layer: 0
300274
m_Name: cm
301275
m_TagString: Untagged
@@ -318,40 +292,6 @@ Transform:
318292
m_Children: []
319293
m_Father: {fileID: 963194228}
320294
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
321-
--- !u!114 &782522265
322-
MonoBehaviour:
323-
m_ObjectHideFlags: 3
324-
m_CorrespondingSourceObject: {fileID: 0}
325-
m_PrefabInstance: {fileID: 0}
326-
m_PrefabAsset: {fileID: 0}
327-
m_GameObject: {fileID: 782522263}
328-
m_Enabled: 1
329-
m_EditorHideFlags: 0
330-
m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3}
331-
m_Name:
332-
m_EditorClassIdentifier:
333-
m_BindingMode: 4
334-
m_FollowOffset: {x: 0, y: 0, z: -50}
335-
m_XDamping: 1
336-
m_YDamping: 1
337-
m_ZDamping: 1
338-
m_AngularDampingMode: 0
339-
m_PitchDamping: 0
340-
m_YawDamping: 0
341-
m_RollDamping: 0
342-
m_AngularDamping: 0
343-
--- !u!114 &782522266
344-
MonoBehaviour:
345-
m_ObjectHideFlags: 3
346-
m_CorrespondingSourceObject: {fileID: 0}
347-
m_PrefabInstance: {fileID: 0}
348-
m_PrefabAsset: {fileID: 0}
349-
m_GameObject: {fileID: 782522263}
350-
m_Enabled: 1
351-
m_EditorHideFlags: 0
352-
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
353-
m_Name:
354-
m_EditorClassIdentifier:
355295
--- !u!1 &963194225
356296
GameObject:
357297
m_ObjectHideFlags: 0
@@ -363,9 +303,6 @@ GameObject:
363303
- component: {fileID: 963194228}
364304
- component: {fileID: 963194227}
365305
- component: {fileID: 963194226}
366-
- component: {fileID: 963194229}
367-
- component: {fileID: 963194231}
368-
- component: {fileID: 963194230}
369306
m_Layer: 0
370307
m_Name: Main Camera
371308
m_TagString: MainCamera
@@ -448,123 +385,6 @@ Transform:
448385
- {fileID: 782522264}
449386
m_Father: {fileID: 0}
450387
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
451-
--- !u!114 &963194229
452-
MonoBehaviour:
453-
m_ObjectHideFlags: 0
454-
m_CorrespondingSourceObject: {fileID: 0}
455-
m_PrefabInstance: {fileID: 0}
456-
m_PrefabAsset: {fileID: 0}
457-
m_GameObject: {fileID: 963194225}
458-
m_Enabled: 1
459-
m_EditorHideFlags: 0
460-
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
461-
m_Name:
462-
m_EditorClassIdentifier:
463-
m_RenderShadows: 1
464-
m_RequiresDepthTextureOption: 2
465-
m_RequiresOpaqueTextureOption: 2
466-
m_CameraType: 0
467-
m_Cameras: []
468-
m_RendererIndex: -1
469-
m_VolumeLayerMask:
470-
serializedVersion: 2
471-
m_Bits: 1
472-
m_VolumeTrigger: {fileID: 0}
473-
m_VolumeFrameworkUpdateModeOption: 2
474-
m_RenderPostProcessing: 0
475-
m_Antialiasing: 0
476-
m_AntialiasingQuality: 2
477-
m_StopNaN: 0
478-
m_Dithering: 0
479-
m_ClearDepth: 1
480-
m_AllowXRRendering: 1
481-
m_AllowHDROutput: 1
482-
m_UseScreenCoordOverride: 0
483-
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
484-
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
485-
m_RequiresDepthTexture: 0
486-
m_RequiresColorTexture: 0
487-
m_Version: 2
488-
m_TaaSettings:
489-
quality: 3
490-
frameInfluence: 0.1
491-
jitterScale: 1
492-
mipBias: 0
493-
varianceClampScale: 0.9
494-
contrastAdaptiveSharpening: 0
495-
--- !u!114 &963194230
496-
MonoBehaviour:
497-
m_ObjectHideFlags: 0
498-
m_CorrespondingSourceObject: {fileID: 0}
499-
m_PrefabInstance: {fileID: 0}
500-
m_PrefabAsset: {fileID: 0}
501-
m_GameObject: {fileID: 963194225}
502-
m_Enabled: 1
503-
m_EditorHideFlags: 0
504-
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
505-
m_Name:
506-
m_EditorClassIdentifier:
507-
m_ExcludedPropertiesInInspector:
508-
- m_Script
509-
m_LockStageInInspector:
510-
m_StreamingVersion: 20170927
511-
m_Priority: 10
512-
m_StandbyUpdate: 2
513-
m_LookAt: {fileID: 0}
514-
m_Follow: {fileID: 0}
515-
m_Lens:
516-
FieldOfView: 40
517-
OrthographicSize: 40
518-
NearClipPlane: 0.1
519-
FarClipPlane: 5000
520-
Dutch: 0
521-
ModeOverride: 0
522-
LensShift: {x: 0, y: 0}
523-
GateFit: 2
524-
FocusDistance: 10
525-
m_SensorSize: {x: 1, y: 1}
526-
m_Transitions:
527-
m_BlendHint: 0
528-
m_InheritPosition: 0
529-
m_OnCameraLive:
530-
m_PersistentCalls:
531-
m_Calls: []
532-
m_LegacyBlendHint: 0
533-
m_ComponentOwner: {fileID: 782522264}
534-
--- !u!114 &963194231
535-
MonoBehaviour:
536-
m_ObjectHideFlags: 0
537-
m_CorrespondingSourceObject: {fileID: 0}
538-
m_PrefabInstance: {fileID: 0}
539-
m_PrefabAsset: {fileID: 0}
540-
m_GameObject: {fileID: 963194225}
541-
m_Enabled: 1
542-
m_EditorHideFlags: 0
543-
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
544-
m_Name:
545-
m_EditorClassIdentifier:
546-
m_ShowDebugText: 0
547-
m_ShowCameraFrustum: 1
548-
m_IgnoreTimeScale: 0
549-
m_WorldUpOverride: {fileID: 0}
550-
m_UpdateMethod: 2
551-
m_BlendUpdateMethod: 0
552-
m_DefaultBlend:
553-
m_Style: 0
554-
m_Time: 2
555-
m_CustomCurve:
556-
serializedVersion: 2
557-
m_Curve: []
558-
m_PreInfinity: 2
559-
m_PostInfinity: 2
560-
m_RotationOrder: 4
561-
m_CustomBlends: {fileID: 0}
562-
m_CameraCutEvent:
563-
m_PersistentCalls:
564-
m_Calls: []
565-
m_CameraActivatedEvent:
566-
m_PersistentCalls:
567-
m_Calls: []
568388
--- !u!1 &982695889
569389
GameObject:
570390
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)