Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Adds knight on horse and its animations #8

Merged
Garutako merged 16 commits from art/knightOnHorse into main 2025-07-14 22:58:23 +00:00
Conversation 1 Commits 16 Files Changed 73 +167 -10
5 changed files with 167 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7148263214 - Show all commits

2
Assets/Animations/Sticks/KnightOnHorse/animator_KOH.overrideController
View File

@ -11,3 +11,5 @@ AnimatorOverrideController:
m_Clips:
- m_OriginalClip: {fileID: 7400000, guid: ff0a07b8a8691ba4390094d6fb771bef, type: 2}
m_OverrideClip: {fileID: 7400000, guid: dcb0ef447fba68e49a4e1280d3589f6b, type: 2}
- m_OriginalClip: {fileID: 7400000, guid: 0d8966546e9711f49a44b76e694e60dd, type: 2}
m_OverrideClip: {fileID: 7400000, guid: 0d8966546e9711f49a44b76e694e60dd, type: 2}

4
Assets/Design/UnitUpgrades/Upgrade_Rider.asset
View File

@ -13,5 +13,5 @@ MonoBehaviour:
m_Name: Upgrade_Rider
m_EditorClassIdentifier:
_upgradeUnitCard: {fileID: 11400000, guid: 4855deb66869b934bb7a63c02d4442fe, type: 2}
_upgradePrefab: {fileID: 2230360378425099702, guid: d57d97357919087419f8097e907c7a7e, type: 3}
_upgradeCardArt: {fileID: 21300000, guid: 0f9488183cb57b242b27a65ea48f8dcb, type: 3}
_upgradePrefab: {fileID: 2230360378425099702, guid: a857e93871a186749879c021675f5a13, type: 3}
_upgradeCardArt: {fileID: 21300000, guid: 2e5707f47d1b6024494204411e9ced5f, type: 3}

94
Assets/Prefabs/Sticks/knightOnHorse.prefab
View File

@ -911,7 +911,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0fbd934c179894458914437255781c4, type: 3}
m_Name:
m_EditorClassIdentifier:
_entity: {fileID: 682208058972047871}
_entity: {fileID: -5330839660088382680}
_projectile: {fileID: 0}
_projectileSpawn: {fileID: 0}
--- !u!1 &2230360378261608744
@ -956,7 +956,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2230360378425099703}
- component: {fileID: 682208058972047871}
- component: {fileID: -5330839660088382680}
- component: {fileID: 3032268583489863936}
- component: {fileID: 1521752234217958423}
- component: {fileID: 7579822520172569173}
@ -984,11 +984,12 @@ Transform:
- {fileID: 2230360378000122420}
- {fileID: 2230360378127571587}
- {fileID: 9128510391006626171}
- {fileID: 5365821957670728708}
- {fileID: 7758425403302365699}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &682208058972047871
--- !u!114 &-5330839660088382680
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -997,15 +998,22 @@ MonoBehaviour:
m_GameObject: {fileID: 2230360378425099702}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 27e69fa6018bf654196267d829031f1a, type: 3}
m_Script: {fileID: 11500000, guid: a0092e8a906da7a4fa0aca6e274a8c5e, type: 3}
m_Name:
m_EditorClassIdentifier:
_lifeBar: {fileID: 5807970101048976302}
_hp: 80
_speed: 0
_speed: 2
_attack_damage: 6
_attack_interval: 2
_enemy: {fileID: 0}
_chargeAttackDamage: 3
_chargeCooldown: 10
_maxChargeHitCount: 3
_maxChargeDistance: 10
_detection: {fileID: 9048754633958631738}
_chargeDetection: {fileID: 3062706309015911873}
_root: {fileID: 2230360378127571586}
--- !u!1839735485 &3032268583489863936
Tilemap:
m_ObjectHideFlags: 0
@ -1201,6 +1209,78 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &3062706309015911873
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5365821957670728708}
- component: {fileID: 1080875801764588868}
- component: {fileID: 5850107427616902080}
m_Layer: 6
m_Name: charge_detection
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5365821957670728708
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3062706309015911873}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2230360378425099703}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1080875801764588868
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3062706309015911873}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 1.7083191, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.5, y: 0.5}
m_EdgeRadius: 0
--- !u!114 &5850107427616902080
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3062706309015911873}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3}
m_Name:
m_EditorClassIdentifier:
_entityLinked: {fileID: -5330839660088382680}
--- !u!1 &3238480627747328347
GameObject:
m_ObjectHideFlags: 0
@ -1921,7 +2001,7 @@ Transform:
m_Children:
- {fileID: 430301385815424918}
m_Father: {fileID: 2230360378425099703}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5807970101048976302
MonoBehaviour:
@ -2741,7 +2821,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3}
m_Name:
m_EditorClassIdentifier:
_entityLinked: {fileID: 682208058972047871}
_entityLinked: {fileID: -5330839660088382680}
--- !u!1 &9102431412097219544
GameObject:
m_ObjectHideFlags: 0

72
Assets/Scenes/Game.unity
View File

@ -3241,6 +3241,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1679512786705993256, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -3353,6 +3369,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 2671006930051035827, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: _prefab
value:
objectReference: {fileID: 2230360378425099702, guid: a857e93871a186749879c021675f5a13, type: 3}
- target: {fileID: 3028311141574704260, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -3389,6 +3409,38 @@ PrefabInstance:
propertyPath: _unitCardInformation
value:
objectReference: {fileID: 11400000, guid: b326df01bdba895448b1df3f2918fa9b, type: 2}
- target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3651040691475849588, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3656332586793712027, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
@ -3685,6 +3737,26 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -201.6
objectReference: {fileID: 0}
- target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6666883114332643056, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -299.90002
objectReference: {fileID: 0}
- target: {fileID: 6666883114610284081, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2e5707f47d1b6024494204411e9ced5f, type: 3}
- target: {fileID: 6772290102801599907, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: _unitCardInformation
value:

3
Assets/Scripts/Ally/Rider.cs
View File

@ -41,6 +41,7 @@ public class Rider : Ally
public override void Update()
{
// check for charge cooldown
if (_timeSinceLastCharge > _chargeCooldown)
{
@ -57,6 +58,7 @@ public class Rider : Ally
_movementVector.x = Time.deltaTime * Speed;
transform.position += (Vector3)_movementVector;
Debug.Log(IsEnemyDetected);
// attack
if (IsEnemyDetected && !_opponentsHit.Contains(Enemy))
{
@ -96,6 +98,7 @@ public class Rider : Ally
void AttackEnemyRiding()
{
Debug.Log("Attack Riding");
_rootScript.AttackWithCustomDamage(_chargeAttackDamage);
_opponentsHit.Add(Enemy);
}