charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 11:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkBehaviourInspector: syncInterval is shown if class only has synclist now too

Browse Source
This commit is contained in:
vis2k 2019-01-01 14:57:51 +01:00
parent 6eec19b205
commit f69452b761
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Mirror/Editor/NetworkBehaviourInspector.cs
View File

@ -13,7 +13,7 @@ public class NetworkBehaviourInspector : Editor
{ {
bool m_Initialized; bool m_Initialized;
protected List<string> m_SyncVarNames = new List<string>(); protected List<string> m_SyncVarNames = new List<string>();
bool m_HasOnSerialize; bool m_SyncsAnything;
bool[] m_ShowSyncLists; bool[] m_ShowSyncLists;
GUIContent m_SyncVarIndicatorContent; GUIContent m_SyncVarIndicatorContent;
@ -23,6 +23,36 @@ internal virtual bool hideScriptField
get { return false; } get { return false; }
} }
// does this type sync anything? otherwise we don't need to show syncInterval
bool SyncsAnything(Type scriptClass)
{
// has OnSerialize that is not in NetworkBehaviour?
// then it either has a syncvar or custom OnSerialize. either way
// this means we have something to sync.
MethodInfo method = scriptClass.GetMethod("OnSerialize");
if (method != null && method.DeclaringType != typeof(NetworkBehaviour))
{
return true;
}
// SyncObjects are serialized in NetworkBehaviour.OnSerialize, which
// is always there even if we don't use SyncObjects. so we need to
// search for SyncObjects manually.
// (look for 'Mirror.Sync'. not '.SyncObject' because we'd have to
// check base type for that again)
foreach (FieldInfo field in scriptClass.GetFields())
{
if (field.FieldType.BaseType != null &&
field.FieldType.BaseType.FullName != null &&
field.FieldType.BaseType.FullName.Contains("Mirror.Sync"))
{
return true;
}
}
return false;
}
void Init(MonoScript script) void Init(MonoScript script)
{ {
m_Initialized = true; m_Initialized = true;
@ -39,14 +69,6 @@ void Init(MonoScript script)
m_SyncVarNames.Add(field.Name); m_SyncVarNames.Add(field.Name);
} }
} }
var meth = script.GetClass().GetMethod("OnSerialize");
if (meth != null)
{
if (meth.DeclaringType != typeof(NetworkBehaviour))
{
m_HasOnSerialize = true;
}
}
int numSyncLists = 0; int numSyncLists = 0;
foreach (var f in serializedObject.targetObject.GetType().GetFields()) foreach (var f in serializedObject.targetObject.GetType().GetFields())
@ -60,6 +82,8 @@ void Init(MonoScript script)
{ {
m_ShowSyncLists = new bool[numSyncLists]; m_ShowSyncLists = new bool[numSyncLists];
} }
m_SyncsAnything = SyncsAnything(scriptClass);
} }
public override void OnInspectorGUI() public override void OnInspectorGUI()
@ -158,7 +182,7 @@ public override void OnInspectorGUI()
// only show SyncInterval if we have an OnSerialize function. // only show SyncInterval if we have an OnSerialize function.
// No need to show it if the class only has Cmds/Rpcs and no sync. // No need to show it if the class only has Cmds/Rpcs and no sync.
if (m_HasOnSerialize) if (m_SyncsAnything)
{ {
var beh = target as NetworkBehaviour; var beh = target as NetworkBehaviour;
if (beh != null) if (beh != null)