Skip to content
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

[GH-1617] Unstable connection icon #1741

Closed
wants to merge 48 commits into from
Closed
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
ea7fa16
draft ping analysis
AngieDutra Apr 30, 2024
3dd23ca
ping counter analysis
AngieDutra May 2, 2024
94edc07
ping refactor
AngieDutra May 3, 2024
7254f52
block player movement
AngieDutra May 3, 2024
033590e
set tested values for truest results
AngieDutra May 3, 2024
1f6b873
Revert "set tested values for truest results"
AngieDutra May 3, 2024
293d2c6
set tested values for truest results
AngieDutra May 3, 2024
c980390
prevent send action and movement
AngieDutra May 3, 2024
ff6fb2f
fix animation
AngieDutra May 3, 2024
b1da8b9
fix sequence init
AngieDutra May 6, 2024
4dd972a
improve spikes logic
AngieDutra May 6, 2024
51c1862
handle killfeed manager
AngieDutra May 6, 2024
145609d
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 6, 2024
621c9e4
reposition player if connection is stable again
AngieDutra May 6, 2024
d4d8c1f
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 8, 2024
f253f36
airplane mode support
AngieDutra May 9, 2024
a39324a
ios airplane mode handle
AngieDutra May 9, 2024
45d5e5d
add error popup
AngieDutra May 9, 2024
e9cfed9
wait 3 seconds to redirect
AngieDutra May 9, 2024
9b0113d
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 9, 2024
7843da1
change error handle
AngieDutra May 10, 2024
b3f83e4
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 10, 2024
7157595
refactor latency analyzer
AngieDutra May 13, 2024
7019770
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 13, 2024
53fe800
values adjustments
AngieDutra May 13, 2024
4331b0b
fix reposition of player and items button conditions
AngieDutra May 14, 2024
e36b9e2
adjust values
AngieDutra May 14, 2024
71e3075
change variable name
AngieDutra May 14, 2024
ef86d04
connection to server
AngieDutra May 15, 2024
9382fb0
adjust list length value
AngieDutra May 15, 2024
0e2cf0e
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 15, 2024
94e5674
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 15, 2024
07d5954
fix jitter when unstable connection
AngieDutra May 15, 2024
3f6b089
adjust logic
AngieDutra May 15, 2024
3bb33b3
update values
AngieDutra May 16, 2024
4f3477e
adjust reposition on reconnect
AngieDutra May 17, 2024
395bcf0
delete disconnect on web socket close
AngieDutra May 17, 2024
b41c186
improve update conditional
AngieDutra May 17, 2024
0ba0dfb
reduce update ping interval
AngieDutra May 17, 2024
50480be
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 17, 2024
ce18f75
use unix time
AngieDutra May 17, 2024
f2d7e81
delete update interval
AngieDutra May 17, 2024
858d97c
Remove check because it is causing the ping not being updated
tvillegas98 May 17, 2024
3096a15
Merge branch 'main' into gh-1617-connectivity-icon
AngieDutra May 20, 2024
3e267b9
Merge branch 'main' into gh-1617-connectivity-icon
saugon May 24, 2024
8b876e2
Latency Analyzer spike between min and max of sample, instead of sequ…
tkz00 May 27, 2024
059ceb1
revert localhost ports to 4000
tkz00 May 27, 2024
f2d761b
bad connection warning icon on no updates and disconnection after mor…
tkz00 May 29, 2024
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
8 changes: 8 additions & 0 deletions client/Assets/Images/UI/BattleUI/InGameUI/Connectivity.meta

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

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

156 changes: 148 additions & 8 deletions client/Assets/Prefabs/Camera/CameraUI.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1776069428583422584}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -3736,7 +3736,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 10c3b3ae0b3854c0885741bbbc9a716b, type: 3}
m_Name:
m_EditorClassIdentifier:
updateInterval: 5
--- !u!114 &4980907407955894119
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3920,6 +3919,7 @@ RectTransform:
- {fileID: 3541088300014464730}
- {fileID: 224755029922821052}
- {fileID: 2987263784046857103}
- {fileID: 7574178929869729584}
- {fileID: 1354677301584654392}
- {fileID: 224902518433461374}
- {fileID: 9069024631279217844}
Expand Down Expand Up @@ -15865,6 +15865,109 @@ MonoBehaviour:
m_GroupId: 0
m_GroupMaxId: 0
m_AbsoluteMode: 0
--- !u!1 &5195834919695921402
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5193273677100726051}
- component: {fileID: 3666445939760789633}
- component: {fileID: 4445610011766038531}
- component: {fileID: 3601148938128500941}
- component: {fileID: 7377888210404452454}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5193273677100726051
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195834919695921402}
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: 7574178929869729584}
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 &3666445939760789633
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195834919695921402}
m_CullTransparentMesh: 1
--- !u!114 &4445610011766038531
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195834919695921402}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a0ef07a5e0c054f96819f410bcca6899, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!225 &3601148938128500941
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195834919695921402}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 0
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!114 &7377888210404452454
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195834919695921402}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cde92026908ba445388334375d0bf7b8, type: 3}
m_Name:
m_EditorClassIdentifier:
animationDuration: 1
--- !u!1 &5305548604416293072
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -21618,6 +21721,43 @@ CanvasGroup:
m_Interactable: 0
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!1 &7227144990242239087
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7574178929869729584}
m_Layer: 5
m_Name: Connectivity
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7574178929869729584
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7227144990242239087}
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: 5193273677100726051}
m_Father: {fileID: 1776069428583422584}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -52}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 1}
--- !u!1 &7236696536394779565
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -26778,7 +26918,7 @@ RectTransform:
- {fileID: 3943502343545172835}
- {fileID: 5888417331244992891}
m_Father: {fileID: 1776069428583422584}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -27882,7 +28022,7 @@ PrefabInstance:
- target: {fileID: 2572185631252139221, guid: 667038c0326a04fd28eeabee05b90596,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2572185631252139221, guid: 667038c0326a04fd28eeabee05b90596,
type: 3}
Expand Down Expand Up @@ -28069,7 +28209,7 @@ PrefabInstance:
- target: {fileID: 405015045608437906, guid: f6bbb6a434dcc4881b347da86cd4a8d5,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 405015045608437906, guid: f6bbb6a434dcc4881b347da86cd4a8d5,
type: 3}
Expand Down Expand Up @@ -28286,7 +28426,7 @@ PrefabInstance:
- target: {fileID: 2374372053566511617, guid: 92b03542ba4f1406eb2515fd17bd1355,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 2374372053566511617, guid: 92b03542ba4f1406eb2515fd17bd1355,
type: 3}
Expand Down Expand Up @@ -28927,7 +29067,7 @@ PrefabInstance:
- target: {fileID: 6369334723233126590, guid: ecb74564ab3ec44ae9e88e1ddfc812b6,
type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 6369334723233126590, guid: ecb74564ab3ec44ae9e88e1ddfc812b6,
type: 3}
Expand Down Expand Up @@ -29088,7 +29228,7 @@ PrefabInstance:
- target: {fileID: 4756093356100547938, guid: a1ce699ec5f7648048e8af62229efaf4,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4756093356100547938, guid: a1ce699ec5f7648048e8af62229efaf4,
type: 3}
Expand Down
6 changes: 3 additions & 3 deletions client/Assets/Prefabs/Camera/MainScreenCameraUI.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -5244,9 +5244,9 @@ RectTransform:
m_Father: {fileID: 8705011185335358841}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -5}
m_SizeDelta: {x: 0, y: 190}
m_Pivot: {x: 0, y: 1}
--- !u!114 &5605121756912279285
Expand Down
Loading