Skip to content

tetra-tower
tetra-tower
Commit f10c39a4 authored by 18류지석's avatar 18류지석
Browse files
Options

처음 공격 일반공격 나가는거 수정함. 공격 히트박스 조정함

parent 5472a6ec
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 38 deletions
Assets/Animation/Player/Player animator.controller
View file @ f10c39a4
......@@ -630,19 +630,19 @@ AnimatorStateMachine:
m_Position: {x: 168, y: -132, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102478016988564962}
m_Position: {x: 283.63446, y: 453.63867, z: 0}
m_Position: {x: 180, y: 408, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102120881417498060}
m_Position: {x: 127.35602, y: 552.162, z: 0}
m_Position: {x: 180, y: 456, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102717063814967854}
m_Position: {x: 422.9261, y: 608.2184, z: 0}
m_Position: {x: 180, y: 504, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102227438932548068}
m_Position: {x: -28.922424, y: 411.1717, z: 0}
m_Position: {x: -24, y: 408, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102949526718564970}
m_Position: {x: -32.319763, y: 496.1056, z: 0}
m_Position: {x: -24, y: 456, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101150420884930214}
......
Assets/Prefabs/Characters/Player.prefab
View file @ f10c39a4
......@@ -312,6 +312,7 @@ MonoBehaviour:
doubleJumpSpeed: 10
dashAcceleration: 50
platformCollider: {fileID: 0}
airAttack: 1
groundLayer:
serializedVersion: 2
m_Bits: 6400
......@@ -366,7 +367,7 @@ MonoBehaviour:
comboTime: 1
time: {fileID: 0}
combo: {fileID: 0}
comboArray: AB
comboArray:
StartTime: 0
anim: {fileID: 95992411616135034}
aoc: {fileID: 0}
......@@ -422,7 +423,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -2078941185
m_SortingLayer: 7
m_SortingLayer: 6
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
......
Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
View file @ f10c39a4
......@@ -131,6 +131,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
itemAddon: 0
highlight: {fileID: 1886512004533810}
itemSizeMultiplier: 0.007
--- !u!212 &212078234558260036
SpriteRenderer:
m_ObjectHideFlags: 1
......
Assets/Resources/Animations/daggerAttack1.anim
View file @ f10c39a4
......@@ -38,7 +38,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.15
time: 0.18333334
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -58,7 +58,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.35727715
value: -0.3119259
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -77,7 +77,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.17332983
value: -0.15569305
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -96,7 +96,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.4124017
value: 1.2813864
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -115,7 +115,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.5327382
value: 0.34629345
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -281,7 +281,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.15
time: 0.18333334
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -301,7 +301,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.35727715
value: -0.3119259
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -320,7 +320,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.17332983
value: -0.15569305
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -339,7 +339,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.4124017
value: 1.2813864
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -358,7 +358,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.5327382
value: 0.34629345
inSlope: 0
outSlope: 0
tangentMode: 136
......
Assets/Resources/Animations/daggerAttack2.anim
View file @ f10c39a4
......@@ -38,7 +38,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.28333333
time: 0.31666666
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -58,7 +58,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.8663552
value: -0.80588675
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -77,7 +77,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.012122154
value: 0.0911783
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -96,7 +96,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.97120047
value: 0.99135685
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -115,7 +115,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.78727865
value: 0.25817847
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -278,7 +278,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.28333333
time: 0.31666666
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -298,7 +298,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.8663552
value: -0.80588675
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -317,7 +317,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.012122154
value: 0.0911783
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -336,7 +336,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.97120047
value: 0.99135685
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -355,7 +355,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0.78727865
value: 0.25817847
inSlope: 0
outSlope: 0
tangentMode: 136
......
Assets/Resources/Animations/normalAttackA.anim
View file @ f10c39a4
......@@ -38,7 +38,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
time: 0.23333333
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -278,7 +278,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
time: 0.23333333
value: 0
inSlope: Infinity
outSlope: Infinity
......
Assets/Resources/Animations/normalAttackB.anim
View file @ f10c39a4
......@@ -38,7 +38,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
time: 0.23333333
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -278,7 +278,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.2
time: 0.23333333
value: 0
inSlope: Infinity
outSlope: Infinity
......
Assets/Resources/Animations/normalAttackC.anim
View file @ f10c39a4
......@@ -38,7 +38,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.26666668
time: 0.3
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -278,7 +278,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.26666668
time: 0.3
value: 0
inSlope: Infinity
outSlope: Infinity
......
Assets/Scripts/Characters/AttackProperty.cs
View file @ f10c39a4
......@@ -25,11 +25,13 @@ public class AttackProperty : MonoBehaviour{
Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>();
collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack);
//make effect
foreach (Collider2D col in GetComponents<Collider2D>())
if (col.isActiveAndEnabled)
tmpBounds = col.bounds;
if (!tmpBounds.Equals(new Bounds())) ;
if (!tmpBounds.Equals(new Bounds()))
effectManager.StartEffect(0, tmpBounds, collision.bounds);
}
}
......
Assets/Scripts/Characters/PlayerAttack.cs
View file @ f10c39a4
......@@ -132,13 +132,14 @@ public class PlayerAttack : MonoBehaviour {
void CheckCombo()
{
List<Item> itemList = inventoryManager.itemList;
foreach(Item item in itemList)
foreach (Item item in itemList)
{
for(int i=0; i< item.skillNum; i++)
{
if(item.combo[i].Equals(comboArray))
{
aoc["PlayerAttackAnim"] = item.animation[i];
anim.SetTrigger("attack");
item.ComboAction(i);
......@@ -146,6 +147,7 @@ public class PlayerAttack : MonoBehaviour {
if (playerController.playerState != PlayerState.GoingUp && playerController.playerState != PlayerState.GoingDown)
GetComponent<Rigidbody2D>().velocity = new Vector2(Mathf.Clamp(GetComponent<Rigidbody2D>().velocity.x,-0.5f,0.5f), GetComponent<Rigidbody2D>().velocity.y);
playerController.playerState = PlayerState.Attack;
return;
}
}
......@@ -158,7 +160,6 @@ public class PlayerAttack : MonoBehaviour {
GetComponent<Rigidbody2D>().velocity = new Vector2(Mathf.Clamp(GetComponent<Rigidbody2D>().velocity.x, -0.5f, 0.5f),GetComponent<Rigidbody2D>().velocity.y);
playerController.playerState = PlayerState.Attack;
if (!CheckLongerCombo()) comboArray = comboArray[comboArray.Length - 1] + "";
}
bool CheckLongerCombo()
......
Assets/Scripts/Item/InventoryManager.cs
View file @ f10c39a4
......@@ -24,7 +24,6 @@ public class InventoryManager : MonoBehaviour {
SetPool();
ItemInstantiate("Dagger", player.transform.position, 0f);
StartCoroutine(TestCoroutine());
}
/// <summary>
......@@ -227,6 +226,8 @@ public class InventoryManager : MonoBehaviour {
itemList.Add(item);
ui.SetOnPosition(itemList, addonList);
Debug.Log(itemList[0].combo[0] + " " + itemList[0].combo[1]);
return true;
}
/// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment