Runner初期化処理見直し

Author: mimyquality

Packages/com.mimylab.raceassemblytoolkit/Runtime/Scripts/Core/RaceDriverAsPlayer.cs

@@ -19,7 +19,7 @@ public class RaceDriverAsPlayer : RaceDriver
     {
         private void Start()
         {
-            _SetDriver();
+            SendCustomEventDelayedFrames(nameof(_SetDriver), 1);
         }
     }
 }

Packages/com.mimylab.raceassemblytoolkit/Runtime/Scripts/Core/RaceRunner.asset

@@ -350,19 +350,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: timeDisplay
+      Data: playerRecord
     - Name: $v
       Entry: 7
       Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: timeDisplay
+      Data: playerRecord
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 22|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: MimyLab.RaceAssemblyToolkit.RaceRunnerTimeDisplay, RaceAssemblyToolkit
+      Data: MimyLab.RaceAssemblyToolkit.PlayerRecord, RaceAssemblyToolkit
     - Name: 
       Entry: 8
       Data: 
@@ -410,19 +410,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: playerRecord
+      Data: _timeDisplay
     - Name: $v
       Entry: 7
       Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: playerRecord
+      Data: _timeDisplay
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 26|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: MimyLab.RaceAssemblyToolkit.PlayerRecord, RaceAssemblyToolkit
+      Data: MimyLab.RaceAssemblyToolkit.RaceRunnerTimeDisplay, RaceAssemblyToolkit
     - Name: 
       Entry: 8
       Data: 

Packages/com.mimylab.raceassemblytoolkit/Runtime/Scripts/Core/RaceRunner.cs

@@ -30,9 +30,9 @@ public class RaceRunner : UdonSharpBehaviour
         [SerializeField]
         private AudioClip _soundGoal;
 
-        internal RaceRunnerTimeDisplay timeDisplay;
         internal PlayerRecord playerRecord;
 
+        private RaceRunnerTimeDisplay _timeDisplay;
         private VRCPlayerApi _driver;
         private CourseDescriptor _entriedCourse;
         private Checkpoint[] _entriedCheckpoints = new Checkpoint[0];
@@ -49,7 +49,7 @@ private void Update()
             if (currentTime != _currentTime)
             {
                 _currentTime = currentTime;
-                if (timeDisplay) { timeDisplay.CurrentTime = currentTime; }
+                if (_timeDisplay) { _timeDisplay.CurrentTime = currentTime; }
             }
         }
 
@@ -158,14 +158,27 @@ public TimeSpan GetGoalTime()
             return GetSplitTime(_sectionClocks.Length - 1);
         }
 
-        public void SetDriver(VRCPlayerApi driver)
+        internal void SetTimeDisplay(RaceRunnerTimeDisplay timeDisplay)
+        {
+            if (!timeDisplay) { return; }
+
+            _timeDisplay = timeDisplay;
+            _timeDisplay.RunnerName = runnerName;
+        }
+
+        internal void SetDriver(VRCPlayerApi driver)
         {
             if (!Utilities.IsValid(driver)) { return; }
 
             if (_driver != driver)
             {
                 _driver = driver;
-                if (timeDisplay) { timeDisplay.DriverName = driver.displayName; }
+                CountReset();
+
+                if (_timeDisplay)
+                {
+                    _timeDisplay.DriverName = driver.displayName;
+                }
             }
         }
 
@@ -181,11 +194,10 @@ private void EntryCourse(CourseDescriptor course)
 
             _nextCheckpoint = GetNextCheckpoint(_entriedCheckpoints[0]);
 
-            if (timeDisplay)
+            if (_timeDisplay)
             {
-                timeDisplay.RunnerName = runnerName;
-                timeDisplay.EntriedCourseName = _entriedCourse.courseName;
-                timeDisplay.LapCount = _lapCount;
+                _timeDisplay.EntriedCourseName = _entriedCourse.courseName;
+                _timeDisplay.LapCount = _lapCount;
             }
         }
 
@@ -204,19 +216,42 @@ private Checkpoint GetNextCheckpoint(Checkpoint currentCheckpoint)
 
         private bool _isCounting;
 
+        private void CountReset()
+        {
+            _entriedCourse = null;
+            _entriedCheckpoints = new Checkpoint[0];
+            _lapCount = 0;
+            playerRecord = null;
+            _nextCheckpoint = null;
+            _currentLap = 0;
+            _currentSection = 0;
+            _sectionClocks = new double[1];
+            _isCounting = false;
+
+            if (_timeDisplay)
+            {
+                _timeDisplay.EntriedCourseName = "";
+                _timeDisplay.LapCount = _lapCount;
+                _timeDisplay.CurrentLap = _currentLap;
+                _timeDisplay.LastSectionTime = GetCurrentSectionTime();
+                _timeDisplay.LastSplitTime = GetCurrentSplitTime();
+                _timeDisplay.LastLapTime = GetCurrentLapTime();
+            }
+        }
+
         private void CountStart(double triggerClock)
         {
             _currentLap = 0;
             _currentSection = 0;
             _sectionClocks[_currentSection] = triggerClock;
             _isCounting = true;
 
-            if (timeDisplay)
+            if (_timeDisplay)
             {
-                timeDisplay.CurrentLap = _currentLap;
-                timeDisplay.LastSectionTime = GetCurrentSectionTime();
-                timeDisplay.LastSplitTime = GetCurrentSplitTime();
-                timeDisplay.LastLapTime = GetCurrentLapTime();
+                _timeDisplay.CurrentLap = _currentLap;
+                _timeDisplay.LastSectionTime = GetCurrentSectionTime();
+                _timeDisplay.LastSplitTime = GetCurrentSplitTime();
+                _timeDisplay.LastLapTime = GetCurrentLapTime();
             }
 
             if (_speaker && _soundStart) { _speaker.PlayOneShot(_soundStart); }
@@ -227,10 +262,10 @@ private void CountSection(double triggerClock)
             _currentSection++;
             _sectionClocks[_currentSection] = triggerClock;
 
-            if (timeDisplay)
+            if (_timeDisplay)
             {
-                timeDisplay.LastSectionTime = GetCurrentSectionTime();
-                timeDisplay.LastSplitTime = GetCurrentSplitTime();
+                _timeDisplay.LastSectionTime = GetCurrentSectionTime();
+                _timeDisplay.LastSplitTime = GetCurrentSplitTime();
             }
 
             if (_speaker && _soundCheckpoint) { _speaker.PlayOneShot(_soundCheckpoint); }
@@ -240,10 +275,10 @@ private void CountLap()
         {
             _currentLap++;
 
-            if (timeDisplay)
+            if (_timeDisplay)
             {
-                timeDisplay.CurrentLap = _currentLap;
-                timeDisplay.LastLapTime = GetCurrentLapTime();
+                _timeDisplay.CurrentLap = _currentLap;
+                _timeDisplay.LastLapTime = GetCurrentLapTime();
             }
         }
 

Packages/com.mimylab.raceassemblytoolkit/Runtime/Scripts/Core/RaceRunnerTimeDisplay.cs

@@ -167,16 +167,7 @@ public TimeSpan LastLapTime
 
         private void Start()
         {
-            if (_runnerNameText) { _runnerName = _runnerNameText.text; }
-            if (_driverNameText) { _driverName = _driverNameText.text; }
-            if (_entriedCourseNameText) { _entriedCourseName = _entriedCourseNameText.text; }
-            SetLapCountText(_currentLap, _lapCount);
-            if (_currentTimeText) { _currentTimeText.text = _currentTime.ToString(_timeFormat); }
-            if (_lastSectionTimeText) { _lastSectionTimeText.text = _lastSectionTime.ToString(_timeFormat); }
-            if (_lastSplitTimeText) { _lastSplitTimeText.text = _lastSplitTime.ToString(_timeFormat); }
-            if (_lastLapTimeText) { _lastLapTimeText.text = _lastLapTime.ToString(_timeFormat); }
-
-            _targetRunner.timeDisplay = this;
+            _targetRunner.SetTimeDisplay(this);
         }
 
         private void SetLapCountText(int current, int count)