Skip to content

Commit e94893d

Browse files
jcs090218jcs090218
committed
feat: Add more transform type properties
1 parent 02aef03 commit e94893d

File tree

9 files changed

+268
-42
lines changed

9 files changed

+268
-42
lines changed

‎Assets/JCSUnity/Scripts/Actions/Pathfinding/JCS_TweenPathAction.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class JCS_TweenPathAction : MonoBehaviour
2222
/* Variables */
2323

2424
private JCS_TransformTweener mTransformTweener = null;
25+
2526
private JCS_AdjustTimeTrigger mAdjustTimerTrigger = null;
2627

2728
[Separator("Check Variables (JCS_TweenPathAction)")]
@@ -34,7 +35,7 @@ public class JCS_TweenPathAction : MonoBehaviour
3435

3536
[Tooltip("List of points for setting up the path.")]
3637
[SerializeField]
37-
private List<Transform> mPoints = null;
38+
private List<JCS_UnityObject> mPoints = null;
3839

3940
[Tooltip("Random the path by randomizing the target point.")]
4041
[SerializeField]
@@ -46,7 +47,7 @@ public class JCS_TweenPathAction : MonoBehaviour
4647

4748
/* Setter & Getter */
4849

49-
public List<Transform> Points { get { return this.mPoints; } }
50+
public List<JCS_UnityObject> Points { get { return this.mPoints; } }
5051
public bool Random { get { return this.mRandom; } set { this.mRandom = value; } }
5152
public bool ContinueTween { get { return this.mContinueTween; } set { this.mContinueTween = value; } }
5253

@@ -96,7 +97,7 @@ private void DoPath()
9697
if (mContinueTween)
9798
mTransformTweener.DoTweenContinue(mPoints[mTargetPointIndex]);
9899
else
99-
mTransformTweener.DoTween(mPoints[mTargetPointIndex].position);
100+
mTransformTweener.DoTween(mPoints[mTargetPointIndex].transform.position);
100101
}
101102
}
102103
}

‎Assets/JCSUnity/Scripts/Effects/3D/JCS_3DConstWaveEffect.cs‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public Vector3 GetVector3ByTransformType(bool local = false)
133133

134134
switch (mTransformType)
135135
{
136+
/* Transform */
136137
case JCS_TransformType.POSITION:
137138
{
138139
if (!local)
@@ -154,6 +155,31 @@ public Vector3 GetVector3ByTransformType(bool local = false)
154155
val = LocalScale;
155156
}
156157
break;
158+
/* RectTransform */
159+
case JCS_TransformType.ANCHOR_MIN:
160+
val = mRectTransform.anchorMin;
161+
break;
162+
case JCS_TransformType.ANCHOR_MAX:
163+
val = mRectTransform.anchorMax;
164+
break;
165+
case JCS_TransformType.SIZE_DELTA:
166+
val = mRectTransform.sizeDelta;
167+
break;
168+
case JCS_TransformType.PIVOT:
169+
val = mRectTransform.pivot;
170+
break;
171+
case JCS_TransformType.ANCHOR_POSITION:
172+
val = mRectTransform.anchoredPosition;
173+
break;
174+
case JCS_TransformType.ANCHOR_POSITION_3D:
175+
val = mRectTransform.anchoredPosition3D;
176+
break;
177+
case JCS_TransformType.OFFSET_MIN:
178+
val = mRectTransform.offsetMin;
179+
break;
180+
case JCS_TransformType.OFFSET_MAX:
181+
val = mRectTransform.offsetMax;
182+
break;
157183
}
158184

159185
return val;
@@ -168,6 +194,7 @@ public void SetVector3ByTransformType(Vector3 newVal, bool local = false)
168194
{
169195
switch (mTransformType)
170196
{
197+
/* Transform */
171198
case JCS_TransformType.POSITION:
172199
{
173200
if (!local)
@@ -189,6 +216,31 @@ public void SetVector3ByTransformType(Vector3 newVal, bool local = false)
189216
this.LocalScale = newVal;
190217
}
191218
break;
219+
/* RectTransform */
220+
case JCS_TransformType.ANCHOR_MIN:
221+
mRectTransform.anchorMin = newVal;
222+
break;
223+
case JCS_TransformType.ANCHOR_MAX:
224+
mRectTransform.anchorMax = newVal;
225+
break;
226+
case JCS_TransformType.SIZE_DELTA:
227+
mRectTransform.sizeDelta = newVal;
228+
break;
229+
case JCS_TransformType.PIVOT:
230+
mRectTransform.pivot = newVal;
231+
break;
232+
case JCS_TransformType.ANCHOR_POSITION:
233+
mRectTransform.anchoredPosition = newVal;
234+
break;
235+
case JCS_TransformType.ANCHOR_POSITION_3D:
236+
mRectTransform.anchoredPosition3D = newVal;
237+
break;
238+
case JCS_TransformType.OFFSET_MIN:
239+
mRectTransform.offsetMin = newVal;
240+
break;
241+
case JCS_TransformType.OFFSET_MAX:
242+
mRectTransform.offsetMax = newVal;
243+
break;
192244
}
193245
}
194246

‎Assets/JCSUnity/Scripts/Effects/3D/JCS_3DShakeEffect.cs‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JCSUnity
1414
/// <summary>
1515
/// Effect that shake the transform in 3D.
1616
/// </summary>
17-
public class JCS_3DShakeEffect : MonoBehaviour
17+
public class JCS_3DShakeEffect : JCS_UnityObject
1818
{
1919
/* Variables*/
2020

@@ -227,6 +227,7 @@ private void ApplyShakeByTransformType(Vector3 shakeDelta)
227227
{
228228
switch (this.mTransformType)
229229
{
230+
/* Transform */
230231
case JCS_TransformType.POSITION:
231232
this.transform.position += shakeDelta;
232233
break;
@@ -236,6 +237,31 @@ private void ApplyShakeByTransformType(Vector3 shakeDelta)
236237
case JCS_TransformType.SCALE:
237238
this.transform.localScale += shakeDelta;
238239
break;
240+
/* RectTransform */
241+
case JCS_TransformType.ANCHOR_MIN:
242+
mRectTransform.anchorMin += (Vector2)shakeDelta;
243+
break;
244+
case JCS_TransformType.ANCHOR_MAX:
245+
mRectTransform.anchorMax += (Vector2)shakeDelta;
246+
break;
247+
case JCS_TransformType.SIZE_DELTA:
248+
mRectTransform.sizeDelta += (Vector2)shakeDelta;
249+
break;
250+
case JCS_TransformType.PIVOT:
251+
mRectTransform.pivot += (Vector2)shakeDelta;
252+
break;
253+
case JCS_TransformType.ANCHOR_POSITION:
254+
mRectTransform.anchoredPosition += (Vector2)shakeDelta;
255+
break;
256+
case JCS_TransformType.ANCHOR_POSITION_3D:
257+
mRectTransform.anchoredPosition3D += shakeDelta;
258+
break;
259+
case JCS_TransformType.OFFSET_MIN:
260+
mRectTransform.offsetMin += (Vector2)shakeDelta;
261+
break;
262+
case JCS_TransformType.OFFSET_MAX:
263+
mRectTransform.offsetMax += (Vector2)shakeDelta;
264+
break;
239265
}
240266
}
241267

@@ -247,6 +273,7 @@ private void RevertShakeByTransformType(Vector3 shakeDelta)
247273
{
248274
switch (this.mTransformType)
249275
{
276+
/* Transform */
250277
case JCS_TransformType.POSITION:
251278
this.transform.position -= shakeDelta;
252279
break;
@@ -256,6 +283,31 @@ private void RevertShakeByTransformType(Vector3 shakeDelta)
256283
case JCS_TransformType.SCALE:
257284
this.transform.localScale -= shakeDelta;
258285
break;
286+
/* RectTransform */
287+
case JCS_TransformType.ANCHOR_MIN:
288+
mRectTransform.anchorMin -= (Vector2)shakeDelta;
289+
break;
290+
case JCS_TransformType.ANCHOR_MAX:
291+
mRectTransform.anchorMax -= (Vector2)shakeDelta;
292+
break;
293+
case JCS_TransformType.SIZE_DELTA:
294+
mRectTransform.sizeDelta -= (Vector2)shakeDelta;
295+
break;
296+
case JCS_TransformType.PIVOT:
297+
mRectTransform.pivot -= (Vector2)shakeDelta;
298+
break;
299+
case JCS_TransformType.ANCHOR_POSITION:
300+
mRectTransform.anchoredPosition -= (Vector2)shakeDelta;
301+
break;
302+
case JCS_TransformType.ANCHOR_POSITION_3D:
303+
mRectTransform.anchoredPosition3D -= shakeDelta;
304+
break;
305+
case JCS_TransformType.OFFSET_MIN:
306+
mRectTransform.offsetMin -= (Vector2)shakeDelta;
307+
break;
308+
case JCS_TransformType.OFFSET_MAX:
309+
mRectTransform.offsetMax -= (Vector2)shakeDelta;
310+
break;
259311
}
260312
}
261313
}

‎Assets/JCSUnity/Scripts/Effects/Item/JCS_Item.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* $File: JCS_ItemPickable.cs $
2+
* $File: JCS_Item.cs $
33
* $Date: $
44
* $Revision: $
55
* $Creator: Jen-Chieh Shen $
@@ -252,7 +252,7 @@ private void DropEffect(Collider other)
252252
mTweener.DurationZ = 0;
253253
mTweener.StopTweenDistance = 0.2f;
254254
}
255-
mTweener.DoTweenContinue(other.transform);
255+
mTweener.DoTweenContinue(other.GetComponent<JCS_UnityObject>());
256256
}
257257

258258

‎Assets/JCSUnity/Scripts/Effects/Particle/Type/JCS_TowardTarget.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class JCS_TowardTarget : JCS_Particle
3434

3535
[Tooltip("Move toward this target.")]
3636
[SerializeField]
37-
private Transform mTargetTransform = null;
37+
private JCS_UnityObject mTarget = null;
3838

3939
[Tooltip("Randomly move particle to a certain range.")]
4040
[SerializeField]
@@ -53,10 +53,10 @@ public class JCS_TowardTarget : JCS_Particle
5353
/* Setter & Getter */
5454

5555
public bool ReverseDirection { get { return this.mReverseDirection; } set { this.mReverseDirection = value; } }
56-
public void SetTargetTransfrom(Transform trans)
56+
public void SetTarget(JCS_UnityObject trans)
5757
{
5858
// update target position.
59-
this.mTargetTransform = trans;
59+
this.mTarget = trans;
6060
}
6161
public float Range { get { return this.mRange; } set { this.mRange = value; } }
6262
public float AdjustRange { get { return this.mAdjustRange; } set { this.mAdjustRange = value; } }
@@ -75,7 +75,7 @@ private void Awake()
7575

7676
private void OnEnable()
7777
{
78-
if (mTargetTransform == null)
78+
if (mTarget == null)
7979
{
8080
JCS_Debug.LogError("Can't set calculated circle position with null target transform");
8181
return;
@@ -91,17 +91,17 @@ private void OnEnable()
9191
if (mReverseDirection)
9292
{
9393
// set the target transform.
94-
this.mDisableWidthCertainRangeEvent.SetTargetTransfrom(null);
94+
this.mDisableWidthCertainRangeEvent.SetTarget(null);
9595
this.mDisableWidthCertainRangeEvent.TargetPosition = newPos;
9696

9797
// starting position.
98-
SetPosition(this.mTargetTransform.position);
98+
SetPosition(this.mTarget.transform.position);
9999
}
100100
else
101101
{
102102
// set the target transform.
103-
this.mJCSTweener.SetTargetTransform(this.mTargetTransform);
104-
this.mDisableWidthCertainRangeEvent.SetTargetTransfrom(this.mTargetTransform);
103+
this.mJCSTweener.SetTarget(this.mTarget);
104+
this.mDisableWidthCertainRangeEvent.SetTarget(this.mTarget);
105105

106106
// starting position.
107107
SetPosition(newPos);
@@ -128,7 +128,7 @@ private void OnEnable()
128128
mJCSTweener.DoTween(newPos);
129129
}
130130
else
131-
mJCSTweener.DoTweenContinue(this.mTargetTransform);
131+
mJCSTweener.DoTweenContinue(this.mTarget);
132132
}
133133

134134
/// <summary>
@@ -138,7 +138,7 @@ private void OnEnable()
138138
private Vector3 CalculateCirclePosition()
139139
{
140140
return CalculateCirclePosition(
141-
mTargetTransform.position,
141+
mTarget.transform.position,
142142
mRange,
143143
mAdjustRange);
144144
}
@@ -153,7 +153,7 @@ private Vector3 CalculateCirclePosition()
153153
/// <returns></returns>
154154
private Vector3 CalculateCirclePosition(Vector3 targetPos, float range, float adjRange = 0)
155155
{
156-
Vector3 newPos = mTargetTransform.position;
156+
Vector3 newPos = mTarget.transform.position;
157157

158158
// set up the unknown angle
159159
// ÀH¾÷"¤º¨¤"

0 commit comments

Comments
 (0)