成就合并

This commit is contained in:
wuwenbo 2025-07-16 17:16:18 +08:00
parent 3ed1c571ef
commit 219b04679e

View File

@ -96,7 +96,7 @@ namespace Logic.Editor
{ {
foreach (var item in _itemList) foreach (var item in _itemList)
{ {
_asset.AchievementList.Remove(item); _asset.Data.AchievementList.Remove(item);
} }
} }
if (Application.isPlaying && InspectorUtils.InspectorButtonWithTextWidth("清空成就完成情况(运行时)")) if (Application.isPlaying && InspectorUtils.InspectorButtonWithTextWidth("清空成就完成情况(运行时)"))
@ -108,12 +108,12 @@ namespace Logic.Editor
{ {
if (InspectorUtils.InspectorButtonWithTextWidth("增加一条成就")) if (InspectorUtils.InspectorButtonWithTextWidth("增加一条成就"))
{ {
_asset.AddNewAchievementItem(_bigID, _smallID); _asset.Data.AddNewAchievementItem(_bigID, _smallID);
} }
} }
if (InspectorUtils.InspectorButtonWithTextWidth("刷新排序")) if (InspectorUtils.InspectorButtonWithTextWidth("刷新排序"))
{ {
_asset.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID)); _asset.Data.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID));
} }
if (InspectorUtils.InspectorButtonWithTextWidth("全选")) if (InspectorUtils.InspectorButtonWithTextWidth("全选"))
{ {
@ -163,15 +163,15 @@ namespace Logic.Editor
item.BigID = 1; item.BigID = 1;
item.SmallID = (uint)(i / 5 + 1); item.SmallID = (uint)(i / 5 + 1);
item.InternalID = (uint)(i % 5 + 1); item.InternalID = (uint)(i % 5 + 1);
if (_asset.GetAchievementItem(item.BigID, item.SmallID, item.InternalID) != null) continue; if (_asset.Data.GetAchievementItem(item.BigID, item.SmallID, item.InternalID) != null) continue;
var condition = new TrainGiantCondition(); var condition = new TrainGiantCondition();
condition.TargetCount = 1; condition.TargetCount = 1;
condition.TargetGiant = giantList[i]; condition.TargetGiant = giantList[i];
item.Conditions.Add(condition); item.Conditions.Add(condition);
_asset.AchievementList.Add(item); _asset.Data.AchievementList.Add(item);
_asset.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID)); _asset.Data.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID));
_asset.RefreshAchievementDict(); _asset.Data.RefreshAchievementDict();
} }
} }
@ -184,15 +184,15 @@ namespace Logic.Editor
item.BigID = 3; item.BigID = 3;
item.SmallID = (uint)(i + 1); item.SmallID = (uint)(i + 1);
item.InternalID = (uint)j; item.InternalID = (uint)j;
if (_asset.GetAchievementItem(item.BigID, item.SmallID, item.InternalID) != null) continue; if (_asset.Data.GetAchievementItem(item.BigID, item.SmallID, item.InternalID) != null) continue;
var condition = new BuildWonderConditionCondition(); var condition = new BuildWonderConditionCondition();
condition.TargetCount = 10; condition.TargetCount = 10;
condition.Wonder = (WonderLibrary)i; condition.Wonder = (WonderLibrary)i;
item.Conditions.Add(condition); item.Conditions.Add(condition);
_asset.AchievementList.Add(item); _asset.Data.AchievementList.Add(item);
_asset.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID)); _asset.Data.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID));
_asset.RefreshAchievementDict(); _asset.Data.RefreshAchievementDict();
} }
} }
@ -208,7 +208,7 @@ namespace Logic.Editor
_internalID = (uint)EditorGUILayout.IntField((int)_internalID, GUILayout.Width(20)); _internalID = (uint)EditorGUILayout.IntField((int)_internalID, GUILayout.Width(20));
EditorGUILayout.EndHorizontal(); EditorGUILayout.EndHorizontal();
_itemList = _asset.GetAchievementItemList(_bigID, _smallID, _internalID); _itemList = _asset.Data.GetAchievementItemList(_bigID, _smallID, _internalID);
var deleteSet = new HashSet<AchievementItem>(); var deleteSet = new HashSet<AchievementItem>();
foreach (var item in _itemList) foreach (var item in _itemList)
{ {
@ -218,7 +218,7 @@ namespace Logic.Editor
foreach (var item in deleteSet) foreach (var item in deleteSet)
{ {
_showItem.Remove(item.ID); _showItem.Remove(item.ID);
_asset.AchievementList.Remove(item); _asset.Data.AchievementList.Remove(item);
} }
EditorGUILayout.EndScrollView(); EditorGUILayout.EndScrollView();