Skip to content

Commit 747bfb1

Browse files
committed
update: 테스트 빌드용 로딩중 추가
1 parent 2a159fb commit 747bfb1

3 files changed

Lines changed: 317 additions & 1 deletion

File tree

Assets/General/Scripts/GameManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ private void Start()
1414
StartCoroutine("test");
1515
}
1616
IEnumerator test(){
17-
yield return new WaitForSeconds(1f);
17+
yield return new WaitForSeconds(0.5f);
1818
SceneManager.LoadScene("Kitchen");
1919
}
2020
public void testSave(){

Assets/Scenes/StartScene.unity

Lines changed: 313 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,140 @@ Transform:
225225
m_Children: []
226226
m_Father: {fileID: 0}
227227
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
228+
--- !u!1 &512300687
229+
GameObject:
230+
m_ObjectHideFlags: 0
231+
m_CorrespondingSourceObject: {fileID: 0}
232+
m_PrefabInstance: {fileID: 0}
233+
m_PrefabAsset: {fileID: 0}
234+
serializedVersion: 6
235+
m_Component:
236+
- component: {fileID: 512300688}
237+
- component: {fileID: 512300690}
238+
- component: {fileID: 512300689}
239+
m_Layer: 5
240+
m_Name: Text (TMP)
241+
m_TagString: Untagged
242+
m_Icon: {fileID: 0}
243+
m_NavMeshLayer: 0
244+
m_StaticEditorFlags: 0
245+
m_IsActive: 1
246+
--- !u!224 &512300688
247+
RectTransform:
248+
m_ObjectHideFlags: 0
249+
m_CorrespondingSourceObject: {fileID: 0}
250+
m_PrefabInstance: {fileID: 0}
251+
m_PrefabAsset: {fileID: 0}
252+
m_GameObject: {fileID: 512300687}
253+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
254+
m_LocalPosition: {x: 0, y: 0, z: 0}
255+
m_LocalScale: {x: 1, y: 1, z: 1}
256+
m_ConstrainProportionsScale: 0
257+
m_Children: []
258+
m_Father: {fileID: 721196232}
259+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
260+
m_AnchorMin: {x: 0.5, y: 0.5}
261+
m_AnchorMax: {x: 0.5, y: 0.5}
262+
m_AnchoredPosition: {x: 0, y: 0}
263+
m_SizeDelta: {x: 600.6951, y: 361.6599}
264+
m_Pivot: {x: 0.5, y: 0.5}
265+
--- !u!114 &512300689
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: 512300687}
272+
m_Enabled: 1
273+
m_EditorHideFlags: 0
274+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
275+
m_Name:
276+
m_EditorClassIdentifier:
277+
m_Material: {fileID: 0}
278+
m_Color: {r: 1, g: 1, b: 1, a: 1}
279+
m_RaycastTarget: 1
280+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
281+
m_Maskable: 1
282+
m_OnCullStateChanged:
283+
m_PersistentCalls:
284+
m_Calls: []
285+
m_text: "\uB85C\uB529 \uC911..."
286+
m_isRightToLeft: 0
287+
m_fontAsset: {fileID: 11400000, guid: 3ad263d64d1f0bf45934bf42ba5aa135, type: 2}
288+
m_sharedMaterial: {fileID: -2118853791976562385, guid: 3ad263d64d1f0bf45934bf42ba5aa135, type: 2}
289+
m_fontSharedMaterials: []
290+
m_fontMaterial: {fileID: 0}
291+
m_fontMaterials: []
292+
m_fontColor32:
293+
serializedVersion: 2
294+
rgba: 4294967295
295+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
296+
m_enableVertexGradient: 0
297+
m_colorMode: 3
298+
m_fontColorGradient:
299+
topLeft: {r: 1, g: 1, b: 1, a: 1}
300+
topRight: {r: 1, g: 1, b: 1, a: 1}
301+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
302+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
303+
m_fontColorGradientPreset: {fileID: 0}
304+
m_spriteAsset: {fileID: 0}
305+
m_tintAllSprites: 0
306+
m_StyleSheet: {fileID: 0}
307+
m_TextStyleHashCode: -1183493901
308+
m_overrideHtmlColors: 0
309+
m_faceColor:
310+
serializedVersion: 2
311+
rgba: 4294967295
312+
m_fontSize: 100
313+
m_fontSizeBase: 100
314+
m_fontWeight: 400
315+
m_enableAutoSizing: 0
316+
m_fontSizeMin: 18
317+
m_fontSizeMax: 72
318+
m_fontStyle: 0
319+
m_HorizontalAlignment: 2
320+
m_VerticalAlignment: 512
321+
m_textAlignment: 65535
322+
m_characterSpacing: 0
323+
m_wordSpacing: 0
324+
m_lineSpacing: 0
325+
m_lineSpacingMax: 0
326+
m_paragraphSpacing: 0
327+
m_charWidthMaxAdj: 0
328+
m_enableWordWrapping: 1
329+
m_wordWrappingRatios: 0.4
330+
m_overflowMode: 0
331+
m_linkedTextComponent: {fileID: 0}
332+
parentLinkedComponent: {fileID: 0}
333+
m_enableKerning: 1
334+
m_enableExtraPadding: 0
335+
checkPaddingRequired: 0
336+
m_isRichText: 1
337+
m_parseCtrlCharacters: 1
338+
m_isOrthographic: 1
339+
m_isCullingEnabled: 0
340+
m_horizontalMapping: 0
341+
m_verticalMapping: 0
342+
m_uvLineOffset: 0
343+
m_geometrySortingOrder: 0
344+
m_IsTextObjectScaleStatic: 0
345+
m_VertexBufferAutoSizeReduction: 0
346+
m_useMaxVisibleDescender: 1
347+
m_pageToDisplay: 1
348+
m_margin: {x: 7.0146484, y: -2.3726807, z: 0, w: 0}
349+
m_isUsingLegacyAnimationComponent: 0
350+
m_isVolumetricText: 0
351+
m_hasFontAssetChanged: 0
352+
m_baseMaterial: {fileID: 0}
353+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
354+
--- !u!222 &512300690
355+
CanvasRenderer:
356+
m_ObjectHideFlags: 0
357+
m_CorrespondingSourceObject: {fileID: 0}
358+
m_PrefabInstance: {fileID: 0}
359+
m_PrefabAsset: {fileID: 0}
360+
m_GameObject: {fileID: 512300687}
361+
m_CullTransparentMesh: 1
228362
--- !u!1001 &676617589
229363
PrefabInstance:
230364
m_ObjectHideFlags: 0
@@ -338,6 +472,109 @@ PrefabInstance:
338472
m_AddedGameObjects: []
339473
m_AddedComponents: []
340474
m_SourcePrefab: {fileID: 100100000, guid: 3d15e0975cbebb64183ca5b3a54c5aa4, type: 3}
475+
--- !u!1 &721196228
476+
GameObject:
477+
m_ObjectHideFlags: 0
478+
m_CorrespondingSourceObject: {fileID: 0}
479+
m_PrefabInstance: {fileID: 0}
480+
m_PrefabAsset: {fileID: 0}
481+
serializedVersion: 6
482+
m_Component:
483+
- component: {fileID: 721196232}
484+
- component: {fileID: 721196231}
485+
- component: {fileID: 721196230}
486+
- component: {fileID: 721196229}
487+
m_Layer: 5
488+
m_Name: Canvas (Loading)
489+
m_TagString: Untagged
490+
m_Icon: {fileID: 0}
491+
m_NavMeshLayer: 0
492+
m_StaticEditorFlags: 0
493+
m_IsActive: 1
494+
--- !u!114 &721196229
495+
MonoBehaviour:
496+
m_ObjectHideFlags: 0
497+
m_CorrespondingSourceObject: {fileID: 0}
498+
m_PrefabInstance: {fileID: 0}
499+
m_PrefabAsset: {fileID: 0}
500+
m_GameObject: {fileID: 721196228}
501+
m_Enabled: 1
502+
m_EditorHideFlags: 0
503+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
504+
m_Name:
505+
m_EditorClassIdentifier:
506+
m_IgnoreReversedGraphics: 1
507+
m_BlockingObjects: 0
508+
m_BlockingMask:
509+
serializedVersion: 2
510+
m_Bits: 4294967295
511+
--- !u!114 &721196230
512+
MonoBehaviour:
513+
m_ObjectHideFlags: 0
514+
m_CorrespondingSourceObject: {fileID: 0}
515+
m_PrefabInstance: {fileID: 0}
516+
m_PrefabAsset: {fileID: 0}
517+
m_GameObject: {fileID: 721196228}
518+
m_Enabled: 1
519+
m_EditorHideFlags: 0
520+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
521+
m_Name:
522+
m_EditorClassIdentifier:
523+
m_UiScaleMode: 0
524+
m_ReferencePixelsPerUnit: 100
525+
m_ScaleFactor: 1
526+
m_ReferenceResolution: {x: 800, y: 600}
527+
m_ScreenMatchMode: 0
528+
m_MatchWidthOrHeight: 0
529+
m_PhysicalUnit: 3
530+
m_FallbackScreenDPI: 96
531+
m_DefaultSpriteDPI: 96
532+
m_DynamicPixelsPerUnit: 1
533+
m_PresetInfoIsWorld: 0
534+
--- !u!223 &721196231
535+
Canvas:
536+
m_ObjectHideFlags: 0
537+
m_CorrespondingSourceObject: {fileID: 0}
538+
m_PrefabInstance: {fileID: 0}
539+
m_PrefabAsset: {fileID: 0}
540+
m_GameObject: {fileID: 721196228}
541+
m_Enabled: 1
542+
serializedVersion: 3
543+
m_RenderMode: 0
544+
m_Camera: {fileID: 0}
545+
m_PlaneDistance: 100
546+
m_PixelPerfect: 0
547+
m_ReceivesEvents: 1
548+
m_OverrideSorting: 0
549+
m_OverridePixelPerfect: 0
550+
m_SortingBucketNormalizedSize: 0
551+
m_VertexColorAlwaysGammaSpace: 0
552+
m_AdditionalShaderChannelsFlag: 25
553+
m_UpdateRectTransformForStandalone: 0
554+
m_SortingLayerID: 0
555+
m_SortingOrder: 0
556+
m_TargetDisplay: 0
557+
--- !u!224 &721196232
558+
RectTransform:
559+
m_ObjectHideFlags: 0
560+
m_CorrespondingSourceObject: {fileID: 0}
561+
m_PrefabInstance: {fileID: 0}
562+
m_PrefabAsset: {fileID: 0}
563+
m_GameObject: {fileID: 721196228}
564+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
565+
m_LocalPosition: {x: 0, y: 0, z: 0}
566+
m_LocalScale: {x: 0, y: 0, z: 0}
567+
m_ConstrainProportionsScale: 0
568+
m_Children:
569+
- {fileID: 1994942642}
570+
- {fileID: 512300688}
571+
m_Father: {fileID: 0}
572+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
573+
m_AnchorMin: {x: 0, y: 0}
574+
m_AnchorMax: {x: 0, y: 0}
575+
m_AnchoredPosition: {x: 0, y: 0}
576+
m_SizeDelta: {x: 0, y: 0}
577+
m_Pivot: {x: 0, y: 0}
341578
--- !u!1 &819821862
342579
GameObject:
343580
m_ObjectHideFlags: 0
@@ -511,6 +748,81 @@ Transform:
511748
m_Children: []
512749
m_Father: {fileID: 0}
513750
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
751+
--- !u!1 &1994942641
752+
GameObject:
753+
m_ObjectHideFlags: 0
754+
m_CorrespondingSourceObject: {fileID: 0}
755+
m_PrefabInstance: {fileID: 0}
756+
m_PrefabAsset: {fileID: 0}
757+
serializedVersion: 6
758+
m_Component:
759+
- component: {fileID: 1994942642}
760+
- component: {fileID: 1994942644}
761+
- component: {fileID: 1994942643}
762+
m_Layer: 5
763+
m_Name: Panel
764+
m_TagString: Untagged
765+
m_Icon: {fileID: 0}
766+
m_NavMeshLayer: 0
767+
m_StaticEditorFlags: 0
768+
m_IsActive: 1
769+
--- !u!224 &1994942642
770+
RectTransform:
771+
m_ObjectHideFlags: 0
772+
m_CorrespondingSourceObject: {fileID: 0}
773+
m_PrefabInstance: {fileID: 0}
774+
m_PrefabAsset: {fileID: 0}
775+
m_GameObject: {fileID: 1994942641}
776+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
777+
m_LocalPosition: {x: 0, y: 0, z: 0}
778+
m_LocalScale: {x: 1, y: 1, z: 1}
779+
m_ConstrainProportionsScale: 0
780+
m_Children: []
781+
m_Father: {fileID: 721196232}
782+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
783+
m_AnchorMin: {x: 0, y: 0}
784+
m_AnchorMax: {x: 1, y: 1}
785+
m_AnchoredPosition: {x: 0, y: 0}
786+
m_SizeDelta: {x: 0, y: 0}
787+
m_Pivot: {x: 0.5, y: 0.5}
788+
--- !u!114 &1994942643
789+
MonoBehaviour:
790+
m_ObjectHideFlags: 0
791+
m_CorrespondingSourceObject: {fileID: 0}
792+
m_PrefabInstance: {fileID: 0}
793+
m_PrefabAsset: {fileID: 0}
794+
m_GameObject: {fileID: 1994942641}
795+
m_Enabled: 1
796+
m_EditorHideFlags: 0
797+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
798+
m_Name:
799+
m_EditorClassIdentifier:
800+
m_Material: {fileID: 0}
801+
m_Color: {r: 0, g: 0, b: 0, a: 1}
802+
m_RaycastTarget: 1
803+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
804+
m_Maskable: 1
805+
m_OnCullStateChanged:
806+
m_PersistentCalls:
807+
m_Calls: []
808+
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
809+
m_Type: 1
810+
m_PreserveAspect: 0
811+
m_FillCenter: 1
812+
m_FillMethod: 4
813+
m_FillAmount: 1
814+
m_FillClockwise: 1
815+
m_FillOrigin: 0
816+
m_UseSpriteMesh: 0
817+
m_PixelsPerUnitMultiplier: 1
818+
--- !u!222 &1994942644
819+
CanvasRenderer:
820+
m_ObjectHideFlags: 0
821+
m_CorrespondingSourceObject: {fileID: 0}
822+
m_PrefabInstance: {fileID: 0}
823+
m_PrefabAsset: {fileID: 0}
824+
m_GameObject: {fileID: 1994942641}
825+
m_CullTransparentMesh: 1
514826
--- !u!1660057539 &9223372036854775807
515827
SceneRoots:
516828
m_ObjectHideFlags: 0
@@ -519,3 +831,4 @@ SceneRoots:
519831
- {fileID: 1383140480}
520832
- {fileID: 676617589}
521833
- {fileID: 819821865}
834+
- {fileID: 721196232}

ProjectSettings/EditorBuildSettings.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Scenes:
8+
- enabled: 1
9+
path: Assets/Scenes/StartScene.unity
10+
guid: 89c22f0ed0fc04c48b05a574b176700c
811
- enabled: 1
912
path: Assets/Scenes/Kitchen.unity
1013
guid: 9fc0d4010bbf28b4594072e72b8655ab

0 commit comments

Comments
 (0)