Added Dohya
This commit is contained in:
@@ -24,7 +24,7 @@ public sealed class CannonControlBinder : MonoBehaviour
|
||||
return;
|
||||
|
||||
if (fireLever != null)
|
||||
fireLever.StateChanged += HandleFireLever;
|
||||
fireLever.MaximumReached += HandleFireLever;
|
||||
if (decreaseTimerButton != null)
|
||||
decreaseTimerButton.Pressed += HandleDecreaseTimer;
|
||||
if (increaseTimerButton != null)
|
||||
@@ -37,7 +37,7 @@ public sealed class CannonControlBinder : MonoBehaviour
|
||||
if (!bound)
|
||||
return;
|
||||
if (fireLever != null)
|
||||
fireLever.StateChanged -= HandleFireLever;
|
||||
fireLever.MaximumReached -= HandleFireLever;
|
||||
if (decreaseTimerButton != null)
|
||||
decreaseTimerButton.Pressed -= HandleDecreaseTimer;
|
||||
if (increaseTimerButton != null)
|
||||
@@ -45,7 +45,7 @@ public sealed class CannonControlBinder : MonoBehaviour
|
||||
bound = false;
|
||||
}
|
||||
|
||||
private void HandleFireLever(bool isActivated) => cannon.SetFireRequested(isActivated);
|
||||
private void HandleFireLever() => cannon.RequestStartCountdown();
|
||||
private void HandleDecreaseTimer() => cannon.RequestDecreaseShotDelay();
|
||||
private void HandleIncreaseTimer() => cannon.RequestIncreaseShotDelay();
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ public sealed class NetworkPhysicalLeverInteractable :
|
||||
NetworkVariableWritePermission.Server);
|
||||
|
||||
private bool hasSnapTarget;
|
||||
private bool maximumEndpointLatched;
|
||||
private float snapTargetValue;
|
||||
private float automaticReturnTime = -1f;
|
||||
|
||||
@@ -57,6 +58,7 @@ public sealed class NetworkPhysicalLeverInteractable :
|
||||
|
||||
public event Action<float> ValueChanged;
|
||||
public event Action<bool> StateChanged;
|
||||
public event Action MaximumReached;
|
||||
|
||||
public override string InteractionPrompt => IsControlledByLocalPlayer
|
||||
? ReleasePrompt
|
||||
@@ -96,6 +98,7 @@ public sealed class NetworkPhysicalLeverInteractable :
|
||||
{
|
||||
synchronizedValue.Value = InitialPositionValue;
|
||||
isActivated.Value = initialPositionIsMaximum;
|
||||
maximumEndpointLatched = initialPositionIsMaximum;
|
||||
}
|
||||
|
||||
synchronizedValue.OnValueChanged += HandleValueChanged;
|
||||
@@ -220,9 +223,24 @@ public sealed class NetworkPhysicalLeverInteractable :
|
||||
const float endpointTolerance = 0.001f;
|
||||
|
||||
if (synchronizedValue.Value >= 1f - endpointTolerance)
|
||||
{
|
||||
SetActivation(true);
|
||||
else if (synchronizedValue.Value <= endpointTolerance)
|
||||
if (!maximumEndpointLatched)
|
||||
{
|
||||
maximumEndpointLatched = true;
|
||||
MaximumReached?.Invoke();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
maximumEndpointLatched = false;
|
||||
}
|
||||
|
||||
if (synchronizedValue.Value <= endpointTolerance)
|
||||
{
|
||||
maximumEndpointLatched = false;
|
||||
SetActivation(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void SetActivation(bool activated)
|
||||
|
||||
@@ -24,6 +24,35 @@ public sealed class ItemProcessingRecipe : ScriptableObject
|
||||
(!string.IsNullOrEmpty(inputItem.ItemId) && item.ItemId == inputItem.ItemId);
|
||||
}
|
||||
|
||||
private void OnValidate() =>
|
||||
public bool TryValidateOutputPrefab(out string error)
|
||||
{
|
||||
error = string.Empty;
|
||||
if (outputItem == null || outputItem.WorldPrefab == null)
|
||||
return true;
|
||||
|
||||
NetworkItem prefabItem = outputItem.WorldPrefab.GetComponent<NetworkItem>();
|
||||
if (prefabItem == null)
|
||||
{
|
||||
error = $"Output prefab '{outputItem.WorldPrefab.name}' has no NetworkItem.";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (prefabItem.Definition == outputItem)
|
||||
return true;
|
||||
|
||||
string actualOutput = prefabItem.Definition != null
|
||||
? prefabItem.Definition.name
|
||||
: "None";
|
||||
error = $"Output item '{outputItem.name}' points to prefab " +
|
||||
$"'{outputItem.WorldPrefab.name}', but that prefab uses definition " +
|
||||
$"'{actualOutput}'.";
|
||||
return false;
|
||||
}
|
||||
|
||||
private void OnValidate()
|
||||
{
|
||||
recipeId = recipeId?.Trim().ToLowerInvariant();
|
||||
if (!TryValidateOutputPrefab(out string error))
|
||||
Debug.LogError($"Invalid processing recipe '{name}': {error}", this);
|
||||
}
|
||||
}
|
||||
|
||||
+8
-3
@@ -202,12 +202,16 @@ public sealed class NetworkItemProcessingWorkstation : NetworkWorkstationControl
|
||||
outputObject.Spawn();
|
||||
|
||||
currentItem = outputObject.GetComponent<NetworkItem>();
|
||||
if (currentItem == null ||
|
||||
if (currentItem == null || currentItem.Definition != recipe.OutputItem ||
|
||||
!WorkstationItemControlUtility.TryGetControl(currentItem, out _))
|
||||
{
|
||||
string actualDefinition = currentItem != null && currentItem.Definition != null
|
||||
? currentItem.Definition.name
|
||||
: "None";
|
||||
Debug.LogError(
|
||||
$"{name} cannot produce '{recipe.OutputItem.DisplayName}': " +
|
||||
"the output prefab must contain NetworkItem and a supported " +
|
||||
"the output prefab must contain NetworkItem with the same " +
|
||||
$"definition (actual: '{actualDefinition}') and a supported " +
|
||||
"Carry or Drag interaction component.",
|
||||
this);
|
||||
outputObject.Despawn(true);
|
||||
@@ -292,6 +296,7 @@ public sealed class NetworkItemProcessingWorkstation : NetworkWorkstationControl
|
||||
|
||||
private static bool IsRecipeValid(ItemProcessingRecipe recipe) =>
|
||||
recipe != null && recipe.InputItem != null &&
|
||||
recipe.OutputItem != null && recipe.OutputItem.WorldPrefab != null;
|
||||
recipe.OutputItem != null && recipe.OutputItem.WorldPrefab != null &&
|
||||
recipe.TryValidateOutputPrefab(out _);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user