浏览代码
Merge pull request #24 from Unity-Technologies/master-staging
Merge pull request #24 from Unity-Technologies/master-staging
Quality of Life & Bug Fixes./main
GitHub
3 年前
当前提交
3b6a28a2
共有 70 个文件被更改，包括 1476 次插入 和 1326 次删除
-
998Assets/Art/Font/CheckboxFLF SDF.asset
-
6Assets/Art/Icons/CursorIcon.png.meta
-
199Assets/Prefabs/NGO/InGameLogic.prefab
-
4Assets/Prefabs/NGO/PlayerCursor.prefab
-
54Assets/Prefabs/NGO/SymbolContainer.prefab
-
28Assets/Prefabs/NGO/SymbolObject.prefab
-
66Assets/Prefabs/UI/LobbyCanvas.prefab
-
68Assets/Scenes/mainScene.unity
-
4Packages/manifest.json
-
31Packages/packages-lock.json
-
5ProjectSettings/BurstAotSettings_StandaloneWindows.json
-
2ProjectSettings/CommonBurstAotSettings.json
-
16ProjectSettings/Packages/com.unity.services.vivox/Settings.json
-
8ProjectSettings/ProjectSettings.asset
-
4ProjectSettings/UnityConnectSettings.asset
-
3Assets/Scripts/GameLobby/LobbyRelaySample.asmdef
-
4Assets/Scripts/GameLobby/Game/LocalMenuState.cs
-
4Assets/Scripts/GameLobby/Game/LocalLobbyObserver.cs
-
3Assets/Scripts/GameLobby/Game/LobbyUserObserver.cs
-
4Assets/Scripts/GameLobby/Game/LobbyServiceDataObserver.cs
-
40Assets/Scripts/GameLobby/Game/GameManager.cs
-
2Assets/Scripts/GameLobby/Infrastructure/Messenger.cs
-
2Assets/Scripts/GameLobby/UI/StartLobbyButtonUI.cs
-
6Assets/Scripts/GameLobby/UI/MainMenuUI.cs
-
4Assets/Scripts/GameLobby/UI/JoinCreateLobbyUI.cs
-
6Assets/Scripts/GameLobby/UI/GameStateVisibilityUI.cs
-
4Assets/Scripts/GameLobby/UI/BackButtonUI.cs
-
16Assets/Scripts/GameLobby/NGO/SymbolObject.cs
-
33Assets/Scripts/GameLobby/NGO/SymbolContainer.cs
-
2Assets/Scripts/GameLobby/NGO/SetupInGame.cs
-
10Assets/Scripts/GameLobby/NGO/InGameRunner.cs
-
4Assets/Scripts/GameLobby/Lobby/LobbyContentHeartbeat.cs
-
8Assets/Scripts/GameLobby/Lobby/LobbyAsyncRequests.cs
-
9Assets/Scripts/GameLobby/Lobby/LobbyAPIInterface.cs
-
4Assets/Scripts/GameLobby/Relay/RelayUtpSetup.cs
-
1Assets/Scripts/GameLobby/Relay/RelayUtpHost.cs
-
3Assets/Scripts/GameLobby/Relay/RelayUtpClient.cs
-
8Assets/Scripts/GameLobby/Relay/RelayAPIInterface.cs
-
1001Assets/Art/Icons/CursorSprite.png
-
108Assets/Art/Icons/CursorSprite.png.meta
-
8Assets/Scripts/GameLobby.meta
-
8Assets/Scripts/GameLobby/Game/LocalMenuStateObserver.cs
-
4Assets/Scripts/GameLobby/Game/LocalGameStateObserver.cs
-
0/Assets/Prefabs/UI/LobbyCanvas.prefab.meta
-
0/Assets/Prefabs/UI/LobbyCanvas.prefab
-
0/Assets/Scripts/GameLobby/Auth.meta
-
0/Assets/Scripts/GameLobby/Infrastructure.meta
-
0/Assets/Scripts/GameLobby/Relay.meta
-
0/Assets/Scripts/GameLobby/Tests.meta
-
0/Assets/Scripts/GameLobby/UI.meta
-
0/Assets/Scripts/GameLobby/LobbyRelaySample.asmdef.meta
-
0/Assets/Scripts/GameLobby/Lobby.meta
-
0/Assets/Scripts/GameLobby/Auth
-
0/Assets/Scripts/GameLobby/LobbyRelaySample.asmdef
-
0/Assets/Scripts/GameLobby/Game.meta
-
0/Assets/Scripts/GameLobby/Vivox.meta
-
0/Assets/Scripts/GameLobby/Game
-
0/Assets/Scripts/GameLobby/Game/LocalMenuStateObserver.cs.meta
-
0/Assets/Scripts/GameLobby/Game/LocalMenuState.cs.meta
-
0/Assets/Scripts/GameLobby/Game/LocalMenuState.cs
-
0/Assets/Scripts/GameLobby/Infrastructure
-
0/Assets/Scripts/GameLobby/Tests
-
0/Assets/Scripts/GameLobby/UI
-
0/Assets/Scripts/GameLobby/Vivox
-
0/Assets/Scripts/GameLobby/NGO.meta
-
0/Assets/Scripts/GameLobby/NGO
-
0/Assets/Scripts/GameLobby/Lobby
-
0/Assets/Scripts/GameLobby/Relay
998
Assets/Art/Font/CheckboxFLF SDF.asset
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
{ |
|||
"MonoBehaviour": { |
|||
"Version": 3, |
|||
"Version": 4, |
|||
"DisabledWarnings": "" |
|||
} |
|||
} |
|||
|
|||
namespace LobbyRelaySample |
|||
{ |
|||
/// <summary>
|
|||
/// Holds a LocalLobby value and notifies all subscribers when it has been changed.
|
|||
/// Check the GameManager in the mainScene for the list of observers being used in the project.
|
|||
/// </summary>
|
|||
public class LocalLobbyObserver : ObserverBehaviour<LocalLobby> { } |
|||
} |
|||
|
|||
namespace LobbyRelaySample |
|||
{ |
|||
/// <summary>
|
|||
/// Holds an instance of a lobbyplayer, and implements hooks for the UI to interact with.
|
|||
/// Holds a LobbyUser value and notifies all subscribers when it has been changed.
|
|||
/// Check the GameManager in the mainScene for the list of observers being used in the project.
|
|||
/// </summary>
|
|||
public class LobbyUserObserver : ObserverBehaviour<LobbyUser> { } |
|||
} |
|||
|
|||
namespace LobbyRelaySample |
|||
{ |
|||
/// <summary>
|
|||
/// Holds a LobbyServiceData value and notifies all subscribers when it has been changed.
|
|||
/// Check the GameManager in the mainScene for the list of observers being used in the project.
|
|||
/// </summary>
|
|||
public class LobbyServiceDataObserver : ObserverBehaviour<LobbyServiceData> { } |
|||
} |
|||
1001
Assets/Art/Icons/CursorSprite.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: 1ec85d26ef9b3d347a5a3438ba496881 |
|||
TextureImporter: |
|||
internalIDToNameTable: [] |
|||
externalObjects: {} |
|||
serializedVersion: 11 |
|||
mipmaps: |
|||
mipMapMode: 0 |
|||
enableMipMap: 0 |
|||
sRGBTexture: 1 |
|||
linearTexture: 0 |
|||
fadeOut: 0 |
|||
borderMipMap: 0 |
|||
mipMapsPreserveCoverage: 0 |
|||
alphaTestReferenceValue: 0.5 |
|||
mipMapFadeDistanceStart: 1 |
|||
mipMapFadeDistanceEnd: 3 |
|||
bumpmap: |
|||
convertToNormalMap: 0 |
|||
externalNormalMap: 0 |
|||
heightScale: 0.25 |
|||
normalMapFilter: 0 |
|||
isReadable: 1 |
|||
streamingMipmaps: 0 |
|||
streamingMipmapsPriority: 0 |
|||
vTOnly: 0 |
|||
grayScaleToAlpha: 0 |
|||
generateCubemap: 6 |
|||
cubemapConvolution: 0 |
|||
seamlessCubemap: 0 |
|||
textureFormat: 1 |
|||
maxTextureSize: 2048 |
|||
textureSettings: |
|||
serializedVersion: 2 |
|||
filterMode: 2 |
|||
aniso: 1 |
|||
mipBias: 0 |
|||
wrapU: 1 |
|||
wrapV: 1 |
|||
wrapW: 1 |
|||
nPOTScale: 0 |
|||
lightmap: 0 |
|||
compressionQuality: 50 |
|||
spriteMode: 1 |
|||
spriteExtrude: 1 |
|||
spriteMeshType: 0 |
|||
alignment: 1 |
|||
spritePivot: {x: 0.5, y: 0.5} |
|||
spritePixelsToUnits: 100 |
|||
spriteBorder: {x: 0, y: 0, z: 0, w: 0} |
|||
spriteGenerateFallbackPhysicsShape: 1 |
|||
alphaUsage: 1 |
|||
alphaIsTransparency: 1 |
|||
spriteTessellationDetail: -1 |
|||
textureType: 8 |
|||
textureShape: 1 |
|||
singleChannelComponent: 0 |
|||
flipbookRows: 1 |
|||
flipbookColumns: 1 |
|||
maxTextureSizeSet: 0 |
|||
compressionQualitySet: 0 |
|||
textureFormatSet: 0 |
|||
ignorePngGamma: 0 |
|||
applyGammaDecoding: 0 |
|||
platformSettings: |
|||
- serializedVersion: 3 |
|||
buildTarget: DefaultTexturePlatform |
|||
maxTextureSize: 512 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: 4 |
|||
textureCompression: 1 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
androidETC2FallbackOverride: 0 |
|||
forceMaximumCompressionQuality_BC6H_BC7: 0 |
|||
- serializedVersion: 3 |
|||
buildTarget: Standalone |
|||
maxTextureSize: 512 |
|||
resizeAlgorithm: 0 |
|||
textureFormat: 4 |
|||
textureCompression: 1 |
|||
compressionQuality: 50 |
|||
crunchedCompression: 0 |
|||
allowsAlphaSplitting: 0 |
|||
overridden: 0 |
|||
androidETC2FallbackOverride: 0 |
|||
forceMaximumCompressionQuality_BC6H_BC7: 0 |
|||
spriteSheet: |
|||
serializedVersion: 2 |
|||
sprites: [] |
|||
outline: [] |
|||
physicsShape: [] |
|||
bones: [] |
|||
spriteID: 5e97eb03825dee720800000000000000 |
|||
internalID: 0 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
secondaryTextures: [] |
|||
spritePackingTag: |
|||
pSDRemoveMatte: 0 |
|||
pSDShowRemoveMatteOption: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 0fbc0b23edb7d984f9118daa0a2413cb |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
namespace LobbyRelaySample |
|||
{ |
|||
/// <summary>
|
|||
/// Holds a LocalMenuState value and notifies all subscribers when it has been changed.
|
|||
/// Check the GameManager in the mainScene for the list of observers being used in the project.
|
|||
/// </summary>
|
|||
public class LocalMenuStateObserver : ObserverBehaviour<LocalMenuState> { } |
|||
} |
|||
|
|||
namespace LobbyRelaySample |
|||
{ |
|||
public class LocalGameStateObserver : ObserverBehaviour<LocalGameState> { } |
|||
} |
|||
撰写
预览
正在加载...
取消
保存
Reference in new issue