iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.2.8 누락된 업데이트 추가

Browse Source
This commit is contained in:
NTG_Lenovo 2024-10-28 14:09:06 +09:00
parent 3b66a33d2f
commit 1cf7b9a48f
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/02.Scripts/EventManager.cs
View File

@ -202,6 +202,13 @@ namespace BlueWater
OnCleaningAll?.Invoke();
}
// 모든 배럴의 게이지 추가
public static Action<int> OnAddBarrels;
public static void InvokeAddBarrels(int addedValue)
{
OnAddBarrels?.Invoke(addedValue);
}
#endregion
}
}

14
Assets/02.Scripts/Prop/Tycoon/Barrel.cs
View File

@ -62,11 +62,18 @@ namespace BlueWater.Tycoons
{
base.Start();
EventManager.OnAddBarrels += AddCurrentAmount;
_liquidImage.sprite = _isActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.Lock;
InteractionMessage = $"{_liquidData.Name} 따르기";
_instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity);
}
private void OnDestroy()
{
EventManager.OnAddBarrels -= AddCurrentAmount;
}
public override void Interaction()
{
OnBarrelInteracted?.Invoke(this);
@ -135,5 +142,12 @@ namespace BlueWater.Tycoons
IsActivated = true;
SetCurrentAmount(_liquidData.GetMaxAmount());
}
public void AddCurrentAmount(int addedValue)
{
if (!_isActivated) return;
SetCurrentAmount(CurrentAmount + addedValue, true);
}
}
}

9
Assets/02.Scripts/Tycoon/TycoonIngredientController.cs
View File

@ -102,14 +102,5 @@ namespace BlueWater.Tycoons
{
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);
}
}
}
}

2
Assets/02.Scripts/Ui/Combat/PlayerHealthPointUi.cs
View File

@ -76,7 +76,7 @@ namespace BlueWater.Uis
var addedMaxHealthPoint = changedMaxHealthPoint - previousMaxHealthPoint;
_maxHeartCount = Mathf.CeilToInt(changedMaxHealthPoint * 0.5f);
InitializeHealthPoint();
TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth += addedMaxHealthPoint * 2;
TycoonManager.Instance.TycoonStatus.CurrentPlayerHealth += addedMaxHealthPoint;
}
public void SetCurrentHealthPoint(int changedHealthPoint)

2
Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
View File

@ -173,7 +173,7 @@ namespace BlueWater.Uis
case "AddGarnish2":
TycoonManager.Instance.TycoonStatus.CurrentGarnishAmount2 += 4000; break;
case "AddAllLiquid":
TycoonManager.Instance.TycoonIngredientController.AllAddBarrels(1000); break;
EventManager.InvokeAddBarrels(1000); break;
case "ServerNpc":
EventManager.InvokeCreateServerCrew(); break;
case "CleanerNpc":