Skip to content

Commit 3a6b537

Browse files
committed
feat: add properties to LiteNetLibBehaviour
1 parent 1dd5bb8 commit 3a6b537

2 files changed

Lines changed: 46 additions & 36 deletions

File tree

Scripts/GameApi/LiteNetLibBehaviour.cs

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@ public byte SyncChannelId
7979
get { return Identity.SyncChannelId; }
8080
}
8181

82+
public byte DefaultRpcChannelId
83+
{
84+
get { return Identity.DefaultRpcChannelId; }
85+
}
86+
87+
public string SubChannelId
88+
{
89+
get { return Identity.SubChannelId; }
90+
}
91+
8292
public LiteNetLibGameManager Manager
8393
{
8494
get { return Identity.Manager; }
@@ -696,57 +706,57 @@ private void RegisterRPC(Dictionary<string, int> dict, string id, LiteNetLibFunc
696706
#region Elastic RPC with receivers and parameters
697707
public void RPC(NetFunctionDelegate func, FunctionReceivers receivers)
698708
{
699-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers);
709+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers);
700710
}
701711

702712
public void RPC<T1>(NetFunctionDelegate<T1> func, FunctionReceivers receivers, T1 param1)
703713
{
704-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1);
714+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1);
705715
}
706716

707717
public void RPC<T1, T2>(NetFunctionDelegate<T1, T2> func, FunctionReceivers receivers, T1 param1, T2 param2)
708718
{
709-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2);
719+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2);
710720
}
711721

712722
public void RPC<T1, T2, T3>(NetFunctionDelegate<T1, T2, T3> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3)
713723
{
714-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3);
724+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3);
715725
}
716726

717727
public void RPC<T1, T2, T3, T4>(NetFunctionDelegate<T1, T2, T3, T4> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4)
718728
{
719-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4);
729+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4);
720730
}
721731

722732
public void RPC<T1, T2, T3, T4, T5>(NetFunctionDelegate<T1, T2, T3, T4, T5> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
723733
{
724-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5);
734+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5);
725735
}
726736

727737
public void RPC<T1, T2, T3, T4, T5, T6>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
728738
{
729-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6);
739+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6);
730740
}
731741

732742
public void RPC<T1, T2, T3, T4, T5, T6, T7>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
733743
{
734-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7);
744+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7);
735745
}
736746

737747
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
738748
{
739-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7, param8);
749+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7, param8);
740750
}
741751

742752
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8, T9> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, T9 param9)
743753
{
744-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7, param8, param9);
754+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7, param8, param9);
745755
}
746756

747757
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> func, FunctionReceivers receivers, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, T9 param9, T10 param10)
748758
{
749-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10);
759+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, receivers, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10);
750760
}
751761
#endregion
752762

@@ -810,57 +820,57 @@ public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(NetFunctionDelegate<T1,
810820
#region All RPC or Server RPC with parameters
811821
public void RPC(NetFunctionDelegate func)
812822
{
813-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered);
823+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered);
814824
}
815825

816826
public void RPC<T1>(NetFunctionDelegate<T1> func, T1 param1)
817827
{
818-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1);
828+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1);
819829
}
820830

821831
public void RPC<T1, T2>(NetFunctionDelegate<T1, T2> func, T1 param1, T2 param2)
822832
{
823-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2);
833+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2);
824834
}
825835

826836
public void RPC<T1, T2, T3>(NetFunctionDelegate<T1, T2, T3> func, T1 param1, T2 param2, T3 param3)
827837
{
828-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3);
838+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3);
829839
}
830840

831841
public void RPC<T1, T2, T3, T4>(NetFunctionDelegate<T1, T2, T3, T4> func, T1 param1, T2 param2, T3 param3, T4 param4)
832842
{
833-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4);
843+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4);
834844
}
835845

836846
public void RPC<T1, T2, T3, T4, T5>(NetFunctionDelegate<T1, T2, T3, T4, T5> func, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
837847
{
838-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5);
848+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5);
839849
}
840850

841851
public void RPC<T1, T2, T3, T4, T5, T6>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6> func, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
842852
{
843-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6);
853+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6);
844854
}
845855

846856
public void RPC<T1, T2, T3, T4, T5, T6, T7>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7> func, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
847857
{
848-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7);
858+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7);
849859
}
850860

851861
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8> func, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
852862
{
853-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7, param8);
863+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7, param8);
854864
}
855865

856866
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8, T9> func, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, T9 param9)
857867
{
858-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7, param8, param9);
868+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7, param8, param9);
859869
}
860870

861871
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> func, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, T9 param9, T10 param10)
862872
{
863-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10);
873+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10);
864874
}
865875
#endregion
866876

@@ -924,57 +934,57 @@ public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(NetFunctionDelegate<T1,
924934
#region Target RPC with parameters
925935
public void RPC(NetFunctionDelegate func, long connectionId)
926936
{
927-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId);
937+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId);
928938
}
929939

930940
public void RPC<T1>(NetFunctionDelegate<T1> func, long connectionId, T1 param1)
931941
{
932-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1);
942+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1);
933943
}
934944

935945
public void RPC<T1, T2>(NetFunctionDelegate<T1, T2> func, long connectionId, T1 param1, T2 param2)
936946
{
937-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2);
947+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2);
938948
}
939949

940950
public void RPC<T1, T2, T3>(NetFunctionDelegate<T1, T2, T3> func, long connectionId, T1 param1, T2 param2, T3 param3)
941951
{
942-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3);
952+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3);
943953
}
944954

945955
public void RPC<T1, T2, T3, T4>(NetFunctionDelegate<T1, T2, T3, T4> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4)
946956
{
947-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4);
957+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4);
948958
}
949959

950960
public void RPC<T1, T2, T3, T4, T5>(NetFunctionDelegate<T1, T2, T3, T4, T5> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
951961
{
952-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5);
962+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5);
953963
}
954964

955965
public void RPC<T1, T2, T3, T4, T5, T6>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
956966
{
957-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6);
967+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6);
958968
}
959969

960970
public void RPC<T1, T2, T3, T4, T5, T6, T7>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
961971
{
962-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7);
972+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7);
963973
}
964974

965975
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
966976
{
967-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7, param8);
977+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7, param8);
968978
}
969979

970980
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8, T9> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, T9 param9)
971981
{
972-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7, param8, param9);
982+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7, param8, param9);
973983
}
974984

975985
public void RPC<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(NetFunctionDelegate<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> func, long connectionId, T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8, T9 param9, T10 param10)
976986
{
977-
RPC(func.Method.Name, Identity.DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10);
987+
RPC(func.Method.Name, DefaultRpcChannelId, DeliveryMethod.ReliableOrdered, connectionId, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10);
978988
}
979989
#endregion
980990

Scripts/GameApi/LiteNetLibIdentity.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public sealed class LiteNetLibIdentity : MonoBehaviour
5050
private byte syncChannelId = 0;
5151
[SerializeField, Tooltip("Default RPCs channel ID")]
5252
private byte defaultRpcChannelId = 0;
53+
[SerializeField, Tooltip("If objects have differences `Sub Channel ID` it will not being subscribed")]
54+
private string subChannelId = string.Empty;
5355
[SerializeField, Tooltip("If this is <= 0f, it will uses interest manager's `defaultVisibleRange` setting")]
5456
private float visibleRange = 0f;
5557
[SerializeField, Tooltip("If this is `TRUE` it will always visible no matter how far from player's objects")]
@@ -58,8 +60,6 @@ public sealed class LiteNetLibIdentity : MonoBehaviour
5860
private bool doNotDestroyWhenDisconnect = false;
5961
[SerializeField, Tooltip("If this is > 0, it will get instance from pooling system")]
6062
private int poolingSize = 0;
61-
[SerializeField, Tooltip("If objects have differences `sub channel ID` it will not being subscribed")]
62-
private string subChannelId = string.Empty;
6363
#if !UNITY_SERVER
6464
[SerializeField]
6565
private bool forceRenderingOffWhileHidding = true;
@@ -163,11 +163,11 @@ public int HashSceneObjectId
163163
public uint ObjectId { get { return networkedObjectId; } internal set { networkedObjectId = value; } }
164164
public byte SyncChannelId { get { return syncChannelId; } }
165165
public byte DefaultRpcChannelId { get { return defaultRpcChannelId; } }
166+
public string SubChannelId { get { return subChannelId; } set { subChannelId = value; } }
166167
public float VisibleRange { get { return visibleRange; } set { visibleRange = value; } }
167168
public bool AlwaysVisible { get { return alwaysVisible; } set { alwaysVisible = value; } }
168169
public bool DoNotDestroyWhenDisconnect { get { return doNotDestroyWhenDisconnect; } set { doNotDestroyWhenDisconnect = value; } }
169170
public int PoolingSize { get { return poolingSize; } set { poolingSize = value; } }
170-
public string SubChannelId { get { return subChannelId; } set { subChannelId = value; } }
171171
/// <summary>
172172
/// If this is `TRUE` it will disallow other connections to subscribe this networked object
173173
/// </summary>

0 commit comments

Comments
 (0)