|
@@ -191,15 +191,34 @@ namespace Fort23.Mono
|
|
|
XianTuData xianTuData = new XianTuData();
|
|
|
xianTuData.type = 1;
|
|
|
BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(keyValuePair.Key);
|
|
|
- xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName);
|
|
|
+ int count = 0;
|
|
|
+ int allCount = 0;
|
|
|
+
|
|
|
xianTuDatas.Add(xianTuData);
|
|
|
foreach (var xianTuLogConfig in keyValuePair.Value)
|
|
|
{
|
|
|
+ if (EventSystemManager.Instance.eventConfigsMap.ContainsKey(xianTuLogConfig.ID))
|
|
|
+ {
|
|
|
+ var eventConfigs1 = EventSystemManager.Instance.eventConfigsMap[xianTuLogConfig.ID];
|
|
|
+ foreach (var eventConfig in eventConfigs1)
|
|
|
+ {
|
|
|
+ AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(cl => cl.eventID == eventConfig.ID);
|
|
|
+ if (eventList != null)
|
|
|
+ {
|
|
|
+ count++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ allCount += eventConfigs1.Count;
|
|
|
+ }
|
|
|
+
|
|
|
XianTuData xianTuData2 = new XianTuData();
|
|
|
xianTuData2.type = 2;
|
|
|
xianTuData2.xianTuLogConfig = xianTuLogConfig;
|
|
|
xianTuDatas.Add(xianTuData2);
|
|
|
}
|
|
|
+
|
|
|
+ xianTuData.name = LanguageManager.Instance.Text(bigMapConfig.mapName) + " (" + count + "/" + allCount + ")";
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -390,7 +409,7 @@ namespace Fort23.Mono
|
|
|
if (highestItem != null)
|
|
|
{
|
|
|
float outsideY = eventLogTitleWidget.own.transform.position.y;
|
|
|
- if (maxY > outsideY-5)
|
|
|
+ if (maxY > outsideY - 5)
|
|
|
{
|
|
|
eventLogTitleWidget.CustomInit(highestItem.Text_Name.text);
|
|
|
}
|