Toggle session panel with Escape as in-game pause overlay
- Panel shows in Main while disconnected, auto-hides once a connection is established, and toggles open/closed with Escape in the Lobby or on a Map. - Escape now pauses gameplay (active mode exits, cursor freed, paint and movement disabled) instead of ending the match directly; closing restores the prior mode via SwitchTo. - Disconnect button is context-aware: leaves the session in the Lobby, acts as "Back to Lobby" (EndMatch) for the match authority on a Map, and stays a plain disconnect for non-authority clients on a Map. - Removed the Escape->EndMatch handler from MatchManager; match end now routes through RequestEndMatch with the same authority routing. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
1 parent
d27ee16004
commit
cdfec364b2
4 files changed
+248
-51
No files matched your search
+29
-11
@@ -678,6 +678,11 @@ MonoBehaviour:
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
CustomBlends: {fileID: 11400000, guid: 47b57a7fe51fd154e975311ad293878a, type: 2}
|
||||
--- !u!1 &499812162 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 534773943941885308, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
m_PrefabInstance: {fileID: 8599056809828915506}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &499812163 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 4566662197198005404, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
@@ -819,6 +824,7 @@ MonoBehaviour:
|
||||
listContent: {fileID: 764069389}
|
||||
entryTemplate: {fileID: 1675823052}
|
||||
statusLabel: {fileID: 2102676159}
|
||||
panelRoot: {fileID: 499812162}
|
||||
selectedTint: {r: 0.26, g: 0.52, b: 0.96, a: 1}
|
||||
normalTint: {r: 1, g: 1, b: 1, a: 0.05}
|
||||
--- !u!114 &701418504 stripped
|
||||
@@ -1373,7 +1379,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: Idle
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 964ae5cd392ba08499b88de012ff8213, type: 2}
|
||||
m_sharedMaterial: {fileID: 1752619484}
|
||||
@@ -1409,8 +1415,8 @@ MonoBehaviour:
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 8192
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 2048
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_characterHorizontalScale: 1
|
||||
@@ -1421,7 +1427,7 @@ MonoBehaviour:
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_overflowMode: 1
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
@@ -1441,7 +1447,7 @@ MonoBehaviour:
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_margin: {x: 0, y: 0, z: 0, w: -27.158808}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
@@ -1471,7 +1477,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -4}
|
||||
m_AnchoredPosition: {x: 0, y: 96}
|
||||
m_SizeDelta: {x: -16, y: 24}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!1001 &8599056809828915506
|
||||
@@ -1492,7 +1498,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 458161408064890808, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 58.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 458161408064890808, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@@ -1510,6 +1516,14 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Online Session Manager
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1117235872924133776, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: -134
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1117235872924133776, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 35
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1124549748001373863, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
@@ -1520,7 +1534,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1124549748001373863, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 154.8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1124549748001373863, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@@ -1544,7 +1558,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2926165666280585152, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 65.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2926165666280585152, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@@ -1666,6 +1680,10 @@ PrefabInstance:
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8080141125004544176, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_ChildControlWidth
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8110497960478258844, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_fontMaterial
|
||||
value:
|
||||
@@ -1700,7 +1718,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8555406533395562537, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
value: 87.1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8555406533395562537, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
@@ -1718,7 +1736,7 @@ PrefabInstance:
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 4566662197198005404, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
insertIndex: -1
|
||||
insertIndex: 1
|
||||
addedObject: {fileID: 2102676161}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1040229641786897100, guid: 940219f29a5971947be1767af2ec5a71, type: 3}
|
||||
|
||||
Reference in new issue
Block a user