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

マーケット初回表示対応

This commit is contained in:
kimura 2022-12-02 18:49:11 +09:00
parent 1da46055c4
commit 56d656ed41
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
View File

@ -61,6 +61,18 @@ public class MarketManager : MonoBehaviour
marketBgTarget.DestroyAllChildrens();
Instantiate(cityData.GetMarketBgPrefab(), marketBgTarget);
// 初回都市来訪スクリプト
var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
// シナリオ読み込み
if (ItemConditionUtils.GetScriptList(GameDataManager.GameData.CurrentCityId, ItemCondition.FirstVisitCityMarket, true).FirstOrDefault() is not { } conditionData) return;
var scripts = scriptList.Where(data => data.id == conditionData.scriptId).ToList();
if (scripts.Count <= 0) return;
BrotherConversation.ShowDialog(scripts, () =>
{
// 既読処理
ItemConditionUtils.Use(conditionData);
});
// 最新の都市ではない場合、バイトが有効
if (!market.IsLatestCity)

8
popcorn/Assets/MyGame/Scripts/ItemConditionUtils.cs
View File

@ -55,20 +55,24 @@ namespace MyGame.Scripts
.ToList();
}
public static List<ScriptConditionData> GetScriptList(int cityId, ItemCondition condition)
public static List<ScriptConditionData> GetScriptList(int cityId, ItemCondition condition, bool ignoreUsed = false)
{
var ignoreList = ignoreUsed ? GameDataManager.GameData.UsedScriptCondition : new List<int>();
return SpreadsheetDataManager.Instance.GetBaseDataList<ScriptConditionData>(Const.ScriptConditionDataSheet)
.Where(data => data.cityId == cityId)
.Where(data => data.Condition == condition)
.Where(data => !ignoreList.Contains(data.id) )
.ToList();
}
public static List<ScriptConditionData> GetScriptList(int cityId, ItemCondition condition, int value)
public static List<ScriptConditionData> GetScriptList(int cityId, ItemCondition condition, int value, bool ignoreUsed = false)
{
var ignoreList = ignoreUsed ? GameDataManager.GameData.UsedScriptCondition : new List<int>();
return SpreadsheetDataManager.Instance.GetBaseDataList<ScriptConditionData>(Const.ScriptConditionDataSheet)
.Where(data => data.cityId == cityId)
.Where(data => data.Condition == condition)
.Where(data => data.needValue <= value)
.Where(data => !ignoreList.Contains(data.id) )
.ToList();
}

1
popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
View File

@ -188,6 +188,7 @@ public enum ItemCondition
CityLevel = 3,
CityUnlock = 4,
CityFundingCompleted = 5,
FirstVisitCityMarket = 6,
}
public enum RewardActionType