Made fans OP for playtest
This commit is contained in:
@@ -26,7 +26,7 @@ MonoBehaviour:
|
||||
Prefab: {fileID: 1970033728917450326, guid: 3492b31295b69c148bb5a0660e598878,
|
||||
type: 3}
|
||||
- Name: Spring
|
||||
Requirement: 0
|
||||
Requirement: 2
|
||||
Prefab: {fileID: 8624048914473773482, guid: 6060f6928011bf54dad9c5ef16fb1048,
|
||||
type: 3}
|
||||
- Name: Slicer
|
||||
@@ -38,22 +38,22 @@ MonoBehaviour:
|
||||
Prefab: {fileID: 4125748828694197055, guid: a4c4117a8b12b324186385e04c3ede89,
|
||||
type: 3}
|
||||
- Name: Fermenter
|
||||
Requirement: 0
|
||||
Requirement: 7
|
||||
Prefab: {fileID: 3120737319915985322, guid: b14b2be65581162469cf0e853bdeb24e,
|
||||
type: 3}
|
||||
- Name: Grinder
|
||||
Requirement: 0
|
||||
Requirement: 5
|
||||
Prefab: {fileID: 4440782070338813379, guid: d25bbc19d1df47f46bef5870a410e4ba,
|
||||
type: 3}
|
||||
- Name: Freezer
|
||||
Requirement: 0
|
||||
Requirement: 4
|
||||
Prefab: {fileID: 3206624505647374516, guid: eb59ecc0fb9acda43a01511f3f846b1d,
|
||||
type: 3}
|
||||
- Name: Mixer
|
||||
Requirement: 0
|
||||
Requirement: 6
|
||||
Prefab: {fileID: 1231289801164129672, guid: 42cbc99b07e04604baf02f4ed170aac6,
|
||||
type: 3}
|
||||
- Name: Peeler
|
||||
Requirement: 0
|
||||
Requirement: 8
|
||||
Prefab: {fileID: 7230295749174351428, guid: d26b3108e619653498c646cb86227d43,
|
||||
type: 3}
|
||||
|
||||
@@ -1471,6 +1471,7 @@ RectTransform:
|
||||
- {fileID: 2142689107}
|
||||
- {fileID: 1330313875}
|
||||
- {fileID: 1194686691}
|
||||
- {fileID: 1740340058}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@@ -2201,6 +2202,41 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Fruitomation::Fruitomation.Game.Items.ItemInfoRegistry
|
||||
SerializedRegistry: {fileID: 11400000, guid: b518751a8b5ee0942af68ec87eeba0c5, type: 2}
|
||||
--- !u!1 &1740340057
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1740340058}
|
||||
m_Layer: 5
|
||||
m_Name: GameRect
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1740340058
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1740340057}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1165634414}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 3840, y: 2160}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1935863237
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2250,6 +2286,7 @@ MonoBehaviour:
|
||||
MaxSpawnTime: 0.2
|
||||
FruitSpawnParent: {fileID: 1944344878}
|
||||
GameCanvas: {fileID: 1165634413}
|
||||
GameBounds: {fileID: 1740340058}
|
||||
BaseItemPrefab: {fileID: 988939638164667087, guid: 74975659e85ee6843995caf836d16f7c,
|
||||
type: 3}
|
||||
ApplePrefab: {fileID: 4062657912758122058, guid: 23e3bfe33d8c6004c85fd638db567ab6,
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Fruitomation.Game
|
||||
if (hit.collider is null)
|
||||
{
|
||||
Vector3 force = new(-transform.localScale.x, 0f, 0f);
|
||||
body.AddForce(force * (12f / mag), ForceMode2D.Force);
|
||||
body.AddForce(force * 5f, ForceMode2D.Impulse);
|
||||
}
|
||||
}
|
||||
}, TriggerType.Stay);
|
||||
|
||||
@@ -17,6 +17,9 @@ namespace Fruitomation.Game
|
||||
[Header("References")]
|
||||
[SerializeField] private Transform FruitSpawnParent;
|
||||
[SerializeField] private Canvas GameCanvas;
|
||||
[SerializeField] private RectTransform GameBounds;
|
||||
|
||||
public static RectTransform Bounds => Instance.GameBounds;
|
||||
|
||||
[Header("Prefabs")]
|
||||
[SerializeField] private GameObject BaseItemPrefab;
|
||||
|
||||
@@ -112,7 +112,7 @@ namespace Fruitomation.Game.Items
|
||||
|
||||
private void FixedUpdate()
|
||||
{
|
||||
if (IsNotWithinCanvas(RectTransform, AttachedCanvas.GetComponent<RectTransform>()))
|
||||
if (IsNotWithinCanvas(RectTransform, FruitSpawner.Bounds))
|
||||
{
|
||||
TriggerDestruction();
|
||||
}
|
||||
@@ -145,8 +145,8 @@ namespace Fruitomation.Game.Items
|
||||
}
|
||||
|
||||
return
|
||||
!(bMin > (aMin - 1f)) ||
|
||||
!(bMax < (aMax + 1f));
|
||||
!(bMin > (aMin)) ||
|
||||
!(bMax < (aMax));
|
||||
}
|
||||
|
||||
public void TriggerDestruction(bool harvest = true)
|
||||
|
||||
Reference in New Issue
Block a user