🐛 fix: Fix frequency desync caused by initialization

esnya · Jul 25, 2022 · da5e852 · da5e852
1 parent 44771a2
commit da5e852
Show file tree

Hide file tree

Showing 10 changed files with 4,347 additions and 1,363 deletions.
diff --git a/Packages/com.nekometer.esnya.udon-radio-communications/Demo.unity b/Packages/com.nekometer.esnya.udon-radio-communications/Demo.unity
diff --git a/Packages/com.nekometer.esnya.udon-radio-communications/PickupTransceiver.prefab b/Packages/com.nekometer.esnya.udon-radio-communications/PickupTransceiver.prefab
diff --git a/....nekometer.esnya.udon-radio-communications/SampleAssets/UdonRadioCommunicationDemo.prefab b/....nekometer.esnya.udon-radio-communications/SampleAssets/UdonRadioCommunicationDemo.prefab
diff --git a/Packages/com.nekometer.esnya.udon-radio-communications/Scripts/Receiver.cs b/Packages/com.nekometer.esnya.udon-radio-communications/Scripts/Receiver.cs
@@ -79,7 +79,7 @@ private void Start()
         public void _Initialize(UdonRadioCommunication urc)
         {
             this.urc = urc;
-            Frequency = urc.defaultFrequency;
+            if (Networking.IsOwner(gameObject)) Frequency = urc.defaultFrequency;
         }
 
         public void _TakeOwnership()

diff --git a/Packages/com.nekometer.esnya.udon-radio-communications/Scripts/Transceiver.cs b/Packages/com.nekometer.esnya.udon-radio-communications/Scripts/Transceiver.cs
@@ -34,17 +34,21 @@ public float Frequency
         {
             set
             {
-                var isOwner = Networking.IsOwner(gameObject);
-                if (!receiver.sync || isOwner) receiver.Frequency = value;
-                if (isOwner) transmitter._SetFrequency(value);
+                if (Networking.IsOwner(gameObject))
+                {
+                    receiver.Frequency = value;
+                    transmitter._SetFrequency(value);
+                }
 
                 _frequency = value;
                 _UpdateFrequencyText();
             }
             get => _frequency;
         }
 
-        [UdonSynced][FieldChangeCallback(nameof(Receive))] private bool _receive;
+        [UdonSynced]
+        [FieldChangeCallback(nameof(Receive))]
+        private bool _receive;
         private bool Receive
         {
             set
@@ -100,7 +104,7 @@ public void _Initialize(UdonRadioCommunication urc)
             frequencyStep = urc.frequencyStep;
             fastFrequencyStep = urc.fastFrequencyStep;
 
-            Frequency = urc.defaultFrequency;
+            if (Networking.IsOwner(gameObject)) Frequency = urc.defaultFrequency;
         }
 
         public void _TakeOwnership()

diff --git a/Packages/com.nekometer.esnya.udon-radio-communications/Scripts/Transmitter.cs b/Packages/com.nekometer.esnya.udon-radio-communications/Scripts/Transmitter.cs
@@ -51,7 +51,7 @@ private void Start()
         public void _Initialize(UdonRadioCommunication urc)
         {
             this.urc = urc;
-            Frequency = urc.defaultFrequency;
+            if (Networking.IsOwner(gameObject)) Frequency = urc.defaultFrequency;
         }
 
         public void _TakeOwnership()

diff --git a/...a.udon-radio-communications/SerializedUdonPrograms/00b1b96886267264684ade035feca167.asset b/...a.udon-radio-communications/SerializedUdonPrograms/00b1b96886267264684ade035feca167.asset
diff --git a/...a.udon-radio-communications/SerializedUdonPrograms/43b48c4effda8a44880d27886c5e8c89.asset b/...a.udon-radio-communications/SerializedUdonPrograms/43b48c4effda8a44880d27886c5e8c89.asset
diff --git a/...a.udon-radio-communications/SerializedUdonPrograms/f00300c034c479448aaf3630722ef77d.asset b/...a.udon-radio-communications/SerializedUdonPrograms/f00300c034c479448aaf3630722ef77d.asset
diff --git a/Packages/com.nekometer.esnya.udon-radio-communications/StaticTransceiver.prefab b/Packages/com.nekometer.esnya.udon-radio-communications/StaticTransceiver.prefab