|
@@ -47,6 +47,7 @@ namespace Fort23.Mono
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
public async override CTask GetFocus()
|
|
|
{
|
|
|
TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
|
|
@@ -86,7 +87,7 @@ namespace Fort23.Mono
|
|
|
PlacesWidget placesWidget = obj as PlacesWidget;
|
|
|
//加载地图
|
|
|
|
|
|
- PlacesInfoPanel.OpenPanel(placesWidget.placesConfig.ID,null);
|
|
|
+ PlacesInfoPanel.OpenPanel(placesWidget.placesConfig.ID, null);
|
|
|
|
|
|
//
|
|
|
// if (placesWidget.placesConfig.ID > 1 && PlayerManager.Instance.GetMapBl(placesWidget.placesConfig.ID - 1) < 100)
|
|
@@ -125,17 +126,19 @@ namespace Fort23.Mono
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
|
|
|
+
|
|
|
+ SmallPlacesConfig smallPlacesConfig =
|
|
|
+ ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
|
|
|
// AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
|
|
|
-
|
|
|
+
|
|
|
PlacesConfig placesConfig =
|
|
|
ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
|
|
|
|
|
|
Text_PlacesComplteProgress.text =
|
|
|
$"{LanguageManager.Instance.Text(placesConfig.placeName)}完成度:{PlayerManager.Instance.PlacesBl}%";
|
|
|
|
|
|
- GameObjectPool gameObjectPool2 = await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");
|
|
|
+ GameObjectPool gameObjectPool2 =
|
|
|
+ await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");
|
|
|
gameObjectPool2.own.transform.parent = PlacesRoot;
|
|
|
gameObjectPool2.own.transform.localScale = Vector3.one;
|
|
|
gameObjectPool2.own.transform.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
|
|
@@ -147,24 +150,26 @@ namespace Fort23.Mono
|
|
|
public async void CustomInit()
|
|
|
{
|
|
|
int PlacesId = PlayerManager.Instance.GetMaxSmallPlacesId();
|
|
|
- PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlacesId);
|
|
|
+ SmallPlacesConfig smallPlacesConfig1 = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlacesId);
|
|
|
+ PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig1.PlacesId);
|
|
|
BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
|
|
|
|
|
|
await ChangePlaces(bigMapConfig.ID);
|
|
|
// await ChangeMap(bigMapConfig.ID);
|
|
|
Sv2.gameObject.SetActive(true);
|
|
|
LayoutRebuilder.ForceRebuildLayoutImmediate(PlacesRoot);
|
|
|
-
|
|
|
-
|
|
|
- SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
|
|
|
+
|
|
|
+
|
|
|
+ SmallPlacesConfig smallPlacesConfig =
|
|
|
+ ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
|
|
|
// AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
|
|
|
|
|
|
foreach (var placesItemPlacesWidget in placesItem.PlacesWidgets)
|
|
|
{
|
|
|
- if (placesItemPlacesWidget.placesConfig.ID ==smallPlacesConfig.PlacesId)
|
|
|
+ if (placesItemPlacesWidget.placesConfig.ID == smallPlacesConfig.PlacesId)
|
|
|
{
|
|
|
// Rect_BiaoJi.anchoredPosition = transform.worldToLocalMatrix * placesItemPlacesWidget.Pos.position;
|
|
|
- Rect_BiaoJi.position = placesItemPlacesWidget.Pos.position;
|
|
|
+ Rect_BiaoJi.position = placesItemPlacesWidget.Pos.position;
|
|
|
}
|
|
|
}
|
|
|
}
|