Skip to content

feat: auto reconnect [MTT-2617] #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
May 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
08c8c70
Implementing auto-reconnect as it was on GDC branch without workarounds
LPLafontaineB Mar 21, 2022
aba6585
Moved the nullification of the static ClientCharSelectState instance …
LPLafontaineB Mar 23, 2022
0fb07ad
Added simple bool field to determine if ServerAdditiveSceneLoader sho…
LPLafontaineB Mar 23, 2022
77e05c6
returning tasks when ending tracking or joining a lobby
LPLafontaineB Mar 23, 2022
002aa8b
Preventing leaving session when trying to reconnect and getting Logge…
LPLafontaineB Mar 23, 2022
511c394
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB Mar 30, 2022
6737a00
Adding message for when host ends session voluntarily
LPLafontaineB Apr 6, 2022
889f1df
Adding comment to explain the wait
LPLafontaineB Apr 6, 2022
0771efc
Made sure that ShutDown is only called in ClientGameNetPortal for cli…
LPLafontaineB Apr 6, 2022
8ccd3cf
Moved the clearing of SessionManager's data to after shutdown server-…
LPLafontaineB Apr 6, 2022
ae2286f
Removed unused code
LPLafontaineB Apr 6, 2022
8678975
Merge branch 'develop' into feature/message-when-host-ends-session
LPLafontaineB Apr 6, 2022
2d4a787
fixing conflict
LPLafontaineB Apr 6, 2022
a21d401
Merge branch 'develop' into feature/message-when-host-ends-session
LPLafontaineB Apr 7, 2022
c48b4a0
fixing conflicts
LPLafontaineB Apr 7, 2022
b71aa5c
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB Apr 11, 2022
37aeee8
fixing conflict
LPLafontaineB Apr 11, 2022
c3218fd
Merge branch 'feature/message-when-host-ends-session' into feature/au…
LPLafontaineB Apr 11, 2022
b44df7f
Adding waiting for tasks to finish when attempting reconnect
LPLafontaineB Apr 11, 2022
9247194
Adding popup that needs to be manually closed for reconnect attempts
LPLafontaineB Apr 11, 2022
8346445
adding loading spinner in popup
LPLafontaineB Apr 11, 2022
054ca09
adding check to prevent users from sending data to server while tryin…
LPLafontaineB Apr 11, 2022
f90f38d
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB Apr 12, 2022
2340556
Unload all additive scenes when client begins synchronizing
LPLafontaineB Apr 12, 2022
e9a7b49
adding reconnect message
LPLafontaineB Apr 12, 2022
a5395d8
using ReconnectMessage to display popups when reconnecting and to rem…
LPLafontaineB Apr 13, 2022
d3ec2e2
cleanup
LPLafontaineB Apr 13, 2022
c79f451
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB Apr 13, 2022
9395f61
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB Apr 27, 2022
37f5ef7
making sure reconnection popup is closed when successful or cancelled
LPLafontaineB Apr 27, 2022
e377149
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB Apr 28, 2022
09e2e47
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB May 3, 2022
6e865be
removing workarounds
LPLafontaineB May 3, 2022
7ebad5f
adding workaround comment
LPLafontaineB May 3, 2022
c2a1ac8
removing k_TimeoutDuration
LPLafontaineB May 3, 2022
29ce49c
removing other old workaround
LPLafontaineB May 3, 2022
03da1ce
fixing wait before reconnect attempts
LPLafontaineB May 3, 2022
babc1a2
Merge branch 'develop' into feature/auto-reconnect
LPLafontaineB May 3, 2022
5a6cd61
removed OnlineMode enum
LPLafontaineB May 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/BossRoom/Prefabs/NetworkingManager.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ MonoBehaviour:
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
TickRate: 30
ClientConnectionBufferTimeout: 10
ClientConnectionBufferTimeout: 1
ConnectionApproval: 1
ConnectionData:
EnableTimeResync: 0
Expand Down
351 changes: 218 additions & 133 deletions Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Large diffs are not rendered by default.

91 changes: 91 additions & 0 deletions Assets/BossRoom/Prefabs/UI/LoadingSpinner.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5158117047949901436
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 921942742702944666}
- component: {fileID: 9070664734268927556}
- component: {fileID: 574533375407849749}
- component: {fileID: 5514425742427529082}
m_Layer: 5
m_Name: LoadingSpinner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &921942742702944666
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5158117047949901436}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
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: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9070664734268927556
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5158117047949901436}
m_CullTransparentMesh: 1
--- !u!114 &574533375407849749
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5158117047949901436}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: d881ecf63d92e9947a1dc2849e3dc2de, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5514425742427529082
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5158117047949901436}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2239312c08bc5bb478d49bd7ce25903a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RotationSpeed: -50
7 changes: 7 additions & 0 deletions Assets/BossRoom/Prefabs/UI/LoadingSpinner.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading