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

fix: removing warnings on project launch [MTT-9362] #896

Merged
merged 17 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
4 changes: 0 additions & 4 deletions Assets/Models/Animated.meta

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

4 changes: 2 additions & 2 deletions Assets/Scripts/ConnectionManagement/ConnectionMethod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ public override void SetupClientConnection()
utp.SetConnectionData(m_Ipaddress, m_Port);
}

public override async Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
public override Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
{
// Nothing to do here
return (true, true);
return Task.FromResult((true, true));
}

public override void SetupHostConnection()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void StartingClientFailed()
m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
}

internal async Task ConnectClientAsync()
internal void ConnectClientAsync()
{
try
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ IEnumerator ReconnectCoroutine()
if (!reconnectingSetupTask.IsFaulted && reconnectingSetupTask.Result.success)
{
// If this fails, the OnClientDisconnect callback will be invoked by Netcode
var connectingTask = ConnectClientAsync();
yield return new WaitUntil(() => connectingTask.IsCompleted);
ConnectClientAsync();
}
else
{
Expand Down
4 changes: 0 additions & 4 deletions Assets/Textures/UI/button_Disabled.png.meta

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

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@ Additional documentation and release notes are available at [Multiplayer Documen
* com.unity.multiplayer.playmode from v1.3.2 to v1.3.3
* com.unity.multiplayer.tools from v2.2.1 to v2.2.3
* com.unity.netcode.gameobjects from v2.0.0 to v2.1.1
* VContainer package upgraded from v1.11.0 to v1.14.0 (#896) This upgrade removes warning messages related to IL weaving as code gen is refactored in v1.14.0

### Cleanup
* Removed ParrelSync from the project (#890)
* Removed warnings on first project launch (#896) Included:
* Asset meta files with merge conflicts resolved
* RenderGraph compatibility mode disabled

### Fixed
* Fix a Healer ability doesn't work (#893)
Expand Down
2 changes: 1 addition & 1 deletion Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10",
"com.unity.transport": "2.4.0",
"com.unity.ugui": "2.0.0",
"jp.hadashikick.vcontainer": "1.11.0",
"jp.hadashikick.vcontainer": "1.14.0",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
6 changes: 2 additions & 4 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -450,12 +450,10 @@
}
},
"jp.hadashikick.vcontainer": {
"version": "1.11.0",
"version": "1.14.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.nuget.mono-cecil": "1.10.1"
},
"dependencies": {},
"url": "https://package.openupm.com"
},
"com.unity.modules.accessibility": {
Expand Down
Loading