Skip to content

Commit 728f156

Browse files
committed
Update version to 1.3.9
1 parent 5a7323c commit 728f156

File tree

105 files changed

+2977
-203
lines changed

Some content is hidden

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

105 files changed

+2977
-203
lines changed

Assets/BossFight_Assets/Scenes/BF_Game.unity

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5805,6 +5805,7 @@ MonoBehaviour:
58055805
mInvicibleTime: 0.5
58065806
mInvincibleColor: {r: 0.5529412, g: 0.5529412, b: 0.5529412, a: 1}
58075807
mFlashTime: 0.1
5808+
mTriggerSound: {fileID: 0}
58085809
--- !u!1 &1717413431
58095810
GameObject:
58105811
m_ObjectHideFlags: 0

Assets/JCSUnity/Scenes/Demo/2D/JCS_2DMultiTrackDemo.unity

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,9 @@ MonoBehaviour:
613613
mKB: 0
614614
mKnockBackForce: 1
615615
mDamageTextEffect: 1
616-
mIsPlayer: 0
617616
mCanDamage: 1
617+
mInvincibleTimeAction: {fileID: 0}
618+
mIsPlayer: 0
618619
mBeenTarget: 0
619620
mVelocityInfo: {fileID: 0}
620621
mAbilityFormat: {fileID: 0}
@@ -637,9 +638,6 @@ MonoBehaviour:
637638
mMoveSpeed: 20
638639
mTurnSpeed: 400
639640
mRotateDirection: 1
640-
mAfterRotateWalkStraight: 1
641-
mAfterRotateWalkOpposite: 0
642-
mAfterRotateWalkOppositeCycle: 0
643641
--- !u!1 &605192366
644642
GameObject:
645643
m_ObjectHideFlags: 0
@@ -681,6 +679,7 @@ MonoBehaviour:
681679
mCanShoot: 1
682680
mDelayTime: 0.1
683681
mAdjustTimeZone: 1.5
682+
mShootAxis: 2
684683
--- !u!114 &605192368
685684
MonoBehaviour:
686685
m_ObjectHideFlags: 0

Assets/JCSUnity/Scenes/Demo/2D/JCS_ParticleDemo.unity

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ MonoBehaviour:
134134
m_EditorClassIdentifier:
135135
mNumOfParticle: 1000
136136
mParticle: {fileID: 1596159593}
137+
mActive: 1
137138
mOrderLayer: 15
138139
mDensity: 500
139140
mWindSpeed: 0
@@ -394,7 +395,8 @@ MonoBehaviour:
394395
m_Text: "Particle Demo\n==========================\nUnder ParticleSystem_Test gameobject
395396
have the master \nparticle \"JCS_TowardTarget\". Set the setting there and press
396397
G \nto update all the particle in the particle system, so u can test the particle
397-
\nin the runtime."
398+
\nin the runtime.\n\nPress 'c' to active paritcle system.\nPress 'v' to stop particle
399+
system."
398400
--- !u!222 &746170689
399401
CanvasRenderer:
400402
m_ObjectHideFlags: 0
@@ -852,6 +854,16 @@ Prefab:
852854
propertyPath: mIncludeDepth
853855
value: 0
854856
objectReference: {fileID: 0}
857+
- target: {fileID: 114000013234590884, guid: 8f6e1617d950167439dbe8a6fcc959fe,
858+
type: 2}
859+
propertyPath: mUseLocal
860+
value: 0
861+
objectReference: {fileID: 0}
862+
- target: {fileID: 114000012246884056, guid: 8f6e1617d950167439dbe8a6fcc959fe,
863+
type: 2}
864+
propertyPath: mTrackAsLocalPosition
865+
value: 0
866+
objectReference: {fileID: 0}
855867
m_RemovedComponents:
856868
- {fileID: 114000011504027890, guid: 8f6e1617d950167439dbe8a6fcc959fe, type: 2}
857869
m_ParentPrefab: {fileID: 100100000, guid: 8f6e1617d950167439dbe8a6fcc959fe, type: 2}

Assets/JCSUnity/Scenes/Demo/3D/JCS_AStarPathfinding.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4636,7 +4636,7 @@ MonoBehaviour:
46364636
m_Bits: 256
46374637
mGridiWorldSize: {x: 100, y: 100}
46384638
mNodeRadius: 0.5
4639-
mDirection: 2
4639+
mDirection: 3
46404640
--- !u!114 &1996392835
46414641
MonoBehaviour:
46424642
m_ObjectHideFlags: 0

Assets/JCSUnity/Scripts/Actions/JCS_ApplyDamageTextToLiveObjectAction.cs

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public class JCS_ApplyDamageTextToLiveObjectAction
2626

2727
//----------------------
2828
// Private Variables
29-
[Header("** Check Variables **")]
29+
30+
31+
[Header("** Check Variables (JCS_ApplyDamageTextToLiveObjectAction) **")]
32+
3033
[SerializeField] private bool mInSequence = false;
3134
[SerializeField] private int mHit = 1;
3235

@@ -35,7 +38,7 @@ public class JCS_ApplyDamageTextToLiveObjectAction
3538
[SerializeField] private int mCriticalChance = 10;
3639

3740

38-
[Header("** Pre Calculate Effect **")]
41+
[Header("** Pre Calculate Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]
3942

4043
[Tooltip("Enable this the attack will be calculate before hit the object.")]
4144
[SerializeField]
@@ -46,7 +49,7 @@ public class JCS_ApplyDamageTextToLiveObjectAction
4649
private int[] mDamageApplying = null;
4750

4851

49-
[Header("** Lock Effect **")]
52+
[Header("** Lock Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]
5053

5154
[Tooltip("Enable/Disable the effect.")]
5255
[SerializeField]
@@ -57,7 +60,7 @@ public class JCS_ApplyDamageTextToLiveObjectAction
5760
private Transform mTargetTransform = null;
5861

5962

60-
[Header("** Runtime Variables **")]
63+
[Header("** Runtime Variables (JCS_ApplyDamageTextToLiveObjectAction) **")]
6164

6265
// Ability Format
6366
[Tooltip("Ability decide the min and max damage possibility.")]
@@ -70,7 +73,7 @@ public class JCS_ApplyDamageTextToLiveObjectAction
7073
private Vector3 mDamageTextPositionOffset = Vector3.zero;
7174

7275

73-
[Header("** Random Effect **")]
76+
[Header("** Random Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]
7477

7578
[Tooltip("Enable/Disable Random Position Effect")]
7679
[SerializeField]
@@ -81,13 +84,13 @@ [SerializeField] [Range(0, 10)]
8184
private float mRandPosRange = 0;
8285

8386

84-
[Header("** Destroy Setting **")]
87+
[Header("** Destroy Setting (JCS_ApplyDamageTextToLiveObjectAction) **")]
8588

8689
[SerializeField]
8790
private bool mDestroyByThisAction = true;
8891

8992

90-
[Header("** AOE Effect **")]
93+
[Header("** AOE Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]
9194

9295
[Tooltip("Make object un-destroyable, count down by AOECount below.")]
9396
[SerializeField] private bool mIsAOE = false;
@@ -107,6 +110,13 @@ [SerializeField] [Range(1, 15)]
107110
private bool mIsDestroyed = false;
108111

109112

113+
[Header("** Sound Settings (JCS_ApplyDamageTextToLiveObjectAction) **")]
114+
115+
[Tooltip(@"Usage: play this hit sound, while is action happens.")]
116+
[SerializeField]
117+
private AudioClip mHitSound = null;
118+
119+
110120
//----------------------
111121
// Protected Variables
112122

@@ -246,7 +256,8 @@ private void OnTriggerEnter(Collider other)
246256
this.mAttackerInfo.Attacker,
247257
mDamageApplying,
248258
currentPos,
249-
mCriticalChance);
259+
mCriticalChance,
260+
mHitSound);
250261

251262
mHit = this.mDamageApplying.Length;
252263
}
@@ -258,7 +269,8 @@ private void OnTriggerEnter(Collider other)
258269
mMaxDamage,
259270
currentPos,
260271
mHit,
261-
mCriticalChance);
272+
mCriticalChance,
273+
mHitSound);
262274
}
263275

264276
// only if there is only one hit need to do this.
@@ -293,9 +305,9 @@ public void CopyToThis(JCS_ApplyDamageTextToLiveObjectAction copy)
293305
// Private Functions
294306

295307
/// <summary>
296-
///
308+
/// Randomize the position.
297309
/// </summary>
298-
/// <param name="currentPos"></param>
310+
/// <param name="currentPos"> current position to be randomize. </param>
299311
private void AddRandomPosition(ref Vector3 currentPos)
300312
{
301313
float addPos;
@@ -311,7 +323,8 @@ private void AddRandomPosition(ref Vector3 currentPos)
311323
}
312324

313325
/// <summary>
314-
///
326+
/// Check aoe and decide to destroy
327+
/// the game object now or later.
315328
/// </summary>
316329
private void DestroyWithAction()
317330
{
@@ -330,7 +343,7 @@ private void DestroyWithAction()
330343
}
331344

332345
/// <summary>
333-
///
346+
/// Check is the attack aoe?
334347
/// </summary>
335348
/// <returns> TRUE: is aoe, dont destroy the object
336349
/// FALSE: is not aoe or aoe count is less/equal to zero,

Assets/JCSUnity/Scripts/Actions/JCS_HitDamageAction.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,20 @@ public class JCS_HitDamageAction
3737

3838
private JCS_2DLiveObject mLiveObject = null;
3939

40+
41+
[Header("** Runtime Variables (JCS_HitDamageAction) **")]
42+
43+
[Tooltip("When the action occurs play this sound.")]
44+
[SerializeField]
45+
private AudioClip mHitSound = null;
46+
4047
//----------------------
4148
// Protected Variables
4249

4350
//========================================
4451
// setter / getter
4552
//------------------------------
53+
public BoxCollider GetBoxCollider() { return this.mBoxCollider; }
4654

4755
//========================================
4856
// Unity's function
@@ -107,7 +115,8 @@ private void DamageLiveObject(JCS_2DLiveObject liveObject)
107115
mAbilityFormat.GetMaxDamage(),
108116
this.transform.position,
109117
1, // hit
110-
0); // critical chance
118+
0,
119+
mHitSound); // critical chance
111120

112121

113122
// see if the collider is player.

Assets/JCSUnity/Scripts/Actions/JCS_InvincibleTimeAction.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ [SerializeField] [Range(0.01f, 3.0f)]
6262
// current color is.
6363
private bool mFlashToggle = false;
6464

65+
[Tooltip("Play once while trigger")]
66+
[SerializeField]
67+
private AudioClip mTriggerSound = null;
68+
6569
//----------------------
6670
// Protected Variables
6771

@@ -151,6 +155,9 @@ public void TriggerAction(float time)
151155

152156
// start the action.
153157
mTriggerAction = true;
158+
159+
// play the sound once.
160+
JCS_SoundManager.instance.GetGlobalSoundPlayer().PlayOneShot(mTriggerSound);
154161
}
155162

156163
//----------------------

Assets/JCSUnity/Scripts/Effects/2D/JCS_DestroyAnimEffect.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@
99
using UnityEngine;
1010
using System.Collections;
1111

12+
1213
namespace JCSUnity
1314
{
1415

16+
/// <summary>
17+
/// When gameobject destroy, this will be activate and
18+
/// play an animation.
19+
/// </summary>
1520
[RequireComponent(typeof(JCS_HitListEvent))]
1621
[RequireComponent(typeof(JCS_AnimPool))]
1722
public class JCS_DestroyAnimEffect

Assets/JCSUnity/Scripts/Effects/2D/JCS_DestroySoundEffect.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
using UnityEngine;
1010
using System.Collections;
1111

12+
1213
namespace JCSUnity
1314
{
1415

16+
/// <summary>
17+
/// When the gameobject is destroy iw will play the sound.
18+
/// </summary>
1519
[RequireComponent(typeof(JCS_HitListEvent))]
1620
[RequireComponent(typeof(JCS_SoundPool))]
1721
public class JCS_DestroySoundEffect

Assets/JCSUnity/Scripts/Effects/3D/JCS_DestroyParticleEffect.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@
99
using UnityEngine;
1010
using System.Collections;
1111

12+
1213
namespace JCSUnity
1314
{
1415

16+
/// <summary>
17+
/// When the gameobject get destroy, spawn the gameobject and
18+
/// to the particle in seconds.
19+
/// </summary>
1520
public class JCS_DestroyParticleEffect
1621
: MonoBehaviour
1722
{

0 commit comments

Comments
 (0)