Skip to content

Commit

Permalink
Update version to 1.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jcs090218 committed Jan 1, 2017
1 parent 5a7323c commit 728f156
Show file tree
Hide file tree
Showing 105 changed files with 2,977 additions and 203 deletions.
1 change: 1 addition & 0 deletions Assets/BossFight_Assets/Scenes/BF_Game.unity
Original file line number Diff line number Diff line change
Expand Up @@ -5805,6 +5805,7 @@ MonoBehaviour:
mInvicibleTime: 0.5
mInvincibleColor: {r: 0.5529412, g: 0.5529412, b: 0.5529412, a: 1}
mFlashTime: 0.1
mTriggerSound: {fileID: 0}
--- !u!1 &1717413431
GameObject:
m_ObjectHideFlags: 0
Expand Down
7 changes: 3 additions & 4 deletions Assets/JCSUnity/Scenes/Demo/2D/JCS_2DMultiTrackDemo.unity
Original file line number Diff line number Diff line change
Expand Up @@ -613,8 +613,9 @@ MonoBehaviour:
mKB: 0
mKnockBackForce: 1
mDamageTextEffect: 1
mIsPlayer: 0
mCanDamage: 1
mInvincibleTimeAction: {fileID: 0}
mIsPlayer: 0
mBeenTarget: 0
mVelocityInfo: {fileID: 0}
mAbilityFormat: {fileID: 0}
Expand All @@ -637,9 +638,6 @@ MonoBehaviour:
mMoveSpeed: 20
mTurnSpeed: 400
mRotateDirection: 1
mAfterRotateWalkStraight: 1
mAfterRotateWalkOpposite: 0
mAfterRotateWalkOppositeCycle: 0
--- !u!1 &605192366
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -681,6 +679,7 @@ MonoBehaviour:
mCanShoot: 1
mDelayTime: 0.1
mAdjustTimeZone: 1.5
mShootAxis: 2
--- !u!114 &605192368
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
14 changes: 13 additions & 1 deletion Assets/JCSUnity/Scenes/Demo/2D/JCS_ParticleDemo.unity
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
mNumOfParticle: 1000
mParticle: {fileID: 1596159593}
mActive: 1
mOrderLayer: 15
mDensity: 500
mWindSpeed: 0
Expand Down Expand Up @@ -394,7 +395,8 @@ MonoBehaviour:
m_Text: "Particle Demo\n==========================\nUnder ParticleSystem_Test gameobject
have the master \nparticle \"JCS_TowardTarget\". Set the setting there and press
G \nto update all the particle in the particle system, so u can test the particle
\nin the runtime."
\nin the runtime.\n\nPress 'c' to active paritcle system.\nPress 'v' to stop particle
system."
--- !u!222 &746170689
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -852,6 +854,16 @@ Prefab:
propertyPath: mIncludeDepth
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000013234590884, guid: 8f6e1617d950167439dbe8a6fcc959fe,
type: 2}
propertyPath: mUseLocal
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000012246884056, guid: 8f6e1617d950167439dbe8a6fcc959fe,
type: 2}
propertyPath: mTrackAsLocalPosition
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114000011504027890, guid: 8f6e1617d950167439dbe8a6fcc959fe, type: 2}
m_ParentPrefab: {fileID: 100100000, guid: 8f6e1617d950167439dbe8a6fcc959fe, type: 2}
Expand Down
2 changes: 1 addition & 1 deletion Assets/JCSUnity/Scenes/Demo/3D/JCS_AStarPathfinding.unity
Original file line number Diff line number Diff line change
Expand Up @@ -4636,7 +4636,7 @@ MonoBehaviour:
m_Bits: 256
mGridiWorldSize: {x: 100, y: 100}
mNodeRadius: 0.5
mDirection: 2
mDirection: 3
--- !u!114 &1996392835
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ public class JCS_ApplyDamageTextToLiveObjectAction

//----------------------
// Private Variables
[Header("** Check Variables **")]


[Header("** Check Variables (JCS_ApplyDamageTextToLiveObjectAction) **")]

[SerializeField] private bool mInSequence = false;
[SerializeField] private int mHit = 1;

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


[Header("** Pre Calculate Effect **")]
[Header("** Pre Calculate Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]

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


[Header("** Lock Effect **")]
[Header("** Lock Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]

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


[Header("** Runtime Variables **")]
[Header("** Runtime Variables (JCS_ApplyDamageTextToLiveObjectAction) **")]

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


[Header("** Random Effect **")]
[Header("** Random Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]

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


[Header("** Destroy Setting **")]
[Header("** Destroy Setting (JCS_ApplyDamageTextToLiveObjectAction) **")]

[SerializeField]
private bool mDestroyByThisAction = true;


[Header("** AOE Effect **")]
[Header("** AOE Effect (JCS_ApplyDamageTextToLiveObjectAction) **")]

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


[Header("** Sound Settings (JCS_ApplyDamageTextToLiveObjectAction) **")]

[Tooltip(@"Usage: play this hit sound, while is action happens.")]
[SerializeField]
private AudioClip mHitSound = null;


//----------------------
// Protected Variables

Expand Down Expand Up @@ -246,7 +256,8 @@ private void OnTriggerEnter(Collider other)
this.mAttackerInfo.Attacker,
mDamageApplying,
currentPos,
mCriticalChance);
mCriticalChance,
mHitSound);

mHit = this.mDamageApplying.Length;
}
Expand All @@ -258,7 +269,8 @@ private void OnTriggerEnter(Collider other)
mMaxDamage,
currentPos,
mHit,
mCriticalChance);
mCriticalChance,
mHitSound);
}

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

/// <summary>
///
/// Randomize the position.
/// </summary>
/// <param name="currentPos"></param>
/// <param name="currentPos"> current position to be randomize. </param>
private void AddRandomPosition(ref Vector3 currentPos)
{
float addPos;
Expand All @@ -311,7 +323,8 @@ private void AddRandomPosition(ref Vector3 currentPos)
}

/// <summary>
///
/// Check aoe and decide to destroy
/// the game object now or later.
/// </summary>
private void DestroyWithAction()
{
Expand All @@ -330,7 +343,7 @@ private void DestroyWithAction()
}

/// <summary>
///
/// Check is the attack aoe?
/// </summary>
/// <returns> TRUE: is aoe, dont destroy the object
/// FALSE: is not aoe or aoe count is less/equal to zero,
Expand Down
11 changes: 10 additions & 1 deletion Assets/JCSUnity/Scripts/Actions/JCS_HitDamageAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,20 @@ public class JCS_HitDamageAction

private JCS_2DLiveObject mLiveObject = null;


[Header("** Runtime Variables (JCS_HitDamageAction) **")]

[Tooltip("When the action occurs play this sound.")]
[SerializeField]
private AudioClip mHitSound = null;

//----------------------
// Protected Variables

//========================================
// setter / getter
//------------------------------
public BoxCollider GetBoxCollider() { return this.mBoxCollider; }

//========================================
// Unity's function
Expand Down Expand Up @@ -107,7 +115,8 @@ private void DamageLiveObject(JCS_2DLiveObject liveObject)
mAbilityFormat.GetMaxDamage(),
this.transform.position,
1, // hit
0); // critical chance
0,
mHitSound); // critical chance


// see if the collider is player.
Expand Down
7 changes: 7 additions & 0 deletions Assets/JCSUnity/Scripts/Actions/JCS_InvincibleTimeAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ [SerializeField] [Range(0.01f, 3.0f)]
// current color is.
private bool mFlashToggle = false;

[Tooltip("Play once while trigger")]
[SerializeField]
private AudioClip mTriggerSound = null;

//----------------------
// Protected Variables

Expand Down Expand Up @@ -151,6 +155,9 @@ public void TriggerAction(float time)

// start the action.
mTriggerAction = true;

// play the sound once.
JCS_SoundManager.instance.GetGlobalSoundPlayer().PlayOneShot(mTriggerSound);
}

//----------------------
Expand Down
5 changes: 5 additions & 0 deletions Assets/JCSUnity/Scripts/Effects/2D/JCS_DestroyAnimEffect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
using UnityEngine;
using System.Collections;


namespace JCSUnity
{

/// <summary>
/// When gameobject destroy, this will be activate and
/// play an animation.
/// </summary>
[RequireComponent(typeof(JCS_HitListEvent))]
[RequireComponent(typeof(JCS_AnimPool))]
public class JCS_DestroyAnimEffect
Expand Down
4 changes: 4 additions & 0 deletions Assets/JCSUnity/Scripts/Effects/2D/JCS_DestroySoundEffect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
using UnityEngine;
using System.Collections;


namespace JCSUnity
{

/// <summary>
/// When the gameobject is destroy iw will play the sound.
/// </summary>
[RequireComponent(typeof(JCS_HitListEvent))]
[RequireComponent(typeof(JCS_SoundPool))]
public class JCS_DestroySoundEffect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
using UnityEngine;
using System.Collections;


namespace JCSUnity
{

/// <summary>
/// When the gameobject get destroy, spawn the gameobject and
/// to the particle in seconds.
/// </summary>
public class JCS_DestroyParticleEffect
: MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace JCSUnity
{

/// <summary>
/// While hit the destination destroy it
/// While hit the destination destroy it.
/// </summary>
[RequireComponent(typeof(JCS_AlphaObject))]
public class JCS_DestinationDestroy
Expand Down
2 changes: 1 addition & 1 deletion Assets/JCSUnity/Scripts/Effects/Item/JCS_Item.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace JCSUnity
public delegate void PickCallback(Collider other);

/// <summary>
///
/// Base class for all the item subclasses.
/// </summary>
[RequireComponent(typeof(BoxCollider))]
[RequireComponent(typeof(Rigidbody))]
Expand Down
Loading

0 comments on commit 728f156

Please sign in to comment.