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

リファクタ

This commit is contained in:
kimura 2021-11-12 11:07:16 +09:00
parent 985ffa79c8
commit 05cd34e727
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
View File

@ -158,7 +158,7 @@ public class BulkOrder : MonoBehaviour
LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder); LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder);
LocalCacheManager.Save(MaterialNumberTag, 1); LocalCacheManager.Save(MaterialNumberTag, 1);
LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData); LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData);
TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice); RecipeDetailView.ShowDialog();
}).AddTo(itemView1); }).AddTo(itemView1);
itemView1.gameObject.SetActive(true); itemView1.gameObject.SetActive(true);
} }
@ -185,7 +185,7 @@ public class BulkOrder : MonoBehaviour
LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder); LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder);
LocalCacheManager.Save(MaterialNumberTag, 2); LocalCacheManager.Save(MaterialNumberTag, 2);
LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData); LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData);
TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice); RecipeDetailView.ShowDialog();
}).AddTo(itemView2); }).AddTo(itemView2);
itemView2.gameObject.SetActive(true); itemView2.gameObject.SetActive(true);
} }
@ -209,10 +209,9 @@ public class BulkOrder : MonoBehaviour
} }
itemView3.CookingButton.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => itemView3.CookingButton.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
{ {
LocalCacheManager.Save(Const.ProductViewTypeTag, ProductViewType.BulkOrder);
LocalCacheManager.Save(MaterialNumberTag, 3); LocalCacheManager.Save(MaterialNumberTag, 3);
LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData); LocalCacheManager.Save(PopcornGameManager.CookingDataTag, productData);
TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice); RecipeSelectDialog.ShowDialog(ProductViewType.BulkOrder);
}).AddTo(itemView3); }).AddTo(itemView3);
itemView3.gameObject.SetActive(true); itemView3.gameObject.SetActive(true);
} }

2
popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
View File

@ -23,8 +23,6 @@ public class PanSelector : MonoBehaviour
var panList = SpreadsheetDataManager.Instance.GetBaseDataList<PanData>(Const.PanDataSheet); var panList = SpreadsheetDataManager.Instance.GetBaseDataList<PanData>(Const.PanDataSheet);
var myPanList = panList.Where(data => GameDataManager.GameData.Pans.Contains(data.id)).ToList(); var myPanList = panList.Where(data => GameDataManager.GameData.Pans.Contains(data.id)).ToList();
var panCount = myPanList.Count; var panCount = myPanList.Count;
Debug.Log(string.Join(",", panList.Select(data => data.id)));
Debug.Log(string.Join(",", GameDataManager.GameData.Pans));
selectedPanData.Value = myPanList[0]; selectedPanData.Value = myPanList[0];
selectedPanData.Subscribe(data => selectedPanData.Subscribe(data =>
{ {