feat: Setting 완성, Loading UI 개선 및 게임 씬 이동시 추가, Spawn Async (#132)

* 세팅 시스템 추가, 세팅 UI 완성 * 엔트리 UI 디자인 변경 * 세팅 적용, 네트워크 비동기 스폰 설정, 네트워크 Disconnect 시간 연장 * 로딩 UI 적용
kookmin-sw · May 11, 2024 · 97d6e32 · 97d6e32
1 parent c56971e
commit 97d6e32
Show file tree

Hide file tree

Showing 31 changed files with 9,682 additions and 23,446 deletions.
diff --git a/Client/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion b/Client/Assets/Photon/Fusion/Resources/NetworkProjectConfig.fusion
@@ -25,7 +25,7 @@
         }
     },
     "Network": {
-        "ConnectionTimeout": 180.0,
+        "ConnectionTimeout": 300.0,
         "ConnectionShutdownTime": 1.0,
         "ReliableDataTransferModes": 3
     },

diff --git a/Client/Assets/Photon/Fusion/Runtime/NetworkSceneManagerDefault.cs b/Client/Assets/Photon/Fusion/Runtime/NetworkSceneManagerDefault.cs
@@ -735,4 +735,4 @@ public void Dispose() {
       }
     }
   }
-}
+}
diff --git a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab
@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 4704297354454387191}
   - component: {fileID: 7456184101988879778}
   - component: {fileID: 7673804491711146235}
+  - component: {fileID: 8210265563855654929}
   m_Layer: 0
   m_Name: '@GameSystem'
   m_TagString: Untagged
@@ -123,6 +124,23 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _CrewNum: 1
   _KilledCrewNum: 0
+--- !u!114 &8210265563855654929
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6419352827352035619}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ce34b84b2f9b474ba774310a78ce179, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Width: 1920
+  Height: 1080
+  Fullscreen: 1
+  XSensitivity: 1
+  YSensitivity: 1
 --- !u!1 &7900258476493451640
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Client/Assets/Resources/Prefabs/UI/Panel/UI_Entry.prefab b/Client/Assets/Resources/Prefabs/UI/Panel/UI_Entry.prefab
@@ -25,17 +25,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1910615290818965270}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1700016751011631892}
+  m_Father: {fileID: 2833856491892832019}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -160, y: -160}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4485862743289314724
 CanvasRenderer:
@@ -101,18 +101,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2603708946185247612}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1857616586342418075}
-  m_Father: {fileID: 1700016751011631892}
+  m_Father: {fileID: 2833856491892832019}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchoredPosition: {x: 0, y: -20}
+  m_SizeDelta: {x: 150, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5067096562388167159
 CanvasRenderer:
@@ -192,7 +192,7 @@ MonoBehaviour:
     m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 4003385660661770535}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -324,7 +324,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 5, y: 5, z: 5, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -356,18 +356,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4057735085532439615}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2387752991016628782}
-  m_Father: {fileID: 1700016751011631892}
+  m_Father: {fileID: 2833856491892832019}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 78.7}
-  m_SizeDelta: {x: 320, y: 60}
+  m_AnchoredPosition: {x: 0, y: 40}
+  m_SizeDelta: {x: 260, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7340049084304779864
 CanvasRenderer:
@@ -505,6 +505,44 @@ MonoBehaviour:
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
   m_InputValidator: {fileID: 0}
+--- !u!1 &5166473297824556113
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2833856491892832019}
+  m_Layer: 0
+  m_Name: parent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2833856491892832019
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5166473297824556113}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1737092961142082894}
+  - {fileID: 1121830975657023629}
+  - {fileID: 897654557706671543}
+  m_Father: {fileID: 1700016751011631892}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 320, y: 200}
+  m_Pivot: {x: 1, y: 0}
 --- !u!1 &5724769482957358427
 GameObject:
   m_ObjectHideFlags: 0
@@ -714,8 +752,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 2159523767
-  m_fontColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 0.5}
+    rgba: 1688248480
+  m_fontColor: {r: 0.627451, g: 0.627451, b: 0.627451, a: 0.39215687}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -732,10 +770,10 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
+  m_fontSize: 27
   m_fontSizeBase: 30
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 2
@@ -768,7 +806,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 5, y: 5, z: 5, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -878,9 +916,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1737092961142082894}
-  - {fileID: 1121830975657023629}
-  - {fileID: 897654557706671543}
+  - {fileID: 2833856491892832019}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}

diff --git a/Client/Assets/Resources/Prefabs/UI/Panel/UI_Loading.prefab b/Client/Assets/Resources/Prefabs/UI/Panel/UI_Loading.prefab
@@ -336,7 +336,7 @@ Canvas:
   m_GameObject: {fileID: 4210445876953297251}
   m_Enabled: 1
   serializedVersion: 3
-  m_RenderMode: 1
+  m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -735,4 +735,4 @@ public void Dispose() { @@
           }
         }
       }
-    }
+    }