ワールドマップ修正
This commit is contained in:
parent
4078f19502
commit
947eacaffa
|
@ -62,22 +62,13 @@ namespace MyGame.Scenes.WorldMap.Scripts
|
|||
var fundingCityGameData = GameDataManager.GetCityGameData(fundingData.fundingCityId);
|
||||
var funded = cityGameData.FundingDict[fundingData.fundingCityId];
|
||||
var fundingCityData = cityDataList.First(data => data.id == fundingData.fundingCityId);
|
||||
|
||||
if (fundingCityGameData.Coin < fundingUnit)
|
||||
{
|
||||
warnObject.SetActive(true);
|
||||
fundingButtonOff.SetActive(true);
|
||||
fundingButton.gameObject.SetActive(false);
|
||||
return;
|
||||
}
|
||||
warnObject.SetActive(false);
|
||||
fundingButtonOff.SetActive(false);
|
||||
fundingButton.gameObject.SetActive(true);
|
||||
|
||||
iconTarget.DestroyAllChildrens();
|
||||
Instantiate(fundingCityData.GetIconPrefab(), iconTarget);
|
||||
titleText.text = fundingCityData.Name;
|
||||
myCoinText.text = fundingCityGameData.Coin.ToString();
|
||||
progressBeforeSlider.value = (float)funded / fundingData.needAmount;
|
||||
warnObject.SetActive(fundingCityGameData.Coin < fundingUnit);
|
||||
|
||||
var left = fundingData.needAmount - funded;
|
||||
var max = Mathf.Min(fundingCityGameData.Coin, left) / fundingUnit;
|
||||
|
@ -87,7 +78,9 @@ namespace MyGame.Scenes.WorldMap.Scripts
|
|||
.Subscribe(x =>
|
||||
{
|
||||
fundingAmount = x * fundingUnit;
|
||||
fundingButton.interactable = x > 0;
|
||||
var buttonActive = x > 0;
|
||||
fundingButtonOff.SetActive(!buttonActive);
|
||||
fundingButton.gameObject.SetActive(buttonActive);
|
||||
progressCoinText.text = $"{funded + fundingAmount}/{fundingData.needAmount}";
|
||||
fundingCoinText.text = (fundingAmount).ToString();
|
||||
progressAfterSlider.value = (float)(funded + fundingAmount) / fundingData.needAmount;
|
||||
|
|
|
@ -16,6 +16,7 @@ namespace MyGame.Scenes.WorldMap.Scripts
|
|||
[SerializeField] private GameObject cancelWall;
|
||||
[SerializeField] private FundingView fundingView;
|
||||
[SerializeField] private EarningView earningView;
|
||||
[SerializeField] private Button closeButton;
|
||||
[SerializeField] private float selectDuration = 1f;
|
||||
[SerializeField] private float zoomScale = 1f;
|
||||
private readonly CompositeDisposable citySelectDisposable = new();
|
||||
|
@ -39,10 +40,6 @@ namespace MyGame.Scenes.WorldMap.Scripts
|
|||
|
||||
var content = scrollRect.content;
|
||||
var contentOffset = content.localPosition;
|
||||
|
||||
// 選択中の店舗を中央に持ってくる
|
||||
content.localPosition = contentOffset.AddX(-cityIcons[0].transform.localPosition.x);
|
||||
|
||||
var selectedPos = selectedCityTarget.localPosition;
|
||||
var shareGate = true;
|
||||
cancelWall.AddComponent<ObservableEventTrigger>().OnPointerClickAsObservable()
|
||||
|
@ -67,6 +64,11 @@ namespace MyGame.Scenes.WorldMap.Scripts
|
|||
shareGate = true;
|
||||
});
|
||||
}).AddTo(this);
|
||||
|
||||
closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
|
||||
{
|
||||
TransitionManager.Instance.LoadScene(GameScenes.Main);
|
||||
}).AddTo(this);
|
||||
|
||||
/*
|
||||
* 初期実装都市のデータ設定
|
||||
|
@ -76,6 +78,12 @@ namespace MyGame.Scenes.WorldMap.Scripts
|
|||
|
||||
foreach (var cityIcon in cityIcons)
|
||||
{
|
||||
// 選択中の店舗を中央に持ってくる
|
||||
if (cityIcon.CityId == gameData.CurrentCityId)
|
||||
{
|
||||
content.localPosition = contentOffset.AddX(-cityIcon.transform.localPosition.x);
|
||||
}
|
||||
|
||||
cityIcon.SetNotify(false);
|
||||
var cityData = cityDataList.FirstOrDefault(data => data.id == cityIcon.CityId);
|
||||
var cityGameData = GameDataManager.GetCityGameData(cityIcon.CityId);
|
||||
|
|
|
@ -2259,10 +2259,12 @@ MonoBehaviour:
|
|||
cityIcons:
|
||||
- {fileID: 1393332535}
|
||||
- {fileID: 1933194629}
|
||||
- {fileID: 1652587521}
|
||||
scrollRect: {fileID: 1967067868}
|
||||
cancelWall: {fileID: 1834691514}
|
||||
fundingView: {fileID: 1232183326}
|
||||
earningView: {fileID: 1176822031}
|
||||
closeButton: {fileID: 709629884}
|
||||
selectDuration: 0.7
|
||||
zoomScale: 1.3
|
||||
--- !u!4 &1310610787
|
||||
|
@ -2596,6 +2598,18 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1652587521 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 8583778246870746332, guid: 572bc07a061f76c43a8f59298be43cbe,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 133733505}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 94d22fb4b30547a7a7d613555c1fd8da, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!20 &1673325602 stripped
|
||||
Camera:
|
||||
m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
|
||||
|
|
Loading…
Reference in New Issue