強化画面売り切れ表示/機械スキン対応

This commit is contained in:
kimura 2021-09-30 14:09:38 +09:00
parent 483190865a
commit 3db321eba3
9 changed files with 244 additions and 63 deletions

View File

@ -199,8 +199,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8700982206849067008}
- component: {fileID: 3165103491087421472}
- component: {fileID: 8641555860015686672}
m_Layer: 5
m_Name: icon
m_TagString: Untagged
@ -218,7 +216,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 3609911525820508123}
m_Father: {fileID: 867572946509113782}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -227,40 +226,133 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 14.900024}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3165103491087421472
CanvasRenderer:
--- !u!1001 &8729906240455127143
PrefabInstance:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8700982206849067008}
m_Modifications:
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_SizeDelta.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_SizeDelta.y
value: 150
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8055489302953130266, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_Name
value: MachineIcon_a
objectReference: {fileID: 0}
- target: {fileID: 8055489302953130266, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7adad689215b3477382c2113d7dd6842, type: 3}
--- !u!224 &3609911525820508123 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5421806259187062716, guid: 7adad689215b3477382c2113d7dd6842,
type: 3}
m_PrefabInstance: {fileID: 8729906240455127143}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7664194781847762082}
m_CullTransparentMesh: 0
--- !u!114 &8641555860015686672
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7664194781847762082}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b85997666d8de0b4b82962b577d0066c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

View File

@ -1384,6 +1384,7 @@ MonoBehaviour:
disableButton2: {fileID: 8736114269955797018}
reinforcementWindow: {fileID: 8736114270973342973}
releaseWindow: {fileID: 8736114270187051288}
maxWindow: {fileID: 4068264699954174295}
currentSeedling: {fileID: 5298427820679491484}
nextSeedling: {fileID: 6045849226816011445}
currentSignBoard: {fileID: 5404513298100535288}
@ -3643,12 +3644,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3}
--- !u!224 &5404513298611757388 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
type: 3}
m_PrefabInstance: {fileID: 8736114271678039720}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5404513298602980439 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
@ -3661,6 +3656,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &5404513298611757388 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606,
type: 3}
m_PrefabInstance: {fileID: 8736114271678039720}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8736114271969069798
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -629,8 +629,13 @@ MonoBehaviour:
priceText: {fileID: 2616693359208994957}
currentHarvestedText: {fileID: 8735273494761787329}
nextHarvestedText: {fileID: 7892036374385157400}
currentMachineImage: {fileID: 6669907502491996560}
nextMachineImage: {fileID: 5201530277052463945}
dialogButton: {fileID: 2616693359888773713}
disableButton: {fileID: 2616693360873139563}
maxWindow: {fileID: 5634060817564804317}
maxHarvestedText: {fileID: 5369860504688840119}
maxMachineImage: {fileID: 8010842515348788198}
--- !u!1 &2616693360524817894
GameObject:
m_ObjectHideFlags: 0
@ -1427,7 +1432,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &9056227429215986452
RectTransform:
m_ObjectHideFlags: 0
@ -1976,6 +1981,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1651699210718923133, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4187126432452018719, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
propertyPath: m_Name
@ -1988,12 +1998,30 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3}
--- !u!224 &8010842515348788198 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
m_PrefabInstance: {fileID: 1723792222401182694}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2010328485157376592 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
m_PrefabInstance: {fileID: 1723792222401182694}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5369860504688840119 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6731104945823381073, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
m_PrefabInstance: {fileID: 1723792222401182694}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2616693360228055440
PrefabInstance:
m_ObjectHideFlags: 0
@ -2136,6 +2164,12 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2616693360228055440}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6669907502491996560 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
m_PrefabInstance: {fileID: 2616693360228055440}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3526200919544632137
PrefabInstance:
m_ObjectHideFlags: 0
@ -2272,6 +2306,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &5201530277052463945 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2,
type: 3}
m_PrefabInstance: {fileID: 3526200919544632137}
m_PrefabAsset: {fileID: 0}
--- !u!224 &4388100270089255679 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2,

View File

@ -1352,6 +1352,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 528402689}
m_Modifications:
- target: {fileID: 3975643701173361712, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4068264699954174295, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6796275775689852962, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8736114270187051288, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c,
type: 3}
propertyPath: m_IsActive

View File

@ -505,8 +505,8 @@ MonoBehaviour:
purchaseButton: {fileID: 1192264083}
releaseButton: {fileID: 865761136}
closeButton: {fileID: 1130921226}
ReinforceObject: {fileID: 1937871401}
ReleaseObject: {fileID: 944967792}
reinforceObject: {fileID: 1937871401}
releaseObject: {fileID: 944967792}
currentSeedling: {fileID: 3910593343511446857}
nextSeedling: {fileID: 1480555406}
currentSignBoard: {fileID: 3910593343511446856}

View File

@ -44,7 +44,7 @@ public class CornFieldReinforcement : MonoBehaviour
// Max
if (lineData.Level == CornFieldRank.Rank3)
{
view.SetButtonActive(false);
view.SetMax();
}
else
{
@ -89,7 +89,7 @@ public class CornFieldReinforcement : MonoBehaviour
var maxLevel = fieldData.Where(x => x.Type == CornFieldUpgradeType.Machine).Max(x => x.level);
if (gameData.MachineLevel == maxLevel)
{
machineUpgradeView.SetButtonActive(false);
machineUpgradeView.SetMax(maxLevel);
}
else
{

View File

@ -17,8 +17,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour
[SerializeField] private Button purchaseButton;
[SerializeField] private Button releaseButton;
[SerializeField] private Button closeButton;
[SerializeField] private GameObject ReinforceObject;
[SerializeField] private GameObject ReleaseObject;
[SerializeField] private GameObject reinforceObject;
[SerializeField] private GameObject releaseObject;
[SerializeField] private ReinforcementSeedlingView currentSeedling;
[SerializeField] private ReinforcementSeedlingView nextSeedling;
[SerializeField] private TextMeshProUGUI currentSignBoard;
@ -76,8 +76,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour
{
if (data is null)
{
ReinforceObject.SetActive(false);
ReleaseObject.SetActive(true);
reinforceObject.SetActive(false);
releaseObject.SetActive(true);
purchaseButton.gameObject.SetActive(false);
releaseButton.gameObject.SetActive(true);
releasePriceText.text = price.ToString();
@ -85,8 +85,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour
}
else
{
ReinforceObject.SetActive(true);
ReleaseObject.SetActive(false);
reinforceObject.SetActive(true);
releaseObject.SetActive(false);
purchaseButton.gameObject.SetActive(true);
releaseButton.gameObject.SetActive(false);
reinforcePriceText.text = price.ToString();
@ -104,8 +104,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour
}
private void SetMachineData(int machineLevel, int price)
{
ReinforceObject.SetActive(false);
ReleaseObject.SetActive(false);
reinforceObject.SetActive(false);
releaseObject.SetActive(false);
purchaseButton.gameObject.SetActive(true);
releaseButton.gameObject.SetActive(false);
}

View File

@ -18,6 +18,7 @@ public class CornFieldReinforcementView : MonoBehaviour
[SerializeField] private GameObject disableButton2;
[SerializeField] private GameObject reinforcementWindow;
[SerializeField] private GameObject releaseWindow;
[SerializeField] private GameObject maxWindow;
[SerializeField] private ReinforcementSeedlingView currentSeedling;
[SerializeField] private ReinforcementSeedlingView nextSeedling;
[SerializeField] private TextMeshProUGUI currentSignBoard;
@ -33,6 +34,7 @@ public class CornFieldReinforcementView : MonoBehaviour
{
reinforcementWindow.SetActive(true);
releaseWindow.SetActive(false);
maxWindow.SetActive(false);
var nextRank = CornFieldReinforcement.GetNextRank(data.Level);
var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(data.Type);
var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList<FieldUpgradeData>(Const.FieldUpgradeDataSheet);
@ -50,9 +52,17 @@ public class CornFieldReinforcementView : MonoBehaviour
{
reinforcementWindow.SetActive(false);
releaseWindow.SetActive(true);
maxWindow.SetActive(false);
releasePriceText.text = price.ToString();
releaseText.text = string.Format(ReleaseFormat, GetPlantTypeText(lineType));
}
public void SetMax()
{
reinforcementWindow.SetActive(false);
releaseWindow.SetActive(false);
maxWindow.SetActive(true);
}
public void SetButtonActive(bool active)
{

View File

@ -6,23 +6,46 @@ using UnityEngine.UI;
public class MachineUpgradeView : MonoBehaviour
{
private static readonly string SignBoardFormat = "x{0}";
private static readonly string harvestedTextFormat = "{0}";
[SerializeField] private Text priceText;
[SerializeField] private Text currentHarvestedText;
[SerializeField] private Text nextHarvestedText;
[SerializeField] private Transform currentMachineImage;
[SerializeField] private Transform nextMachineImage;
[SerializeField] private Button dialogButton;
[SerializeField] private GameObject disableButton;
[SerializeField] private GameObject maxWindow;
[SerializeField] private Text maxHarvestedText;
[SerializeField] private Transform maxMachineImage;
public IObservable<Unit> ButtonClickObserve => dialogButton.OnClickAsObservable().TakeUntilDestroy(this);
public void SetData(int level, int price)
{
maxWindow.SetActive(false);
var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList<FieldUpgradeData>(Const.FieldUpgradeDataSheet);
var currentHarvestedCorn = fieldData.FirstOrDefault(x => x.Type == CornFieldUpgradeType.Machine && x.level == level)?.harvested ?? 20;
var nextHarvestedCorn = fieldData.FirstOrDefault(x => x.Type == CornFieldUpgradeType.Machine && x.level == level + 1)?.harvested ?? 20;
var machineList = fieldData.Where(data => data.Type == CornFieldUpgradeType.Machine).ToList();
var currentMachineData = machineList.FirstOrDefault(data => data.level == level);
var nextMachineData = machineList.FirstOrDefault(data => data.level == level + 1);
var currentHarvestedCorn = currentMachineData?.harvested ?? 20;
var nextHarvestedCorn = nextMachineData?.harvested ?? 20;
currentMachineImage.DestroyAllChildrens();
nextMachineImage.DestroyAllChildrens();
Instantiate(currentMachineData.GetIconPrefab(), currentMachineImage);
Instantiate(nextMachineData.GetIconPrefab(), nextMachineImage);
priceText.text = price.ToString();
currentHarvestedText.text = string.Format(SignBoardFormat, currentHarvestedCorn.ToString());
nextHarvestedText.text = string.Format(SignBoardFormat, nextHarvestedCorn.ToString());
currentHarvestedText.text = string.Format(harvestedTextFormat, currentHarvestedCorn.ToString());
nextHarvestedText.text = string.Format(harvestedTextFormat, nextHarvestedCorn.ToString());
}
public void SetMax(int maxLevel)
{
maxWindow.SetActive(true);
var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList<FieldUpgradeData>(Const.FieldUpgradeDataSheet);
var machine = fieldData.First(x => x.Type == CornFieldUpgradeType.Machine && x.level == maxLevel);
maxMachineImage.DestroyAllChildrens();
Instantiate(machine.GetIconPrefab(), maxMachineImage);
maxHarvestedText.text = string.Format(harvestedTextFormat, machine.harvested.ToString());
}
public void SetButtonActive(bool active)