Unstable 0.17.5.0

2022-03-30 01:20:59 +09:00
parent c1b8e5a341
commit 44ded0225a
88 changed files with 2033 additions and 1430 deletions
@@ -116,7 +116,8 @@ namespace Barotrauma.Networking
        StartRound,
        PurchaseAndSwitchSub,
        PurchaseSub,
-        SwitchSub
+        SwitchSub,
+        TransferMoney
    }

    public enum ReadyCheckState
@@ -179,11 +180,11 @@ namespace Barotrauma.Networking
        
        protected ServerSettings serverSettings;

+        public Voting Voting { get; protected set; }
+
        protected TimeSpan updateInterval;
        protected DateTime updateTimer;

-        public int EndVoteCount, EndVoteMax, SubmarineVoteYesCount, SubmarineVoteNoCount, SubmarineVoteMax;
-
        protected bool gameStarted;

        protected RespawnManager respawnManager;