浏览代码

Brought in latest GA packages and made sure we have working game and relay.

/main/staging/2021_Upgrade/Async_Refactor/GA_Package-Upgrade
当前提交
cf8e07d7
共有 5 个文件被更改,包括 66 次插入63 次删除
  1. 1
      Assets/Scenes/mainScene.unity
  2. 7
      Assets/Scripts/GameLobby/Game/GameManager.cs
  3. 25
      Packages/manifest.json
  4. 92
      Packages/packages-lock.json
  5. 4
      ProjectSettings/ProjectVersion.txt

1
Assets/Scenes/mainScene.unity


m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit

7
Assets/Scripts/GameLobby/Game/GameManager.cs


public LocalLobby LocalLobby => m_LocalLobby;
public LobbyUser LocalUser => m_LocalUser;
public Action<GameState> onGameStateChanged;
public GameState LocalGameState { get; private set; }
public LobbyManager LobbyManager { get; private set; }

{
bool isLeavingLobby = (state == GameState.Menu || state == GameState.JoinMenu) &&
LocalGameState == GameState.Lobby;
LocalGameState = state;
LocalGameState = state;
onGameStateChanged.Invoke(LocalGameState);
m_LocalMenuState.State = LocalGameState;
}
void SetCurrentLobbies(IEnumerable<LocalLobby> lobbies)

m_LobbySynchronizer.StartSynch(m_LocalLobby, m_LocalUser);
SetUserLobbyState();
StartVivoxJoin();
StartRelayConnection();
}
void LeaveLobby()

}
}
}
void StartVivoxLogin()
{

25
Packages/manifest.json


{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "1.15.15",
"com.unity.collections": "1.0.0-pre.6",
"com.unity.ide.rider": "3.0.13",
"com.unity.ide.visualstudio": "2.0.14",
"com.unity.collab-proxy": "1.17.2",
"com.unity.collections": "1.2.4",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.netcode.gameobjects": "1.0.0-pre.9",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.render-pipelines.universal": "12.1.6",
"com.unity.services.authentication": "2.0.0",
"com.unity.services.core": "1.2.0",
"com.unity.services.lobby": "1.0.1",
"com.unity.services.relay": "1.0.1-pre.3",
"com.unity.netcode.gameobjects": "1.0.2",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.render-pipelines.universal": "12.1.7",
"com.unity.services.authentication": "2.2.0",
"com.unity.services.core": "1.4.3",
"com.unity.services.lobby": "1.0.3",
"com.unity.services.relay": "1.0.4",
"com.unity.services.wire": "1.0.0",
"com.unity.transport": "1.0.0-pre.9",
"com.unity.transport": "1.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

92
Packages/packages-lock.json


"dependencies": {}
},
"com.unity.burst": {
"version": "1.6.5",
"version": "1.7.3",
"depth": 1,
"source": "registry",
"dependencies": {

},
"com.unity.collab-proxy": {
"version": "1.15.15",
"version": "1.17.2",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.collections": {
"version": "1.2.3",
"depth": 2,
"version": "1.2.4",
"depth": 0,
"com.unity.burst": "1.6.4",
"com.unity.burst": "1.6.6",
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.com"

"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.13",
"version": "3.0.15",
"depth": 0,
"source": "registry",
"dependencies": {

},
"com.unity.ide.visualstudio": {
"version": "2.0.14",
"version": "2.0.16",
"depth": 0,
"source": "registry",
"dependencies": {

"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.5",
"version": "1.2.6",
"depth": 1,
"source": "registry",
"dependencies": {},

"version": "1.0.0-pre.9",
"version": "1.0.2",
"com.unity.transport": "1.0.0"
"com.unity.transport": "1.2.0"
},
"url": "https://packages.unity.com"
},

},
"com.unity.nuget.newtonsoft-json": {
"version": "3.0.2",
"depth": 1,
"depth": 0,
"version": "12.1.6",
"version": "12.1.7",
"depth": 1,
"source": "builtin",
"dependencies": {

}
},
"com.unity.render-pipelines.universal": {
"version": "12.1.6",
"version": "12.1.7",
"com.unity.burst": "1.5.0",
"com.unity.render-pipelines.core": "12.1.6",
"com.unity.shadergraph": "12.1.6"
"com.unity.burst": "1.7.3",
"com.unity.render-pipelines.core": "12.1.7",
"com.unity.shadergraph": "12.1.7"
}
},
"com.unity.searcher": {

"url": "https://packages.unity.com"
},
"com.unity.services.authentication": {
"version": "2.0.0",
"version": "2.2.0",
"com.unity.services.core": "1.3.1",
"com.unity.modules.unitywebrequest": "1.0.0"
"com.unity.services.core": "1.4.3",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.ugui": "1.0.0"
"version": "1.4.0",
"depth": 1,
"version": "1.4.3",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0",

"url": "https://packages.unity.com"
},
"com.unity.services.lobby": {
"version": "1.0.1",
"version": "1.0.3",
"depth": 0,
"source": "registry",
"dependencies": {

},
"url": "https://packages.unity.com"
},
"com.unity.services.qos": {
"version": "1.0.2",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.4.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.services.authentication": "2.0.0",
"com.unity.collections": "1.2.4"
},
"url": "https://packages.unity.com"
},
"version": "1.0.1-pre.3",
"version": "1.0.4",
"com.unity.services.core": "1.1.0-pre.10",
"com.unity.services.core": "1.4.0",
"com.unity.services.authentication": "2.0.0",
"com.unity.services.qos": "1.0.2",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.services.authentication": "1.0.0-pre.6",
"com.unity.transport": "1.0.0-pre.6"
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.transport": "1.1.0"
},
"url": "https://packages.unity.com"
},

},
"url": "https://packages.unity.com"
},
"com.unity.services.wire": {
"version": "1.0.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.2.0",
"com.unity.nuget.newtonsoft-json": "3.0.1",
"com.unity.services.authentication": "1.0.0-pre.37"
},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "2.0.0",
"depth": 1,

},
"com.unity.shadergraph": {
"version": "12.1.6",
"version": "12.1.7",
"com.unity.render-pipelines.core": "12.1.6",
"com.unity.render-pipelines.core": "12.1.7",
"com.unity.searcher": "4.9.1"
}
},

"url": "https://packages.unity.com"
},
"com.unity.transport": {
"version": "1.0.0",
"version": "1.2.0",
"com.unity.collections": "1.2.3",
"com.unity.burst": "1.6.4",
"com.unity.mathematics": "1.2.5"
"com.unity.collections": "1.2.4",
"com.unity.burst": "1.6.6",
"com.unity.mathematics": "1.2.6"
},
"url": "https://packages.unity.com"
},

4
ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2021.2.19f1
m_EditorVersionWithRevision: 2021.2.19f1 (602ecdbb2fb0)
m_EditorVersion: 2021.3.9f1
m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536)
正在加载...
取消
保存