yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

販売バグ対策

This commit is contained in:
kimura 2021-10-22 12:36:33 +09:00
parent 7715370487
commit 57529ece16
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
View File

@ -53,16 +53,19 @@ public class CookingResult : MonoBehaviour
// 各種ボタン押下後、獲得処理 // 各種ボタン押下後、獲得処理
if (viewType == ProductViewType.Default) if (viewType == ProductViewType.Default)
{ {
Market.Instance.IsPause.Value = true;
centerOkButton.OnClickAsObservable().Subscribe(_ => centerOkButton.OnClickAsObservable().Subscribe(_ =>
{ {
// 獲得、遷移 // 獲得、遷移
AddStock(productData, rarityData.Rarity); AddStock(productData, rarityData.Rarity);
Market.Instance.IsPause.Value = false;
TransitionManager.Instance.LoadScene(GameScenes.Main); TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this); }).AddTo(this);
leftOkButton.OnClickAsObservable().Subscribe(_ => leftOkButton.OnClickAsObservable().Subscribe(_ =>
{ {
// 獲得、遷移 // 獲得、遷移
AddStock(productData); AddStock(productData);
Market.Instance.IsPause.Value = false;
TransitionManager.Instance.LoadScene(GameScenes.Main); TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(this); }).AddTo(this);
} }

14
popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity
View File

@ -1657,6 +1657,20 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8dee1e67eb6fa45268e20133acc68259, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8dee1e67eb6fa45268e20133acc68259, type: 3}
--- !u!1 &1711540513 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1418391247242195742, guid: 8dee1e67eb6fa45268e20133acc68259,
type: 3}
m_PrefabInstance: {fileID: 1711540512}
m_PrefabAsset: {fileID: 0}
--- !u!81 &1711540514
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1711540513}
m_Enabled: 1
--- !u!1001 &1767352103 --- !u!1001 &1767352103
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

3
popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
View File

@ -30,6 +30,7 @@ public class DebugOptionManager : MonoBehaviour
{ {
TransitionManager.Instance.LoadScene(GameScenes.Main); TransitionManager.Instance.LoadScene(GameScenes.Main);
} }
SoundManager.Instance.StopBGM();
var prevScene = LocalCacheManager.Load<GameScenes>(DebugPrevSceneTag); var prevScene = LocalCacheManager.Load<GameScenes>(DebugPrevSceneTag);
resetButton.OnClickAsObservable().Subscribe(_ => resetButton.OnClickAsObservable().Subscribe(_ =>
{ {
@ -37,9 +38,11 @@ public class DebugOptionManager : MonoBehaviour
TransitionManager.Instance.LoadScene(GameScenes.DebugOption); TransitionManager.Instance.LoadScene(GameScenes.DebugOption);
}).AddTo(this); }).AddTo(this);
Market.Instance.IsPause.Value = true;
backButton.OnClickAsObservable().Subscribe(_ => backButton.OnClickAsObservable().Subscribe(_ =>
{ {
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
Market.Instance.IsPause.Value = false;
TransitionManager.Instance.LoadScene(prevScene); TransitionManager.Instance.LoadScene(prevScene);
}); });