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

refactor

This commit is contained in:
kimura 2022-12-02 18:49:53 +09:00
parent 9c1ca1ddf9
commit 59fd162d78
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/WorldMarketManager.cs
View File

@ -72,7 +72,7 @@ namespace MyGame.Scenes.marketing.Scripts
* 兄弟が売り切ったら閉店表示。画面切り替えでバイト販売 * 兄弟が売り切ったら閉店表示。画面切り替えでバイト販売
*/ */
#if UNITY_EDITOR #if UNITY_EDITOR
var newGameData = GameDataUtils.CreateCityData(2); // var newGameData = GameDataUtils.CreateCityData(2);
// newGameData.IsFundingCompleted = true; // newGameData.IsFundingCompleted = true;
// newGameData.Heart = 0; // newGameData.Heart = 0;
// GameDataManager.GameData.BrotherHeart = GameDataManager.GameData.Heart; // GameDataManager.GameData.BrotherHeart = GameDataManager.GameData.Heart;

4
popcorn/Assets/MyGame/Scripts/HeaderManager.cs
View File

@ -74,9 +74,9 @@ public class HeaderManager : MonoBehaviour
var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet); var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
GameDataObserver.Instance.HeartObserver.Subscribe(_ => GameDataObserver.Instance.HeartObserver.Subscribe(_ =>
{ {
if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
if (currentCityList.LastOrDefault(data => data.shopLevel == cityGameData.ViewedShopLevel + 1) is not { } newShopLevelData) return; if (currentCityList.LastOrDefault(data => data.shopLevel == cityGameData.ViewedShopLevel + 1) is not { } newShopLevelData) return;
if (newShopLevelData.heart > cityGameData.Heart) return; if (newShopLevelData.heart > cityGameData.Heart) return;
if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
// レベルアップ処理 // レベルアップ処理
cityGameData.ViewedShopLevel = newShopLevelData.shopLevel; cityGameData.ViewedShopLevel = newShopLevelData.shopLevel;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
@ -94,13 +94,13 @@ public class HeaderManager : MonoBehaviour
var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet); var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityData>(Const.CityDataSheet);
GameDataObserver.Instance.HeartObserver.Subscribe(x => GameDataObserver.Instance.HeartObserver.Subscribe(x =>
{ {
if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
var latestCityId = GameDataUtils.GetLatestCityId(); var latestCityId = GameDataUtils.GetLatestCityId();
var unlockList = GameDataManager.GameData.CityGameDataDict.Keys.ToList(); var unlockList = GameDataManager.GameData.CityGameDataDict.Keys.ToList();
unlockList.Add(Const.DefaultCityId); unlockList.Add(Const.DefaultCityId);
if (cityDataList.FirstOrDefault(data => !unlockList.Contains(data.id)) is not { } newCityData) return; if (cityDataList.FirstOrDefault(data => !unlockList.Contains(data.id)) is not { } newCityData) return;
if (ItemConditionUtils.GetScriptList(latestCityId, ItemCondition.CityUnlock).FirstOrDefault() is not { } conditionData) return; if (ItemConditionUtils.GetScriptList(latestCityId, ItemCondition.CityUnlock).FirstOrDefault() is not { } conditionData) return;
if (conditionData.needValue > x) return; if (conditionData.needValue > x) return;
if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
// 都市開放処理 // 都市開放処理
GameDataUtils.CreateCityData(newCityData.id); GameDataUtils.CreateCityData(newCityData.id);
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();