Skip to content

Commit 5a7323c

Browse files
jcs090218jcs090218
committed
das
1 parent b711698 commit 5a7323c

File tree

1,221 files changed

+408
-81627
lines changed

Some content is hidden

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

1,221 files changed

+408
-81627
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/obj
88
/Build
99
/Tutorials
10-
/Assets/Librares
10+
/Assets/Libraries
1111

1212
# don't include the video.
1313
/Video

‎Assets/BossFight_Assets/Scenes/BF_Game.unity‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5550,6 +5550,7 @@ GameObject:
55505550
- 114: {fileID: 1667753672}
55515551
- 114: {fileID: 1667753675}
55525552
- 114: {fileID: 1667753676}
5553+
- 114: {fileID: 1667753677}
55535554
m_Layer: 0
55545555
m_Name: CrazyCat_stand
55555556
m_TagString: Untagged
@@ -5639,8 +5640,9 @@ MonoBehaviour:
56395640
mKB: 1000000000
56405641
mKnockBackForce: 1
56415642
mDamageTextEffect: 1
5642-
mIsPlayer: 0
56435643
mCanDamage: 1
5644+
mInvincibleTimeAction: {fileID: 0}
5645+
mIsPlayer: 0
56445646
mBeenTarget: 0
56455647
mVelocityInfo: {fileID: 0}
56465648
mAbilityFormat: {fileID: 0}
@@ -5788,6 +5790,21 @@ MonoBehaviour:
57885790
m_Name:
57895791
m_EditorClassIdentifier:
57905792
mEffectToAllChild: 0
5793+
--- !u!114 &1667753677
5794+
MonoBehaviour:
5795+
m_ObjectHideFlags: 0
5796+
m_PrefabParentObject: {fileID: 0}
5797+
m_PrefabInternal: {fileID: 0}
5798+
m_GameObject: {fileID: 1667753663}
5799+
m_Enabled: 1
5800+
m_EditorHideFlags: 0
5801+
m_Script: {fileID: 11500000, guid: e37faf92e0395db49beee8decd8e3b78, type: 3}
5802+
m_Name:
5803+
m_EditorClassIdentifier:
5804+
mObjectType: 2
5805+
mInvicibleTime: 0.5
5806+
mInvincibleColor: {r: 0.5529412, g: 0.5529412, b: 0.5529412, a: 1}
5807+
mFlashTime: 0.1
57915808
--- !u!1 &1717413431
57925809
GameObject:
57935810
m_ObjectHideFlags: 0
@@ -5912,6 +5929,8 @@ MonoBehaviour:
59125929
item: {fileID: 11422776, guid: c8a18f073df38de4392d415c18e9fce4, type: 2}
59135930
mIsGravity: 1
59145931
mJumpForce: 10
5932+
mRandomizeJumpForce: 0
5933+
mRandomizeJumpForceForce: 0
59155934
mRotateWhileDropping: 1
59165935
mRotateSpeed: 1000
59175936
mSpreadEffect: 1
@@ -6064,8 +6083,9 @@ MonoBehaviour:
60646083
mKB: 0
60656084
mKnockBackForce: 1
60666085
mDamageTextEffect: 1
6067-
mIsPlayer: 1
60686086
mCanDamage: 1
6087+
mInvincibleTimeAction: {fileID: 0}
6088+
mIsPlayer: 1
60696089
mBeenTarget: 0
60706090
mVelocityInfo: {fileID: 0}
60716091
mAbilityFormat: {fileID: 0}

‎Assets/JCSUnity/Scenes/Demo/2D/JCS_2DAIDemo.unity‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,21 @@ MonoBehaviour:
356356
m_Name:
357357
m_EditorClassIdentifier:
358358
mAIMoveActionType: 0
359+
--- !u!114 &84466408
360+
MonoBehaviour:
361+
m_ObjectHideFlags: 0
362+
m_PrefabParentObject: {fileID: 0}
363+
m_PrefabInternal: {fileID: 0}
364+
m_GameObject: {fileID: 84466388}
365+
m_Enabled: 1
366+
m_EditorHideFlags: 0
367+
m_Script: {fileID: 11500000, guid: e37faf92e0395db49beee8decd8e3b78, type: 3}
368+
m_Name:
369+
m_EditorClassIdentifier:
370+
mObjectType: 2
371+
mInvicibleTime: 1
372+
mInvincibleColor: {r: 1, g: 1, b: 1, a: 1}
373+
mFlashTime: 0.2
359374
--- !u!1 &149884199
360375
GameObject:
361376
m_ObjectHideFlags: 0
@@ -548,6 +563,10 @@ Prefab:
548563
propertyPath: m_Name
549564
value: JCS_AI_01 (2)
550565
objectReference: {fileID: 0}
566+
- target: {fileID: 181162, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
567+
propertyPath: m_IsActive
568+
value: 1
569+
objectReference: {fileID: 0}
551570
m_RemovedComponents: []
552571
m_ParentPrefab: {fileID: 100100000, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
553572
m_IsPrefabParent: 0
@@ -1037,6 +1056,10 @@ Prefab:
10371056
propertyPath: m_Name
10381057
value: JCS_AI_01 (3)
10391058
objectReference: {fileID: 0}
1059+
- target: {fileID: 181162, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
1060+
propertyPath: m_IsActive
1061+
value: 1
1062+
objectReference: {fileID: 0}
10401063
m_RemovedComponents: []
10411064
m_ParentPrefab: {fileID: 100100000, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
10421065
m_IsPrefabParent: 0
@@ -2626,6 +2649,7 @@ GameObject:
26262649
- 114: {fileID: 799884791}
26272650
- 114: {fileID: 799884790}
26282651
- 114: {fileID: 799884805}
2652+
- 114: {fileID: 799884807}
26292653
m_Layer: 0
26302654
m_Name: TeinCheng
26312655
m_TagString: Untagged
@@ -3056,8 +3080,9 @@ MonoBehaviour:
30563080
mKB: 0
30573081
mKnockBackForce: 1
30583082
mDamageTextEffect: 1
3059-
mIsPlayer: 0
30603083
mCanDamage: 1
3084+
mInvincibleTimeAction: {fileID: 0}
3085+
mIsPlayer: 0
30613086
mBeenTarget: 0
30623087
mVelocityInfo: {fileID: 0}
30633088
mAbilityFormat: {fileID: 0}
@@ -3075,6 +3100,21 @@ MonoBehaviour:
30753100
m_EditorClassIdentifier:
30763101
mWidth: 0
30773102
mHeight: 0
3103+
--- !u!114 &799884807
3104+
MonoBehaviour:
3105+
m_ObjectHideFlags: 0
3106+
m_PrefabParentObject: {fileID: 0}
3107+
m_PrefabInternal: {fileID: 0}
3108+
m_GameObject: {fileID: 799884788}
3109+
m_Enabled: 1
3110+
m_EditorHideFlags: 0
3111+
m_Script: {fileID: 11500000, guid: e37faf92e0395db49beee8decd8e3b78, type: 3}
3112+
m_Name:
3113+
m_EditorClassIdentifier:
3114+
mObjectType: 2
3115+
mInvicibleTime: 1
3116+
mInvincibleColor: {r: 0.36764705, g: 0.36764705, b: 0.36764705, a: 1}
3117+
mFlashTime: 0.1
30783118
--- !u!1001 &817495169
30793119
Prefab:
30803120
m_ObjectHideFlags: 0
@@ -5000,6 +5040,10 @@ Prefab:
50005040
propertyPath: mHPInfo
50015041
value:
50025042
objectReference: {fileID: 84466389}
5043+
- target: {fileID: 181162, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
5044+
propertyPath: m_IsActive
5045+
value: 1
5046+
objectReference: {fileID: 0}
50035047
m_RemovedComponents: []
50045048
m_ParentPrefab: {fileID: 100100000, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
50055049
m_IsPrefabParent: 0
@@ -5554,6 +5598,10 @@ Prefab:
55545598
propertyPath: m_Name
55555599
value: JCS_AI_01 (4)
55565600
objectReference: {fileID: 0}
5601+
- target: {fileID: 181162, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
5602+
propertyPath: m_IsActive
5603+
value: 1
5604+
objectReference: {fileID: 0}
55575605
m_RemovedComponents: []
55585606
m_ParentPrefab: {fileID: 100100000, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
55595607
m_IsPrefabParent: 0
@@ -6535,8 +6583,9 @@ MonoBehaviour:
65356583
mKB: 0
65366584
mKnockBackForce: 1
65376585
mDamageTextEffect: 1
6538-
mIsPlayer: 1
65396586
mCanDamage: 1
6587+
mInvincibleTimeAction: {fileID: 0}
6588+
mIsPlayer: 1
65406589
mBeenTarget: 0
65416590
mVelocityInfo: {fileID: 0}
65426591
mAbilityFormat: {fileID: 0}
@@ -7661,6 +7710,10 @@ Prefab:
76617710
propertyPath: m_Name
76627711
value: JCS_AI_01 (1)
76637712
objectReference: {fileID: 0}
7713+
- target: {fileID: 181162, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
7714+
propertyPath: m_IsActive
7715+
value: 1
7716+
objectReference: {fileID: 0}
76647717
m_RemovedComponents: []
76657718
m_ParentPrefab: {fileID: 100100000, guid: 17c0a02394cb1a0439bfe800f8b0a76f, type: 2}
76667719
m_IsPrefabParent: 0

‎Assets/JCSUnity/Scripts/Actions/JCS_HitDamageAction.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class JCS_HitDamageAction
4343
//========================================
4444
// setter / getter
4545
//------------------------------
46-
public BoxCollider GetBoxCollider() { return this.mBoxCollider; }
4746

4847
//========================================
4948
// Unity's function
@@ -56,7 +55,7 @@ private void Awake()
5655
mLiveObject = this.GetComponent<JCS_2DLiveObject>();
5756
}
5857

59-
private void OnTriggerEnter(Collider other)
58+
private void OnTriggerStay(Collider other)
6059
{
6160
JCS_2DLiveObject liveObject = other.GetComponent<JCS_2DLiveObject>();
6261
if (liveObject == null)
@@ -78,7 +77,7 @@ private void OnTriggerEnter(Collider other)
7877
// Private Functions
7978

8079
/// <summary>
81-
///
80+
/// Do the damage to live object.
8281
/// </summary>
8382
/// <param name="liveObject"></param>
8483
private void DamageLiveObject(JCS_2DLiveObject liveObject)
@@ -98,9 +97,7 @@ private void DamageLiveObject(JCS_2DLiveObject liveObject)
9897
if (mAbilityFormat == null)
9998
{
10099
JCS_Debug.JcsReminders(
101-
"JCS_HitDamageAction",
102-
103-
"You sure to not using any \"JCS_AbilityFormat\"?");
100+
this, "You sure to not using any \"JCS_AbilityFormat\"?");
104101

105102
return;
106103
}
@@ -112,9 +109,8 @@ private void DamageLiveObject(JCS_2DLiveObject liveObject)
112109
1, // hit
113110
0); // critical chance
114111

115-
// -------------- PLAYER ---------------
116112

117-
// see if the living object player.
113+
// see if the collider is player.
118114
JCS_Player p = liveObject.GetComponent<JCS_Player>();
119115
if (p == null)
120116
return;

0 commit comments

Comments
 (0)