Merge branch 'master' of https://github.com/devedse/LD54

devedse · Oct 2, 2023 · 5776a61 · 5776a61
2 parents d38c97e + fe95288
commit 5776a61
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/UnityGame/Assets/Scripts/Scrobs/Player Images/Image4.asset b/UnityGame/Assets/Scripts/Scrobs/Player Images/Image4.asset
@@ -15,6 +15,6 @@ MonoBehaviour:
   ImageIdle: {fileID: 21300000, guid: bd14f8990a7289c40872f0386fa4d14d, type: 3}
   ImageSad: {fileID: 21300000, guid: 0983a064be3915e47ac35bc8ff58c119, type: 3}
   ImageWin: {fileID: 21300000, guid: 414d7b27628b2d94c905960bb736cf02, type: 3}
-  SoundHappy: {fileID: 8300000, guid: 0179d24e3342fff4b8ffb2506516dd77, type: 3}
+  SoundHappy: {fileID: 8300000, guid: 87119b871ec18d04fafb8f40425bb520, type: 3}
   SoundAngry: {fileID: 8300000, guid: 2e512a51752544640a8ce087e0f6c59c, type: 3}
-  SoundNeutral: {fileID: 8300000, guid: f5101863326287e42b934cd23f231801, type: 3}
+  SoundNeutral: {fileID: 8300000, guid: a661afce704dc1d42bc197cf8ffc4143, type: 3}
diff --git a/UnityGame/Assets/Scripts/Scrobs/Player Images/Image5.asset b/UnityGame/Assets/Scripts/Scrobs/Player Images/Image5.asset
@@ -15,6 +15,6 @@ MonoBehaviour:
   ImageIdle: {fileID: 21300000, guid: 67823de3e3288fa42bfa8ba13e4f7781, type: 3}
   ImageSad: {fileID: 21300000, guid: b75d68a925678e0438c326d18a145d80, type: 3}
   ImageWin: {fileID: 21300000, guid: 7197155dc1d2dd74db7e7942c91b181d, type: 3}
-  SoundHappy: {fileID: 8300000, guid: db105a8c1af02c942ba404d518811e2f, type: 3}
-  SoundAngry: {fileID: 8300000, guid: 1f0099c5ccd611f4aaefc8ae79a4382e, type: 3}
-  SoundNeutral: {fileID: 8300000, guid: a0e513bdecede2e479404903be11ea77, type: 3}
+  SoundHappy: {fileID: 8300000, guid: 7121a6e9b40a4554a9933cb70e253aeb, type: 3}
+  SoundAngry: {fileID: 8300000, guid: a0e513bdecede2e479404903be11ea77, type: 3}
+  SoundNeutral: {fileID: 8300000, guid: db105a8c1af02c942ba404d518811e2f, type: 3}
diff --git a/UnityGame/Assets/Scripts/UI/PlayerCard.cs b/UnityGame/Assets/Scripts/UI/PlayerCard.cs
@@ -56,6 +56,15 @@ public void ChangeImage(PlayerImageScriptableObject imageSO)
         PC.PlayerMad = CurrentImage.ImageSad;
         PC.Template = imageSO;
         PlayerImage.sprite = CurrentImage.ImageIdle;
+
+        StopAllCoroutines();
+        StartCoroutine(asdf());
+    }
+
+    private IEnumerator asdf()
+    {
+        yield return new WaitForSeconds(.5f);
+        SoundManager.PlaySound(PC.Template.SoundNeutral);
     }
 
     public void SetReady(bool isReady)