fix asset unloading jank with karate man

Assets/Scripts/Games/KarateMan/KarateMan.cs

@@ -59,7 +59,8 @@ namespace HeavenStudio.Games.Loaders
                     e.CreateProperty("ease", fade ? (int)Util.EasingFunction.Ease.Linear : (int)Util.EasingFunction.Ease.Instant);
                     e.CreateProperty("fxType", !fade ? (int)e["type3"] : 3);
 
-                    foreach (var remove in toRemove) {
+                    foreach (var remove in toRemove)
+                    {
                         e.dynamicData.Remove(remove);
                     }
 
@@ -709,8 +710,6 @@ namespace HeavenStudio.Games
                 TintColor(BackgroundColors[0]),
                 new Color(),
             };
-
-            Update();
         }
 
         private void Start()
@@ -721,9 +720,12 @@ namespace HeavenStudio.Games
         public override void OnGameSwitch(double beat)
         {
             // queued objects
-            if (queuedCues.Count > 0) {
+            if (queuedCues.Count > 0)
-                foreach (var e in queuedCues) {
+            {
-                    switch (e.datamodel) {
+                foreach (var e in queuedCues)
+                {
+                    switch (e.datamodel)
+                    {
                         case "karateman/hit": CreateItem(e.beat, e["type"], e["type2"]); break;
                         case "karateman/bulb": CreateBulbSpecial(e.beat, e["type"], e["colorA"], e["type2"], e["sfx"], e["hitSfx"]); break;
                         case "karateman/kick": Kick(e.beat, e["toggle"], e["shouldGlow"], e["type"], e["pitchVoice"], e["forcePitch"], e["cutOut"], e["disableVoice"], e["woodColor"], e["hoopColor"]); break;
@@ -747,7 +749,8 @@ namespace HeavenStudio.Games
             List<RiqEntity> prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.datamodel.Split(0) == "karateman");
 
             RiqEntity voice = prevEntities.FindLast(c => c.beat < beat && c.datamodel == "karateman/warnings");
-            if (wordClearTime > beat && wordStartTime < beat && voice != null) {
+            if (wordClearTime > beat && wordStartTime < beat && voice != null)
+            {
                 DoWord(voice.beat, voice.length, voice["whichWarning"], false, 1, voice["customLength"], false);
             }
 
@@ -755,21 +758,27 @@ namespace HeavenStudio.Games
             RiqEntity bg = prevEntities.FindLast(c => c.beat <= beat && c.datamodel == "karateman/background appearance");
             RiqEntity obj = prevEntities.FindLast(c => c.beat <= beat && c.datamodel == "karateman/set object colors");
 
-            if (bg != null) {
+            if (bg != null)
+            {
                 BackgroundColor(
                     bg.beat, bg.length, bg["fxType"],
                     bg["presetBg"], bg["startColor"], bg["endColor"], bg["ease"],
                     bg["shadowType"], bg["shadowStart"], bg["shadowEnd"],
                     bg["textureType"], bg["autoColor"], bg["startTexture"], bg["endTexture"]
                 );
-            } else {
+            }
+            else
+            {
                 var c = new Color();
                 BackgroundColor(0, 0, 0, 0, c, c, (int)Util.EasingFunction.Ease.Instant, 0, c, c, 0, true, c, c);
             }
 
-            if (obj != null) {
+            if (obj != null)
+            {
                 UpdateMaterialColour(obj["colorA"], obj["colorB"], obj["colorC"], obj["colorD"], obj["star"]);
-            } else {
+            }
+            else
+            {
                 UpdateMaterialColour(Color.white, new Color(0.81f, 0.81f, 0.81f), Color.white, Color.white, (int)StarColorOption.ItemColor);
             }
 
@@ -779,7 +788,8 @@ namespace HeavenStudio.Games
 
             ToggleBop(0, 0, false, bop?["toggle"] ?? true);
 
-            if (flow != null) {
+            if (flow != null)
+            {
                 int fxType = bg == null || flow.beat > bg.beat ? flow["fxType"] : bg["fxType"];
                 SetGameplayMods(beat, fxType, flow["type"], flow["toggle"]);
             }
@@ -792,10 +802,10 @@ namespace HeavenStudio.Games
 
         private void Update()
         {
-            var cond = Conductor.instance;
+            var songPos = conductor.songPositionInBeatsAsDouble;
-            var songPos = cond.songPositionInBeatsAsDouble;
 
-            if (!cond.isPlaying) {
+            if (conductor != null && !conductor.isPlaying)
+            {
                 EntityPreCheck(songPos);
             }
 
@@ -812,7 +822,8 @@ namespace HeavenStudio.Games
                     break;
             }
 
-            if (songPos >= wordClearTime || songPos < wordStartTime) {
+            if (songPos >= wordClearTime || songPos < wordStartTime)
+            {
                 Word.Play("NoPose");
             }
 
@@ -823,7 +834,7 @@ namespace HeavenStudio.Games
                 float camZ = 0f;
                 if (songPos <= startCamSpecial + cameraReturnLength)
                 {
-                    float prog = cond.GetPositionFromBeat(startCamSpecial, cameraReturnLength);
+                    float prog = conductor.GetPositionFromBeat(startCamSpecial, cameraReturnLength);
                     camX = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.x, CameraPosition[1].position.x, prog);
                     camY = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.y, CameraPosition[1].position.y, prog);
                     camZ = Util.EasingFunction.EaseOutCubic(CameraPosition[0].position.z, CameraPosition[1].position.z, prog);
@@ -831,7 +842,7 @@ namespace HeavenStudio.Games
                 }
                 else if (songPos >= wantsReturn - cameraReturnLength)
                 {
-                    float prog = cond.GetPositionFromBeat(wantsReturn - cameraReturnLength, cameraReturnLength);
+                    float prog = conductor.GetPositionFromBeat(wantsReturn - cameraReturnLength, cameraReturnLength);
                     camX = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.x, CameraPosition[0].position.x, prog);
                     camY = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.y, CameraPosition[0].position.y, prog);
                     camZ = Util.EasingFunction.EaseOutQuad(CameraPosition[1].position.z, CameraPosition[0].position.z, prog);
@@ -856,10 +867,12 @@ namespace HeavenStudio.Games
 
         private void OnDestroy()
         {
-            foreach (var evt in scheduledInputs) {
+            foreach (var evt in scheduledInputs)
+            {
                 evt.Disable();
             }
-            if (!Conductor.instance.NotStopped()) {
+            if (!Conductor.instance.NotStopped())
+            {
                 if (queuedCues.Count > 0) queuedCues.Clear();
                 startCamSpecial = double.MinValue;
                 wantsReturn = double.MinValue;
@@ -888,7 +901,8 @@ namespace HeavenStudio.Games
 
         public static string DoWordSound(double beat, double length, int type, bool bpmPitch = false, float forcePitch = 1, bool customLength = false, bool doSound = true)
         {
-            double clear = type switch {
+            double clear = type switch
+            {
                 <= (int)HitThree.HitFour => beat + 4f,
                 <= (int)HitThree.Warning => beat + 1f,
                 _ => beat + 3f,
@@ -907,7 +921,8 @@ namespace HeavenStudio.Games
             }
 
             var songPos = Conductor.instance.songPositionInBeatsAsDouble;
-            if (songPos <= clear && songPos >= beat) {
+            if (songPos <= clear && songPos >= beat)
+            {
                 wordClearTime = customLength ? (beat + length) : clear;
                 wordStartTime = beat;
             }
@@ -926,13 +941,15 @@ namespace HeavenStudio.Games
 
         public static void CreateBulbSFX(double beat, int type, int sfx, string throwSfx)
         {
-            string obj = sfx switch {
+            string obj = sfx switch
+            {
                 (int)LightBulbSfx.Automatic => type == (int)LightBulbType.Yellow ? "LightbulbNtr" : "Lightbulb",
                 (int)LightBulbSfx.DS => "LightbulbNtr",
                 (int)LightBulbSfx.Custom => throwSfx,
                 _ => "Lightbulb",
             };
-            if (sfx != (int)LightBulbSfx.Custom) {
+            if (sfx != (int)LightBulbSfx.Custom)
+            {
                 obj = (beat % 1.0 == 0.5) ? $"offbeat{obj}Out" : obj.ToLower() + "Out";
             }
             SoundByte.PlayOneShotGame($"karateman/{obj}", forcePlay: true);
@@ -975,7 +992,8 @@ namespace HeavenStudio.Games
 
         public void CreateBulbSpecial(double beat, int type, Color color, int expression, int sfx, string hitSfx = "")
         {
-            string obj = sfx switch {
+            string obj = sfx switch
+            {
                 (int)LightBulbSfx.Automatic => type == (int)LightBulbType.Yellow ? "LightbulbNtr" : "Lightbulb",
                 (int)LightBulbSfx.DS => "LightbulbNtr",
                 (int)LightBulbSfx.Custom => hitSfx,
@@ -1088,7 +1106,8 @@ namespace HeavenStudio.Games
         {
             currentBgEffect = fxType;
 
-            for (int i = 0; i < colorStarts.Length; i++) {
+            for (int i = 0; i < colorStarts.Length; i++)
+            {
                 colorStartBeats[i] = beat;
                 colorLengths[i] = length;
                 colorEases[i] = (Util.EasingFunction.Ease)colorEaseSet;
@@ -1111,7 +1130,8 @@ namespace HeavenStudio.Games
                 autoColor ? TintColor(bgColorEnd) : filterEnd,
             };
 
-            for (int i = 0; i < BGTextures.Length; i++) {
+            for (int i = 0; i < BGTextures.Length; i++)
+            {
                 BGTextures[i].gameObject.SetActive(textureType == (i + 1));
             }
 
@@ -1137,7 +1157,8 @@ namespace HeavenStudio.Games
                     func(colorStarts[i].b, colorEnds[i].b, normalizedBeat),
                 };
 
-                foreach (var renderer in spriteRenderers[i]) {   
+                foreach (var renderer in spriteRenderers[i])
+                {
                     renderer.color = new Color(color[0], color[1], color[2]);
                 }
             }
@@ -1169,7 +1190,8 @@ namespace HeavenStudio.Games
 
         public void SetParticleEffect(double beat, int type, bool instant, float windStrength, float particleStrength)
         {
-            if (type == (int) ParticleType.None) {
+            if (type == (int)ParticleType.None)
+            {
                 foreach (var eff in Effects) eff.Stop();
                 return;
             }

Assets/Scripts/Games/KarateMan/KarateManJoe.cs

@@ -382,6 +382,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
         public void UpdateJoeColour()
         {
+            Material mappingMat = KarateMan.instance.MappingMaterial;
+            if (mappingMat == null) return;
             Color mainCol = KarateMan.instance.BodyColor;
             Color highlightCol = KarateMan.instance.HighlightColor;
 
@@ -391,9 +393,9 @@ namespace HeavenStudio.Games.Scripts_KarateMan
                 mainCol = Color.LerpUnclamped(mainCol, BombGlowTint, bombGlowIntensity * bombGlowRatio);
             }
 
-            KarateMan.instance.MappingMaterial.SetColor("_ColorAlpha", mainCol);
+            mappingMat.SetColor("_ColorAlpha", mainCol);
-            KarateMan.instance.MappingMaterial.SetColor("_ColorBravo", new Color(1, 0, 0, 1));
+            mappingMat.SetColor("_ColorBravo", new Color(1, 0, 0, 1));
-            KarateMan.instance.MappingMaterial.SetColor("_ColorDelta", highlightCol);
+            mappingMat.SetColor("_ColorDelta", highlightCol);
         }
 
         public void Prepare(double beat, float length)

Assets/Scripts/Games/KarateMan/KarateManNoriController.cs

@@ -52,6 +52,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
         public void SetNoriMode(double fromBeat, int mode, int startingNori = 0)
         {
+            if (GameManager.instance == null) return;
             float scaleFactor = 0f;
             //clear all children of the holder
             if (NoriHolder != null) {
@@ -288,6 +289,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
 
         void Update()
         {
+            if (Conductor.instance == null) return;
             Transform target = GameCamera.instance.transform;
 
             Vector3 displacement = target.forward * CameraOffset;

ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset

@@ -32,5 +32,8 @@ MonoBehaviour:
   - Assets/Scripts/JudgementManager.cs
   - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs
   - Assets/Scripts/GlobalGameManager.cs
+  - Assets/Scripts/Games/KarateMan/KarateMan.cs
+  - Assets/Scripts/Games/KarateMan/KarateManJoe.cs
+  - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs
   PathsToSkipImportEvent: []
   PathsToIgnoreOverwriteSettingOnAttribute: []