Removed #if ENABLE_UNET everywhere

This commit is contained in:
vis2k 2018-08-24 17:42:32 +02:00 committed by Paul Pacheco
parent abdb47bcaf
commit 97fec79687
39 changed files with 3 additions and 89 deletions

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEditor; using UnityEditor;
using UnityEditor.Animations; using UnityEditor.Animations;
@ -93,4 +92,3 @@ void DrawControls()
} }
} }
} }
#endif

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -170,4 +169,3 @@ public override void OnInspectorGUI()
} }
} }
} //namespace } //namespace
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
@ -119,4 +118,3 @@ public override void OnInspectorGUI()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEditor; using UnityEditor;
@ -281,4 +280,3 @@ static NetworkIdentityInfo GetBoolean(string name, bool value)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,5 +1,4 @@
#if ENABLE_UNET using System;
using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using UnityEditor; using UnityEditor;
@ -382,4 +381,3 @@ internal void RemoveButton(ReorderableList list)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEditor; using UnityEditor;
@ -378,4 +377,3 @@ public override void OnInspectorGUI()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEditor; using UnityEditor;
@ -108,4 +107,3 @@ void GetNetworkInformation(NetworkManager man)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System.Text; using System.Text;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -173,4 +172,3 @@ public static void OnPostProcessScene()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using System.Collections; using System.Collections;
@ -135,4 +134,3 @@ public override void OnInspectorGUI()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
@ -209,4 +208,3 @@ public override void OnInspectorGUI()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
@ -83,4 +82,3 @@ void GetNetworkInformation(GameObject gameObject)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -720,4 +719,3 @@ static void CheckForOwner(NetworkIdentity uv)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,8 +1,6 @@
using System; using System;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
[AttributeUsage(AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Class)]
@ -58,4 +56,3 @@ public class ClientCallbackAttribute : Attribute
{ {
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -131,4 +130,3 @@ internal void InvokeBytesOnClient(byte[] buffer)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,8 +1,6 @@
using System; using System;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
// a server's connection TO a LocalClient. // a server's connection TO a LocalClient.
@ -46,4 +44,3 @@ protected override bool SendBytes(byte[] bytes)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,7 +1,6 @@
using System; using System;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
public class LogFilter public class LogFilter
@ -26,4 +25,3 @@ public enum FilterLevel
static public bool logError { get { return currentLogLevel <= FilterLevel.Error; } } static public bool logError { get { return currentLogLevel <= FilterLevel.Error; } }
} }
} }
#endif //ENABLE_UNET

View File

@ -2,8 +2,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
// This can't be an interface because users don't need to implement the // This can't be an interface because users don't need to implement the
@ -469,4 +467,3 @@ public override void Serialize(NetworkWriter writer)
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
@ -478,4 +477,3 @@ static internal void OnAnimationTriggerClientMessage(NetworkMessage netMsg)
} }
} }
} }
#endif

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -593,4 +592,3 @@ public virtual float GetNetworkSendInterval()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
@ -315,4 +314,3 @@ internal static void SetActive(bool state)
} }
}; };
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
@ -353,4 +352,3 @@ internal void ResumeHandling()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
@ -88,4 +87,3 @@ public override string ToString()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
@ -1069,4 +1068,3 @@ static internal void UNetStaticUpdate()
} }
}; };
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
@ -51,4 +50,3 @@ public override string ToString()
internal static NetworkInstanceId Zero = new NetworkInstanceId(0); internal static NetworkInstanceId Zero = new NetworkInstanceId(0);
} }
} }
#endif

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Linq; using System.Linq;
@ -877,4 +876,3 @@ public virtual void OnStopHost()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -4,8 +4,6 @@
using System.ComponentModel; using System.ComponentModel;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
[AddComponentMenu("Network/NetworkManagerHUD")] [AddComponentMenu("Network/NetworkManagerHUD")]
@ -121,4 +119,3 @@ void OnGUI()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -120,4 +119,3 @@ public override void OnSetLocalVisibility(bool vis)
} }
} }
} }
#endif

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.IO; using System.IO;
using UnityEngine; using UnityEngine;
@ -325,4 +324,3 @@ public override string ToString()
} }
}; };
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -270,4 +269,3 @@ internal void DumpAllClientObjects()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
@ -48,4 +47,3 @@ public override string ToString()
public uint Value { get { return m_Value; } } public uint Value { get { return m_Value; } }
} }
} }
#endif

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -1388,4 +1387,3 @@ static public bool SpawnObjects()
} }
}; };
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
@ -19,4 +18,3 @@ public void OnDestroy()
} }
} }
} }
#endif

View File

@ -1,7 +1,5 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
using UnityEngine;
namespace Mirror namespace Mirror
{ {
@ -455,4 +453,3 @@ public override float GetNetworkSendInterval()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using UnityEngine; using UnityEngine;
@ -1568,4 +1567,3 @@ public override void OnStartAuthority()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using UnityEngine; using UnityEngine;
@ -165,4 +164,3 @@ static void CreateLineMaterial()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.IO; using System.IO;
using UnityEngine; using UnityEngine;
@ -382,4 +381,3 @@ public void Write(MessageBase msg)
} }
}; };
} }
#endif //ENABLE_UNET

View File

@ -1,7 +1,6 @@
using System; using System;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
// This class represents the player entity in a network game, there can be multiple players per client // This class represents the player entity in a network game, there can be multiple players per client
@ -35,4 +34,3 @@ public override string ToString()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,4 +1,3 @@
#if ENABLE_UNET
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@ -413,4 +412,3 @@ IEnumerator IEnumerable.GetEnumerator()
} }
} }
} }
#endif //ENABLE_UNET

View File

@ -1,8 +1,6 @@
using System; using System;
using UnityEngine; using UnityEngine;
#if ENABLE_UNET
namespace Mirror namespace Mirror
{ {
// Handles network messages on client and server // Handles network messages on client and server
@ -137,6 +135,3 @@ public static bool UnpackMessage(byte[] message, out ushort msgType, out byte[]
} }
} }
} }
#endif //ENABLE_UNET