Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
Caiyanpeng committed 2021-12-21 10:47:00 +08:00
commit 4b3dad0b84
4 files changed
+27 -13

No files matched your search

+1 -1
View File
@@ -46,8 +46,8 @@ public class Loom : MonoBehaviour
DontDestroyOnLoad(g);
_current = g.AddComponent<Loom>();
MapUDPService.Init();
MapUDPService.Send(0, App.CurrentUser.Id, new double[] { -1d, -1d }, competitionId: 0);
}
}
private List<Action> _actions = new List<Action>();