Merge branch 'feature/inventories' into develop
This commit is contained in:
@@ -682,11 +682,31 @@ public class CECHostPlayer : CECPlayer
|
||||
try
|
||||
{
|
||||
var money = GPDataTypeHelper.FromBytes<CSNetwork.GPDataType.cmd_get_own_money>(data);
|
||||
var ui = GameObject.FindFirstObjectByType<EC_InventoryUI>();
|
||||
var ui = GameObject.FindFirstObjectByType<BrewMonster.Scripts.Managers.EC_InventoryUI>();
|
||||
if (ui == null)
|
||||
{
|
||||
var all = Resources.FindObjectsOfTypeAll<BrewMonster.Scripts.Managers.EC_InventoryUI>();
|
||||
if (all != null)
|
||||
{
|
||||
for (int i = 0; i < all.Length; i++)
|
||||
{
|
||||
var candidate = all[i];
|
||||
if (candidate != null && candidate.gameObject.scene.IsValid())
|
||||
{
|
||||
ui = candidate;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ui != null)
|
||||
{
|
||||
ui.UpdateMoney(money.amount, money.max_amount);
|
||||
}
|
||||
else
|
||||
{
|
||||
BrewMonster.Scripts.Managers.EC_InventoryUI.CacheMoney(money.amount, money.max_amount);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -702,11 +722,31 @@ public class CECHostPlayer : CECPlayer
|
||||
try
|
||||
{
|
||||
var cash = GPDataTypeHelper.FromBytes<CSNetwork.GPDataType.player_cash>(data);
|
||||
var ui = GameObject.FindFirstObjectByType<EC_InventoryUI>();
|
||||
var ui = GameObject.FindFirstObjectByType<BrewMonster.Scripts.Managers.EC_InventoryUI>();
|
||||
if (ui == null)
|
||||
{
|
||||
var all = Resources.FindObjectsOfTypeAll<BrewMonster.Scripts.Managers.EC_InventoryUI>();
|
||||
if (all != null)
|
||||
{
|
||||
for (int i = 0; i < all.Length; i++)
|
||||
{
|
||||
var candidate = all[i];
|
||||
if (candidate != null && candidate.gameObject.scene.IsValid())
|
||||
{
|
||||
ui = candidate;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ui != null)
|
||||
{
|
||||
ui.UpdateCash(cash.cash_amount);
|
||||
}
|
||||
else
|
||||
{
|
||||
BrewMonster.Scripts.Managers.EC_InventoryUI.CacheCash(cash.cash_amount);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user