Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

dev/bolas #11

Merged
Garutako merged 7 commits from dev/bolas into main 2025-07-23 06:39:59 +00:00
Conversation 1 Commits 7 Files Changed 28 +43 -39
4 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52cb78bf42 - Show all commits

74
Assets/Scenes/Game.unity
View File

@ -3159,11 +3159,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 703543387231767793, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703543387231767793, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 703543387231767793, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3171,15 +3171,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 703543387231767793, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 708615230013985822, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 708615230013985822, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 708615230013985822, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3187,7 +3187,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 708615230013985822, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 907652128201574320, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_IsActive
@ -3231,11 +3231,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3243,7 +3243,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -5
objectReference: {fileID: 0}
- target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3343,11 +3343,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3181429381540750253, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3181429381540750253, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3181429381540750253, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3355,7 +3355,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3181429381540750253, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3495,11 +3495,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3507,15 +3507,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3523,15 +3523,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3539,7 +3539,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3575,11 +3575,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3587,7 +3587,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -103.3
objectReference: {fileID: 0}
- target: {fileID: 7106892478087422172, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3607,11 +3607,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3619,7 +3619,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 7106892479944355554, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3671,11 +3671,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3683,15 +3683,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 7488888111208117106, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7488888111208117109, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7488888111208117109, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7488888111208117109, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3699,15 +3703,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7488888111208117109, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -299.90002
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3715,7 +3719,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y

2
Assets/Scripts/Projectile.cs
View File

@ -53,7 +53,7 @@ public class Projectile : MonoBehaviour
_initialYDistance = Mathf.Abs(_initialY - _destinationY);
}
protected virtual void Update()
private void Update()
Garutako marked this conversation as resolved Outdated
Ader_Alisma commented 2025-07-22 01:11:00 +00:00
Outdated
Review
Copy Link

On a tu besoin de le mettre en protected virtual?

On a tu besoin de le mettre en protected virtual?
{
if (straightProjectile)
{

4
Assets/Scripts/Status/Status.cs
View File

@ -8,12 +8,12 @@ public abstract class Status : MonoBehaviour
[SerializeField]
protected float _duration;
protected virtual void Start()
private void Start()
{
EntityLinked = GetComponent<Entity>();
}
protected virtual void Update()
private void Update()
Garutako marked this conversation as resolved Outdated
Ader_Alisma commented 2025-07-22 01:11:14 +00:00
Outdated
Review
Copy Link

Idem pour le protected virtual

Idem pour le protected virtual
{
// effect timer
_duration -= Time.deltaTime;

2
Assets/Scripts/StatusHandler.cs
View File

@ -58,6 +58,6 @@ public class StatusHandler : MonoBehaviour
private void Start()
{
_entityLinked = gameObject.GetComponent<Entity>(); ;
_entityLinked = gameObject.GetComponent<Entity>();
Garutako marked this conversation as resolved Outdated
Ader_Alisma commented 2025-07-22 00:34:39 +00:00
Outdated
Review
Copy Link

Point-virgule de trop

Point-virgule de trop
}
}