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

ワールドマップバイト通知修正

This commit is contained in:
kimura 2022-11-14 17:58:13 +09:00
parent 7942929e69
commit e299e4f3dd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
View File

@ -104,7 +104,7 @@ namespace MyGame.Scenes.WorldMap.Scripts
} }
// バイト強化可能か判定 // バイト強化可能か判定
if (PartTimerManager.CheckLevelUp(cityIcon.CityId)) if (!GameDataUtils.CheckLatestCity(cityIcon.CityId) && PartTimerManager.CheckLevelUp(cityIcon.CityId))
{ {
// 強化可能 // 強化可能
cityIcon.SetNotify(true); cityIcon.SetNotify(true);
@ -129,12 +129,9 @@ namespace MyGame.Scenes.WorldMap.Scripts
// 指定の都市に遷移 // 指定の都市に遷移
earningView.OnClick.Subscribe(_ => earningView.OnClick.Subscribe(_ =>
{ {
globalGameData.CurrentCityId = cityIcon.CityId; ChangeCity(cityIcon.CityId);
WorldMarketManager.Instance.UpdateCurrentCity(cityIcon.CityId);
GameDataObserver.Instance.ChangeCity(cityIcon.CityId);
GameDataObserver.Instance.CheckMissionProgress();
TransitionManager.Instance.LoadScene(GameScenes.Main);
LocalCacheManager.Save(Const.ChangeCityFlagTag, true); LocalCacheManager.Save(Const.ChangeCityFlagTag, true);
TransitionManager.Instance.LoadScene(GameScenes.Main);
}).AddTo(citySelectDisposable); }).AddTo(citySelectDisposable);
} }
fundingView.ResetView(); fundingView.ResetView();
@ -223,5 +220,13 @@ namespace MyGame.Scenes.WorldMap.Scripts
var coinProgress = (float)partTimerData.sales / 10 * elapsed / partTimerData.maxSales; var coinProgress = (float)partTimerData.sales / 10 * elapsed / partTimerData.maxSales;
return (heartProgress, coinProgress); return (heartProgress, coinProgress);
} }
public static void ChangeCity(int cityId)
{
GameDataManager.GameData.CurrentCityId = cityId;
WorldMarketManager.Instance.UpdateCurrentCity(cityId);
GameDataObserver.Instance.ChangeCity(cityId);
GameDataObserver.Instance.CheckMissionProgress();
}
} }
} }