From 2c57fbe44d8cc0fc5d222c5915c46f963633034e Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 15 Oct 2021 19:20:24 +0900
Subject: [PATCH] =?UTF-8?q?SE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Effect/EffectPrefabs/pt_Popcorn_strike.prefab     |  5 +++++
 .../MyGame/Scenes/Cooking/Scripts/PopcornGameView.cs  |  7 +++++++
 .../MyGame/Scenes/Main/Scripts/KitchenManager.cs      | 11 +++++++++++
 .../Scenes/marketing/Scripts/BrotherConversation.cs   |  1 +
 .../USAYAUnityLib/Scripts/Managers/SoundManager.cs    |  6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab
index e04fdc0c..eec19c9d 100644
--- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab
+++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab
@@ -14520,6 +14520,11 @@ MonoBehaviour:
     interval: 0
     filename: se_cooking_corn_FlyAway
     maxCount: 0
+  - delay: 0.6
+    time: 0
+    interval: 0
+    filename: se_cooking_corn_Collide
+    maxCount: 0
 --- !u!1 &7516975307813098669
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameView.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameView.cs
index 78e0a587..1603a7c8 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameView.cs
@@ -16,16 +16,19 @@ public class PopcornGameView : MonoBehaviour
         switch (state)
         {
             case GameState.Guide:
+                SoundManager.Instance.StopSELoop("se_cooking_corn_bake");
                 ChangeGuideState(true);
                 ChangeFireState(false);
                 ChangeStreamState(false);
                 ChangeCharacterState(ThermalCondition.Cold);
                 break;
             case GameState.Playing:
+                SoundManager.Instance.PlaySELoop("se_cooking_corn_bake");
                 ChangeGuideState(false);
                 ChangeFireState(true);
                 break;
             case GameState.Result:
+                SoundManager.Instance.StopSELoop("se_cooking_corn_bake");
                 ChangeFireState(false);
                 ChangeStreamState(true);
                 ChangeCharacterState(ThermalCondition.Cold);
@@ -42,6 +45,10 @@ public class PopcornGameView : MonoBehaviour
 
     private void ChangeFireState(bool isActive)
     {
+        if (isActive)
+        {
+            SoundManager.Instance.PlaySE("se_cooking_switch");
+        }
         fire.SetActive(isActive);
         oilEffect.SetActive(isActive);
     }
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
index 2fbf79c1..e68254db 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UniRx;
+using UniRx.Triggers;
 using Unity.Mathematics;
 using UnityEngine;
 using UnityEngine.UI;
@@ -66,6 +67,8 @@ public class KitchenManager : MonoBehaviour
         orderIndicatorView.SetIndicate(result.result, achieved || cancelled);
         if (result.result)
         {
+            SoundManager.Instance.StopSE("se_Main_phone_sound");
+            
             var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet);
             var nextMessageList = messageList.Where(data => data.shopLevel == result.nextOrderLevel).ToList();
             orderIndicatorView.TappedPhone.ThrottleFirst(TimeSpan.FromSeconds(1f)).Take(1).Subscribe(_ =>
@@ -161,4 +164,12 @@ public class KitchenManager : MonoBehaviour
         // 条件チェック
         return (condition <= gameData.OrderConditionCount, nextOrderId, nextOrderLevel);
     }
+
+    private void OnDestroy()
+    {
+        if (SoundManager.ExistsInstance)
+        {
+            SoundManager.Instance.StopSE("se_Main_phone_sound");
+        }
+    }
 }
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs
index 91e12dbe..6c2bc312 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs
@@ -43,6 +43,7 @@ public class BrotherConversation : MonoBehaviour
             .Select(x => targetScriptList[x])
             .Subscribe(data =>
             {
+                SoundManager.Instance.PlaySE("se_ButtonTap");
                 SetData(data);
             }, () =>
             {
diff --git a/popcorn/Assets/USAYAUnityLib/Scripts/Managers/SoundManager.cs b/popcorn/Assets/USAYAUnityLib/Scripts/Managers/SoundManager.cs
index 73c12cd6..635898eb 100644
--- a/popcorn/Assets/USAYAUnityLib/Scripts/Managers/SoundManager.cs
+++ b/popcorn/Assets/USAYAUnityLib/Scripts/Managers/SoundManager.cs
@@ -283,6 +283,12 @@ public class SoundManager : SingletonMonoBehaviour<SoundManager> {
         bgmSource.Stop();
         bgmSource.clip = null;
     }
+    public void StopSE(string filePath){
+        var index = seSourceList.FindIndex(playing => playing.Name == filePath);
+        if (index == -1) return;
+        seSourceList[index].StopDestroy();
+        seSourceList.RemoveAt(index);
+    }
     public void StopSE(){
         foreach(PlayingAudio playing in seSourceList){
             playing.Stop();