Browse Source

Fix money display stopping updating and sell view filters

Devin Braune 5 years ago
parent
commit
29bd418163
  1. 8
      Assets/Scenes/NewShop.unity
  2. 2
      Assets/Scripts/Shop/View/ShopView.cs

8
Assets/Scenes/NewShop.unity

@ -337,7 +337,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3} m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
view: {fileID: 0} view: {fileID: 336428456}
filter: 100 filter: 100
--- !u!114 &24632925 --- !u!114 &24632925
MonoBehaviour: MonoBehaviour:
@ -1543,7 +1543,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3} m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
view: {fileID: 0} view: {fileID: 336428456}
filter: 0 filter: 0
--- !u!114 &169548031 --- !u!114 &169548031
MonoBehaviour: MonoBehaviour:
@ -15198,7 +15198,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3} m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
view: {fileID: 0} view: {fileID: 336428456}
filter: 1 filter: 1
--- !u!114 &1371998400 --- !u!114 &1371998400
MonoBehaviour: MonoBehaviour:
@ -17028,7 +17028,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3} m_Script: {fileID: 11500000, guid: a5001818e381b2c4890a9f8b1d8c943e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
view: {fileID: 0} view: {fileID: 336428456}
filter: 2 filter: 2
--- !u!114 &1484410839 --- !u!114 &1484410839
MonoBehaviour: MonoBehaviour:

2
Assets/Scripts/Shop/View/ShopView.cs

@ -52,7 +52,6 @@ public abstract class ShopView : MonoBehaviour
private void Start() private void Start()
{ {
RegisterMoneyObserver(); // Make sure if this thing's got a money component somewhere we register it as an observer for the inventory we're looking at
} }
private void OnEnable() private void OnEnable()
@ -61,6 +60,7 @@ public abstract class ShopView : MonoBehaviour
if (model == null) model = ownModel.Model; if (model == null) model = ownModel.Model;
model.SetTradePartner(tradePartner.Inventory); model.SetTradePartner(tradePartner.Inventory);
PopulateItemIconView(); //Display items PopulateItemIconView(); //Display items
RegisterMoneyObserver(); // Make sure if this thing's got a money component somewhere we register it as an observer for the inventory we're looking at
} }
private void OnDisable() private void OnDisable()

Loading…
Cancel
Save