0.3.2.8 누락된 업데이트 추가
This commit is contained in:
parent
3b66a33d2f
commit
1cf7b9a48f
@ -201,6 +201,13 @@ namespace BlueWater
|
|||||||
{
|
{
|
||||||
OnCleaningAll?.Invoke();
|
OnCleaningAll?.Invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 모든 배럴의 게이지 추가
|
||||||
|
public static Action<int> OnAddBarrels;
|
||||||
|
public static void InvokeAddBarrels(int addedValue)
|
||||||
|
{
|
||||||
|
OnAddBarrels?.Invoke(addedValue);
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
@ -61,12 +61,19 @@ namespace BlueWater.Tycoons
|
|||||||
protected override void Start()
|
protected override void Start()
|
||||||
{
|
{
|
||||||
base.Start();
|
base.Start();
|
||||||
|
|
||||||
|
EventManager.OnAddBarrels += AddCurrentAmount;
|
||||||
|
|
||||||
_liquidImage.sprite = _isActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock;
|
_liquidImage.sprite = _isActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock;
|
||||||
InteractionMessage = $"{_liquidData.Name} 따르기";
|
InteractionMessage = $"{_liquidData.Name} 따르기";
|
||||||
_instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity);
|
_instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
EventManager.OnAddBarrels -= AddCurrentAmount;
|
||||||
|
}
|
||||||
|
|
||||||
public override void Interaction()
|
public override void Interaction()
|
||||||
{
|
{
|
||||||
OnBarrelInteracted?.Invoke(this);
|
OnBarrelInteracted?.Invoke(this);
|
||||||
@ -135,5 +142,12 @@ namespace BlueWater.Tycoons
|
|||||||
IsActivated = true;
|
IsActivated = true;
|
||||||
SetCurrentAmount(_liquidData.GetMaxAmount());
|
SetCurrentAmount(_liquidData.GetMaxAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void AddCurrentAmount(int addedValue)
|
||||||
|
{
|
||||||
|
if (!_isActivated) return;
|
||||||
|
|
||||||
|
SetCurrentAmount(CurrentAmount + addedValue, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -102,14 +102,5 @@ namespace BlueWater.Tycoons
|
|||||||
{
|
{
|
||||||
return _barrels.Where(barrel => barrel.IsActivated).ToList();
|
return _barrels.Where(barrel => barrel.IsActivated).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AllAddBarrels(int addVal)
|
|
||||||
{
|
|
||||||
var activeBarrels = GetActivatedBarrels();
|
|
||||||
foreach (var VARIABLE in activeBarrels)
|
|
||||||
{
|
|
||||||
VARIABLE.SetCurrentAmount(VARIABLE.CurrentAmount + addVal, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ namespace BlueWater.Uis
|
|||||||
var addedMaxHealthPoint = changedMaxHealthPoint - previousMaxHealthPoint;
|
var addedMaxHealthPoint = changedMaxHealthPoint - previousMaxHealthPoint;
|
||||||
_maxHeartCount = Mathf.CeilToInt(changedMaxHealthPoint * 0.5f);
|
_maxHeartCount = Mathf.CeilToInt(changedMaxHealthPoint * 0.5f);
|
||||||
InitializeHealthPoint();
|
InitializeHealthPoint();
|
||||||
TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth += addedMaxHealthPoint * 2;
|
TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth += addedMaxHealthPoint;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetCurrentHealthPoint(int changedHealthPoint)
|
public void SetCurrentHealthPoint(int changedHealthPoint)
|
||||||
|
@ -173,7 +173,7 @@ namespace BlueWater.Uis
|
|||||||
case "AddGarnish2":
|
case "AddGarnish2":
|
||||||
TycoonManager.Instance.TycoonStatus.CurrentGarnishAmount2 += 4000; break;
|
TycoonManager.Instance.TycoonStatus.CurrentGarnishAmount2 += 4000; break;
|
||||||
case "AddAllLiquid":
|
case "AddAllLiquid":
|
||||||
TycoonManager.Instance.TycoonIngredientController.AllAddBarrels(1000); break;
|
EventManager.InvokeAddBarrels(1000); break;
|
||||||
case "ServerNpc":
|
case "ServerNpc":
|
||||||
EventManager.InvokeCreateServerCrew(); break;
|
EventManager.InvokeCreateServerCrew(); break;
|
||||||
case "CleanerNpc":
|
case "CleanerNpc":
|
||||||
|
Loading…
Reference in New Issue
Block a user