diff --git a/SVSim.BattleEngine/Engine/Wizard/AICsvLoadingInfo.cs b/SVSim.BattleEngine/Engine/Wizard/AICsvLoadingInfo.cs deleted file mode 100644 index be5d01aa..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/AICsvLoadingInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Wizard; - -public class AICsvLoadingInfo -{ - public int DeckId { get; private set; } - - public int StyleId { get; private set; } - - public int EmoteId { get; private set; } - - public AICsvLoadingInfo(int deckId, int styleId, int emoteId) - { - DeckId = deckId; - StyleId = styleId; - EmoteId = emoteId; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/AIDataLibrary.cs b/SVSim.BattleEngine/Engine/Wizard/AIDataLibrary.cs index 234ec138..f8a0d368 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AIDataLibrary.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AIDataLibrary.cs @@ -38,37 +38,6 @@ public class AIDataLibrary setupInfoBuf = new AISetUpData(classID, logicLv, deckName, styleName, emoteName, useEmote, useInnerEmote, enemyAiID, specialAbilityList); } - public void RegisterBasicData(AICardDataAsset asset) - { - _basicDic.RegisterCardData(asset); - } - - public bool RegisterCommonData(AICardDataAsset asset) - { - AICardData mergeData = _basicDic.SearchCardData(asset.CardID); - return _commonDic.RegisterCardData(asset, mergeData); - } - - public bool RegisterAllyCommonData(AICardDataAsset asset) - { - AICardData mergeData = _basicDic.SearchCardData(asset.CardID); - return _allyCommonDic.RegisterCardData(asset, mergeData); - } - - public void RegisterDeckToDeckDic(string deckName, List cardDataAssetList) - { - AIDeckData aIDeckData = new AIDeckData(); - for (int i = 0; i < cardDataAssetList.Count; i++) - { - AICardDataAsset aICardDataAsset = cardDataAssetList[i]; - int cardID = aICardDataAsset.CardID; - bool useCommon = aICardDataAsset.UseCommon; - AICardData mergeData = ((!useCommon) ? _basicDic.SearchCardData(cardID) : _allyCommonDic.SearchCardData(cardID)); - aIDeckData.RegisterCardData(aICardDataAsset, mergeData, useCommon); - } - RegisterDeck(deckName, aIDeckData); - } - public bool RegisterDeck(string deckName, AIDeckData deck) { if (_deckDic.ContainsKey(deckName)) @@ -79,16 +48,6 @@ public class AIDataLibrary return true; } - public bool RegisterEmoteSet(string emoteSetName, AIEmoteSet emoteSet) - { - if (emoteDic.ContainsKey(emoteSetName)) - { - return false; - } - emoteDic.Add(emoteSetName, emoteSet); - return true; - } - public AIDeckData SearchDeckData(string name) { if (!_deckDic.ContainsKey(name)) @@ -125,21 +84,4 @@ public class AIDataLibrary { return _allyCommonDic; } - - public void RegisterCommonStyle(List assetList) - { - _commonStyle.CreateFromAsset(assetList); - } - - public bool RegisterDeckStyle(string styleName, List assetList) - { - if (_deckStyleDic.ContainsKey(styleName)) - { - return false; - } - AIStyleData aIStyleData = new AIStyleData(); - aIStyleData.CreateFromAsset(assetList); - _deckStyleDic.Add(styleName, aIStyleData); - return true; - } } diff --git a/SVSim.BattleEngine/Engine/Wizard/AIDeckData.cs b/SVSim.BattleEngine/Engine/Wizard/AIDeckData.cs index bd3b5c1a..6ef3e280 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AIDeckData.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AIDeckData.cs @@ -13,11 +13,6 @@ public class AIDeckData cardDic = new Dictionary(); } - public void Clear() - { - cardDic.Clear(); - } - public bool RegisterCardData(AICardDataAsset asset, AICardData mergeData = null, bool isMergeDefaultParameter = false) { if (cardDic.ContainsKey(asset.CardID)) diff --git a/SVSim.BattleEngine/Engine/Wizard/AIEmoteSet.cs b/SVSim.BattleEngine/Engine/Wizard/AIEmoteSet.cs index 417069f7..62c82839 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AIEmoteSet.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AIEmoteSet.cs @@ -7,13 +7,4 @@ public class AIEmoteSet private List cmdList = new List(); public IEnumerable EmoteCmds => cmdList; - - public void CreateFromAsset(List assetList) - { - cmdList.Clear(); - foreach (AIEmoteDataAsset asset in assetList) - { - cmdList.Add(new AIEmoteCmd(asset)); - } - } } diff --git a/SVSim.BattleEngine/Engine/Wizard/AIStyleData.cs b/SVSim.BattleEngine/Engine/Wizard/AIStyleData.cs index c1b61eb8..d6e4dd85 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AIStyleData.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AIStyleData.cs @@ -18,12 +18,6 @@ public class AIStyleData categoryFilter = filter; } - public void Clear() - { - categoryFilter = null; - policyDic.Clear(); - } - public void CreateFromAsset(List assetList) { foreach (AIPolicyDataAsset asset in assetList) diff --git a/SVSim.BattleEngine/Engine/Wizard/Master.cs b/SVSim.BattleEngine/Engine/Wizard/Master.cs index 29eab64f..6e24b96e 100644 --- a/SVSim.BattleEngine/Engine/Wizard/Master.cs +++ b/SVSim.BattleEngine/Engine/Wizard/Master.cs @@ -84,8 +84,6 @@ public class Master public Dictionary AIDeckDic { get; set; } - public List AIStyleCommonDataList { get; set; } - public Dictionary> AIStyleDic { get; set; } public Dictionary> AIEmoteDic { get; set; } @@ -340,51 +338,6 @@ public class Master return list; } - public void StartLoadAIBasicData() - { - AIBasicDataList = new AICardDataAssetSet(); - string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath("ai/ai_basic", ResourcesManager.AssetLoadPathType.Master, isfetch: true); - List csv = Utility.ConvertCSV_Array((Toolbox.ResourcesManager.LoadObject(assetTypePath) as TextAsset).ToString()); - AIBasicDataList.ConvertCsvTextToAsset(csv); - } - - public void StartLoadAICommonData(List fileList) - { - AICommonDataList = new AICardDataAssetSet(); - for (int i = 0; i < fileList.Count; i++) - { - string path = "ai/" + fileList[i]; - string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.Master, isfetch: true); - List csv = Utility.ConvertCSV_Array((Toolbox.ResourcesManager.LoadObject(assetTypePath) as TextAsset).ToString()); - AICommonDataList.ConvertCsvTextToAsset(csv); - } - } - - public void StartLoadAIAllyCommonData(List fileList) - { - AIAllyCommonDataList = new AICardDataAssetSet(); - for (int i = 0; i < fileList.Count; i++) - { - string path = "ai/" + fileList[i]; - string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath(path, ResourcesManager.AssetLoadPathType.Master, isfetch: true); - List csv = Utility.ConvertCSV_Array((Toolbox.ResourcesManager.LoadObject(assetTypePath) as TextAsset).ToString()); - AIAllyCommonDataList.ConvertCsvTextToAsset(csv); - } - } - - public void StartLoadAIDeckData(int deckID) - { - if (AIDeckDic == null) - { - AIDeckDic = new Dictionary(); - } - string text = "ai/" + AIDeckFileNameList.GetFileName(deckID); - if (!AIDeckDic.ContainsKey(text)) - { - LoadAIDeckData(text); - } - } - private void LoadAIDeckData(string fileName) { string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath(fileName, ResourcesManager.AssetLoadPathType.Master, isfetch: true); @@ -394,23 +347,6 @@ public class Master AIDeckDic.Add(fileName, aICardDataAssetSet); } - public void StartLoadAIStyleData(int styleID) - { - if (AIStyleDic == null) - { - AIStyleDic = new Dictionary>(); - } - string fileName = AIStyleFileNameList.GetFileName(styleID); - if (fileName != null && !(fileName == "")) - { - string text = "ai/" + fileName; - if (!AIStyleDic.ContainsKey(text)) - { - LoadAIStyleData(text); - } - } - } - private void LoadAIStyleData(string fileName) { string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath(fileName, ResourcesManager.AssetLoadPathType.Master, isfetch: true); @@ -422,23 +358,6 @@ public class Master AIStyleDic.Add(fileName, list); } - public void StartLoadAIEmoteData(int emoteID) - { - if (AIEmoteDic == null) - { - AIEmoteDic = new Dictionary>(); - } - string fileName = AIEmoteFileNameList.GetFileName(emoteID); - if (fileName != null && !(fileName == "")) - { - string text = "ai/" + fileName; - if (!AIEmoteDic.ContainsKey(text)) - { - LoadAIEmoteData(text); - } - } - } - private void LoadAIEmoteData(string fileName) { string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath(fileName, ResourcesManager.AssetLoadPathType.Master, isfetch: true); @@ -449,47 +368,4 @@ public class Master } AIEmoteDic.Add(fileName, list); } - - private void RegisterAIDeckCsvFilePath(List aiPaths, int deckID) - { - string fileName = AIDeckFileNameList.GetFileName(deckID); - if (AIDeckDic == null || !AIDeckDic.ContainsKey(fileName)) - { - aiPaths.Add(Toolbox.ResourcesManager.GetAssetTypePath(fileName, ResourcesManager.AssetLoadPathType.Master)); - } - } - - private void RegisterAICommonCsvFilePaths(List aiPaths) - { - for (int i = 0; i < AICommonFileNameList.Count; i++) - { - aiPaths.Add(Toolbox.ResourcesManager.GetAssetTypePath(AICommonFileNameList[i], ResourcesManager.AssetLoadPathType.Master)); - } - } - - private void RegisterAIAllyCommonCsvFilePaths(List aiPaths) - { - for (int i = 0; i < AIAllyCommonFileNameList.Count; i++) - { - aiPaths.Add(Toolbox.ResourcesManager.GetAssetTypePath(AIAllyCommonFileNameList[i], ResourcesManager.AssetLoadPathType.Master)); - } - } - - private void RegisterAIEmoteCsvFilePath(List aiPaths, int emoteID) - { - string fileName = AIEmoteFileNameList.GetFileName(emoteID); - if (fileName != null && !(fileName == "") && (AIEmoteDic == null || !AIEmoteDic.ContainsKey(fileName))) - { - aiPaths.Add(Toolbox.ResourcesManager.GetAssetTypePath(fileName, ResourcesManager.AssetLoadPathType.Master)); - } - } - - private void RegisterAIStyleCsvFilePath(List aiPaths, int styleID) - { - string fileName = AIStyleFileNameList.GetFileName(styleID); - if (fileName != null && !(fileName == "") && (AIStyleDic == null || !AIStyleDic.ContainsKey(fileName))) - { - aiPaths.Add(Toolbox.ResourcesManager.GetAssetTypePath(fileName, ResourcesManager.AssetLoadPathType.Master)); - } - } } diff --git a/SVSim.BattleEngine/Engine/Wizard/StoryAISettingData.cs b/SVSim.BattleEngine/Engine/Wizard/StoryAISettingData.cs deleted file mode 100644 index fa951472..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/StoryAISettingData.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace Wizard; - -public class StoryAISettingData -{ - public int EnemyAiId { get; private set; } - - public int DeckId { get; private set; } - - public int StyleId { get; private set; } - - public int EmoteId { get; private set; } - - public int LogicLevel { get; private set; } - - public bool UseInnerEmote { get; private set; } - - public StoryAISettingData(string[] columns) - { - int num = 0; - EnemyAiId = AIScriptParser.ParseInt(columns[num++]); - DeckId = AIScriptParser.ParseInt(columns[num++]); - StyleId = AIScriptParser.ParseInt(columns[num++]); - EmoteId = AIScriptParser.ParseInt(columns[num++]); - LogicLevel = AIScriptParser.ParseInt(columns[num++]); - UseInnerEmote = AIScriptParser.ParseInt(columns[num++]) > 0; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/StoryAISettingDataSet.cs b/SVSim.BattleEngine/Engine/Wizard/StoryAISettingDataSet.cs deleted file mode 100644 index fe9eb0a5..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/StoryAISettingDataSet.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using System.Linq; - -namespace Wizard; - -public class StoryAISettingDataSet -{ - private List _dataTable; - - public StoryAISettingDataSet() - { - _dataTable = new List(); - } -} diff --git a/SVSim.BattleEngine/Shim/GodObjects/GodObjects.cs b/SVSim.BattleEngine/Shim/GodObjects/GodObjects.cs index dc61c1f9..ddd4426d 100644 --- a/SVSim.BattleEngine/Shim/GodObjects/GodObjects.cs +++ b/SVSim.BattleEngine/Shim/GodObjects/GodObjects.cs @@ -76,7 +76,6 @@ public class GameMgr public GameObjMgr GetGameObjMgr() => _gameObj; public PrefabMgr GetPrefabMgr() => _prefab ??= new PrefabMgr(); public InputMgr GetInputMgr() => _input ??= new InputMgr(); - public BattleControl GetBattleCtrl() => _battleCtrl ??= new BattleControl(); public NetworkUserInfoData GetNetworkUserInfoData() => _netUser; public void SetNetworkUserInfoData(NetworkUserInfoData infoData) => _netUser = infoData; public bool IsUseUnapprovedList(bool isPlayer) => false;