Skip to content

Commit

Permalink
Atualiza Animator
Browse files Browse the repository at this point in the history
Co-authored-by: Sara Silva <[email protected]>
  • Loading branch information
thamipontes and silvasara committed Oct 13, 2020
1 parent 6bd7efb commit ce79fca
Show file tree
Hide file tree
Showing 8 changed files with 1,046 additions and 296 deletions.
2 changes: 2 additions & 0 deletions Assembly-CSharp.csproj.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Default</s:String></wpf:ResourceDictionary>
28 changes: 28 additions & 0 deletions Assets/Gameplay/Behaviours/ProjectileAttackBehaviour.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Gameplay.Behaviours.Interfaces;
using UnityEngine;

public class ProjectileAttackBehaviour : IAttacker
{
// Start is called before the first frame update
void Start()
{
[SerializeField] GameObject Projectile;

}

void Awake()
{

Projectile.Add((GameObject)Instantiate(Projectile, Projectile.transform.position, Projectile.transform.rotation));

}


public void Attack(IDamageable target)
{
throw new NotImplementedException();
}
}
11 changes: 11 additions & 0 deletions Assets/Gameplay/Behaviours/ProjectileAttackBehaviour.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 78 additions & 4 deletions Assets/Gameplay/Core/Cards/Ranged.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Transform:
m_Children:
- {fileID: 6476039175054870980}
- {fileID: 3016960902611531402}
- {fileID: 6869967604214366004}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand All @@ -51,8 +52,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1.4, z: 1}
m_Center: {x: 0, y: 0.7, z: 0}
m_Size: {x: 5.426, y: 1.4, z: 1}
m_Center: {x: 2.2130005, y: 0.7, z: 0}
--- !u!54 &4580030627645663219
Rigidbody:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -133,7 +134,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cec0e01574b244b488248ee6d7bafc77, type: 3}
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 9500000, guid: fc886a2a8c4899e4fba28111d6be3a63, type: 3}
animator: {fileID: 3016960902620518738}
--- !u!114 &1104844118089303507
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -256,6 +257,73 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 5745724509577208853}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6869967604214490548
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8802363147870601316}
m_Modifications:
- target: {fileID: 100000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_Name
value: Orc_Arrow
objectReference: {fileID: 0}
- target: {fileID: 100000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalPosition.x
value: 0.583
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalPosition.y
value: 0.81
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalPosition.z
value: -0.84
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f2492904e2e22a44296278c2ef856c46, type: 3}
--- !u!4 &6869967604214366004 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: f2492904e2e22a44296278c2ef856c46,
type: 3}
m_PrefabInstance: {fileID: 6869967604214490548}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8731296987301397353
PrefabInstance:
m_ObjectHideFlags: 0
Expand All @@ -272,7 +340,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Avatar
value:
objectReference: {fileID: 9000000, guid: e4305b028a1f42c4f9d34545844691e7, type: 3}
objectReference: {fileID: 9000000, guid: fc886a2a8c4899e4fba28111d6be3a63, type: 3}
- target: {fileID: 5833755455666117179, guid: d8c6f65c212cd2943997e75862b6699b,
type: 3}
propertyPath: m_ApplyRootMotion
Expand Down Expand Up @@ -346,3 +414,9 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8731296987301397353}
m_PrefabAsset: {fileID: 0}
--- !u!95 &3016960902620518738 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 5833755455666117179, guid: d8c6f65c212cd2943997e75862b6699b,
type: 3}
m_PrefabInstance: {fileID: 8731296987301397353}
m_PrefabAsset: {fileID: 0}
Original file line number Diff line number Diff line change
@@ -1,5 +1,56 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-3983775515755821044
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: State
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110269336}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.722222
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-154283469696338754
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Test Attack
m_Speed: 0.9
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 3310b1bec2ba2b84cba518d0f4e3a935, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand All @@ -8,7 +59,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: archer_animator
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: State
m_Type: 3
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand All @@ -29,10 +86,11 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ELF_archer_01_idle_A
m_Speed: 1
m_Name: Walk/Run
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: 5289303503589928459}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -42,7 +100,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 0b90587dd6594e54a92cf1712c0ce4da, type: 3}
m_Motion: {fileID: 7400000, guid: a83f72efb92cfb541891689c32749c0c, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -59,7 +117,13 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110269336}
m_Position: {x: 698, y: -11, z: 0}
m_Position: {x: 290, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: 3477266036253471465}
m_Position: {x: 430, y: 160, z: 0}
- serializedVersion: 1
m_State: {fileID: -154283469696338754}
m_Position: {x: 270, y: 300, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand All @@ -70,3 +134,55 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110269336}
--- !u!1102 &3477266036253471465
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Attack
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions:
- {fileID: -3983775515755821044}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 3310b1bec2ba2b84cba518d0f4e3a935, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5289303503589928459
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: State
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3477266036253471465}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.58333
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ce79fca

Please sign in to comment.