Skip to content

Commit 78196f4

Browse files
jcs090218jcs090218
committed
feat: Rename to time type
1 parent 80514ae commit 78196f4

File tree

181 files changed

+408
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+408
-404
lines changed

‎Assets/JCSUnity/Resources/UI/System/JCS_BlackScreen.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RectTransform:
3434
m_ConstrainProportionsScale: 0
3535
m_Children: []
3636
m_Father: {fileID: 0}
37-
m_RootOrder: 0
3837
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3938
m_AnchorMin: {x: 0.5, y: 0.5}
4039
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -92,6 +91,8 @@ MonoBehaviour:
9291
m_Name:
9392
m_EditorClassIdentifier:
9493
mObjectType: 1
94+
mMakeUnique: 0
95+
mColorProps: []
9596
mTestWithKey: 0
9697
mFadeInKey: 109
9798
mFadeOutKey: 110
@@ -101,7 +102,7 @@ MonoBehaviour:
101102
mOverrideFade: 1
102103
mFadeInAmount: 1
103104
mFadeOutAmount: 0
104-
mDeltaTimeType: 7
105+
mTimeType: 7
105106
--- !u!114 &11461196
106107
MonoBehaviour:
107108
m_ObjectHideFlags: 0

‎Assets/JCSUnity/Resources/UI/System/JCS_BlackSlideScreen.prefab‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ RectTransform:
2828
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: -80, y: 124, z: 80}
31+
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 224000011165829780}
33-
m_RootOrder: 0
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
m_AnchorMin: {x: 0.5, y: 0.5}
3636
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -100,9 +100,9 @@ RectTransform:
100100
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
101101
m_LocalPosition: {x: 0, y: 0, z: 0}
102102
m_LocalScale: {x: 80, y: 124, z: 80}
103+
m_ConstrainProportionsScale: 0
103104
m_Children: []
104105
m_Father: {fileID: 224000011165829780}
105-
m_RootOrder: 1
106106
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
107107
m_AnchorMin: {x: 0.5, y: 0.5}
108108
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -175,13 +175,13 @@ RectTransform:
175175
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
176176
m_LocalPosition: {x: 0, y: 0, z: 0}
177177
m_LocalScale: {x: 20, y: 20, z: 20}
178+
m_ConstrainProportionsScale: 0
178179
m_Children:
179180
- {fileID: 224000012402812800}
180181
- {fileID: 224000011768478854}
181182
- {fileID: 224000011907300868}
182183
- {fileID: 224000011645102786}
183184
m_Father: {fileID: 0}
184-
m_RootOrder: 0
185185
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
186186
m_AnchorMin: {x: 0.5, y: 0.5}
187187
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -239,14 +239,16 @@ MonoBehaviour:
239239
m_Name:
240240
m_EditorClassIdentifier:
241241
mObjectType: 1
242+
mMakeUnique: 0
243+
mColorProps: []
242244
mTestWithKey: 0
243245
mTweenToAKey: 97
244246
mTweenToA: {x: 0, y: 0, z: 0}
245247
mTweenToBKey: 98
246248
mTweenToB: {x: 5, y: 5, z: 5}
247249
mContinueKeyTween: 99
248250
mContinueTween: 0
249-
mTargetTransform: {fileID: 0}
251+
mTarget: {fileID: 0}
250252
mDoneTweenX: 1
251253
mDoneTweenY: 1
252254
mDoneTweenZ: 1
@@ -256,6 +258,7 @@ MonoBehaviour:
256258
mDurationX: 1
257259
mDurationY: 1
258260
mDurationZ: 1
261+
mTimeType: 7
259262
mDestroyWhenDoneTweening: 0
260263
mDestroyDoneTweeningCount: 1
261264
mRandomizeDuration: 0
@@ -323,9 +326,9 @@ RectTransform:
323326
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
324327
m_LocalPosition: {x: 0, y: 0, z: 0}
325328
m_LocalScale: {x: 80, y: 224, z: 80}
329+
m_ConstrainProportionsScale: 0
326330
m_Children: []
327331
m_Father: {fileID: 224000011165829780}
328-
m_RootOrder: 2
329332
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
330333
m_AnchorMin: {x: 0.5, y: 0.5}
331334
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -395,9 +398,9 @@ RectTransform:
395398
m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
396399
m_LocalPosition: {x: 0, y: 0, z: 0}
397400
m_LocalScale: {x: 80, y: 224, z: 80}
401+
m_ConstrainProportionsScale: 0
398402
m_Children: []
399403
m_Father: {fileID: 224000011165829780}
400-
m_RootOrder: 3
401404
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
402405
m_AnchorMin: {x: 0.5, y: 0.5}
403406
m_AnchorMax: {x: 0.5, y: 0.5}

‎Assets/JCSUnity/Scripts/Actions/2D/AI/AIMoveAction/JCS_2DFlyAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public enum StatusY
110110

111111
[Tooltip("Type of the delta time.")]
112112
[SerializeField]
113-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
113+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
114114

115115
[Header("- Space Limitation")]
116116

@@ -167,7 +167,7 @@ public enum StatusY
167167

168168
public bool MadEffect { get { return this.mMadEffect; } set { this.mMadEffect = value; } }
169169

170-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
170+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
171171

172172
/* Functions */
173173

@@ -453,7 +453,7 @@ private void DoFly()
453453
if (mFlyed)
454454
ResetTimeZone();
455455

456-
mTimer += JCS_Time.DeltaTime(mDeltaTimeType);
456+
mTimer += JCS_Time.ItTime(mTimeType);
457457

458458
if (mTimer < mRealTimeZone)
459459
return;

‎Assets/JCSUnity/Scripts/Actions/2D/AI/AIMoveAction/JCS_2DJumpAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class JCS_2DJumpAction : JCS_AIAction
5858

5959
[Tooltip("Type of the delta time.")]
6060
[SerializeField]
61-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
61+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
6262

6363
[Header("- Action")]
6464

@@ -103,7 +103,7 @@ public class JCS_2DJumpAction : JCS_AIAction
103103
public float AdjustTimeZone { get { return this.mAdjustTimeZone; } set { this.mAdjustTimeZone = value; } }
104104
public float TimeZone { get { return this.mTimeZone; } set { this.mTimeZone = value; } }
105105
public float Possibility { get { return this.mPossibility; } set { this.mPossibility = value; } }
106-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
106+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
107107

108108
/* Functions */
109109

@@ -191,7 +191,7 @@ private void DoJump()
191191
if (mJumped)
192192
ResetTimeZone();
193193

194-
mTimer += JCS_Time.DeltaTime(mDeltaTimeType);
194+
mTimer += JCS_Time.ItTime(mTimeType);
195195

196196
if (mTimer < mRealTimeZone)
197197
return;

‎Assets/JCSUnity/Scripts/Actions/2D/AI/AIMoveAction/JCS_2DWalkAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public enum Status
8282

8383
[Tooltip("Type of the delta time.")]
8484
[SerializeField]
85-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
85+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
8686

8787
[Header("- Action")]
8888

@@ -125,7 +125,7 @@ public enum Status
125125
public float RecordSpeedX { get { return this.mVelocityInfo.RecordSpeed.x; } set { this.mVelocityInfo.RecordSpeedX = value; } }
126126
public float RecordSpeedY { get { return this.mVelocityInfo.RecordSpeed.y; } set { this.mVelocityInfo.RecordSpeedY = value; } }
127127
public float RecordSpeedZ { get { return this.mVelocityInfo.RecordSpeed.z; } set { this.mVelocityInfo.RecordSpeedZ = value; } }
128-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
128+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
129129

130130
// Track Effects
131131
public bool MadEffect { get { return this.mMadEffect; } set { this.mMadEffect = value; } }
@@ -333,7 +333,7 @@ private void DoWalk()
333333
if (mWalked)
334334
ResetTimeZone();
335335

336-
mTimer += JCS_Time.DeltaTime(mDeltaTimeType);
336+
mTimer += JCS_Time.ItTime(mTimeType);
337337

338338
if (mTimer < mRealTimeZone)
339339
return;

‎Assets/JCSUnity/Scripts/Actions/2D/AI/JCS_2DDropItemAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ public class JCS_2DDropItemAction : MonoBehaviour
5252

5353
[Tooltip("Type of the delta time.")]
5454
[SerializeField]
55-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
55+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
5656

5757
/* Setter & Getter */
5858

5959
public bool DropWhenDies { get { return this.mDropWhenDies; } set { this.mDropWhenDies = value; } }
6060
public bool DropByTime { get { return this.mDropByTime; } set { this.mDropByTime = value; } }
6161
public float TimePerDrop { get { return this.mTimePerDrop; } set { this.mTimePerDrop = value; } }
6262
public float RandomTimeRange { get { return this.mRandomTimeRange; } set { this.mRandomTimeRange = value; } }
63-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
63+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
6464

6565
/* Functions */
6666

@@ -104,7 +104,7 @@ private void DoDropByTime()
104104

105105
ResetTime();
106106

107-
mDropTimer += JCS_Time.DeltaTime(mDeltaTimeType);
107+
mDropTimer += JCS_Time.ItTime(mTimeType);
108108

109109
if (mDropRealTime < mDropTimer)
110110
{

‎Assets/JCSUnity/Scripts/Actions/2D/JCS_2DCircleAction.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class JCS_2DCircleAction : MonoBehaviour , JCS_IAction
5454

5555
[Tooltip("Type of the delta time.")]
5656
[SerializeField]
57-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
57+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
5858

5959
/* Setter & Getter */
6060

@@ -65,7 +65,7 @@ public class JCS_2DCircleAction : MonoBehaviour , JCS_IAction
6565
public bool DoRotate { get { return this.mDoRotate; } set { this.mDoRotate = value; } }
6666
public float MoveSpeed { get { return this.mMoveSpeed; } set { this.mMoveSpeed = value; } }
6767
public float TurnSpeed { get { return this.mTurnSpeed; } set { this.mTurnSpeed = value; } }
68-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
68+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
6969

7070
/* Functions */
7171

@@ -90,7 +90,7 @@ private void Movement()
9090
return;
9191

9292
// Do movement
93-
this.transform.Translate(Vector3.right * MoveSpeed * JCS_Time.DeltaTime(mDeltaTimeType));
93+
this.transform.Translate(Vector3.right * MoveSpeed * JCS_Time.ItTime(mTimeType));
9494
}
9595

9696
/// <summary>
@@ -101,7 +101,7 @@ private void DoRotation()
101101
if (!mDoRotate)
102102
return;
103103

104-
float dt = JCS_Time.DeltaTime(mDeltaTimeType);
104+
float dt = JCS_Time.ItTime(mTimeType);
105105

106106
mRotateDegreeTimer += mTurnSpeed * dt;
107107

‎Assets/JCSUnity/Scripts/Actions/2D/JCS_2DRotateAction.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ public class JCS_2DRotateAction : MonoBehaviour, JCS_IAction
3535

3636
[Tooltip("Type of the delta time.")]
3737
[SerializeField]
38-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
38+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
3939

4040
/* Setter & Getter */
4141

4242
public bool Action { get { return this.mAction; } set { this.mAction = value; } }
4343
public float TurnSpeed { get { return this.mTurnSpeed; } set { this.mTurnSpeed = value; } }
4444
public JCS_2DFaceType RotateDirection { get { return this.mRotateDirection; } set { this.mRotateDirection = value; } }
45-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
45+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
4646

4747
/* Functions */
4848

@@ -51,7 +51,7 @@ private void Update()
5151
if (!mAction)
5252
return;
5353

54-
this.transform.Rotate(Vector3.forward * mTurnSpeed * -((int)mRotateDirection) * JCS_Time.DeltaTime(mDeltaTimeType));
54+
this.transform.Rotate(Vector3.forward * mTurnSpeed * -((int)mRotateDirection) * JCS_Time.ItTime(mTimeType));
5555
}
5656
}
5757
}

‎Assets/JCSUnity/Scripts/Actions/2D/JCS_2DSkills.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public abstract class JCS_2DSkills : MonoBehaviour
6969

7070
[Tooltip("Type of the delta time.")]
7171
[SerializeField]
72-
protected JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
72+
protected JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
7373

7474
[Header("- Spawn")]
7575

@@ -101,7 +101,7 @@ public abstract class JCS_2DSkills : MonoBehaviour
101101

102102
/* Setter & Getter */
103103

104-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
104+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
105105

106106
/* Functions */
107107

@@ -133,7 +133,7 @@ private void ProcessInput()
133133
mAction = true;
134134
}
135135

136-
float dt = JCS_Time.DeltaTime(mDeltaTimeType);
136+
float dt = JCS_Time.ItTime(mTimeType);
137137

138138
if (mAfterDelay)
139139
{

‎Assets/JCSUnity/Scripts/Actions/2D/JCS_2DTrackAction.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class JCS_2DTrackAction : MonoBehaviour , JCS_IAction
6060

6161
[Tooltip("Type of the delta time.")]
6262
[SerializeField]
63-
private JCS_DeltaTimeType mDeltaTimeType = JCS_DeltaTimeType.DELTA_TIME;
63+
private JCS_TimeType mTimeType = JCS_TimeType.DELTA_TIME;
6464

6565
[Tooltip("Hard track on x-axis.")]
6666
[SerializeField]
@@ -91,7 +91,7 @@ public class JCS_2DTrackAction : MonoBehaviour , JCS_IAction
9191
public float MoveSpeed { get { return this.mMoveSpeed; } set { this.mMoveSpeed = value; } }
9292
public float Index { get { return this.mIndex; } set { this.mIndex = value; } }
9393
public int OrderIndex { get { return this.mOrderIndex; } set { this.mOrderIndex = value; } }
94-
public JCS_DeltaTimeType DeltaTimeType { get { return this.mDeltaTimeType; } set { this.mDeltaTimeType = value; } }
94+
public JCS_TimeType DeltaTimeType { get { return this.mTimeType; } set { this.mTimeType = value; } }
9595
public bool Following { get { return this.mFollowing; } set { this.mFollowing = value; } }
9696
public bool HardOnX { get { return this.mHardOnX; } set { this.mHardOnX = value; } }
9797
public bool HardOnY { get { return this.mHardOnY; } set { this.mHardOnY = value; } }
@@ -129,7 +129,7 @@ private void FollowObject()
129129

130130

131131
// apply force
132-
newPos += mVelocity * JCS_Time.DeltaTime(mDeltaTimeType);
132+
newPos += mVelocity * JCS_Time.ItTime(mTimeType);
133133

134134
this.transform.position = newPos;
135135
}
@@ -139,7 +139,7 @@ private void FollowObject()
139139
/// </summary>
140140
private void KeepOnSameDirection()
141141
{
142-
this.transform.position += mVelocity * JCS_Time.DeltaTime(mDeltaTimeType);
142+
this.transform.position += mVelocity * JCS_Time.ItTime(mTimeType);
143143
}
144144

145145
/// <summary>

0 commit comments

Comments
 (0)