itai.sharim/TagFight - Change A6K2SVTQ3JQ3TC3F44H3ERSX47TRQ6R5EJGIRJKFGKZG6I4HOATQC

Fix WeaveBuilder showing move time incorrectly. Add CrossFade between some animations

Created by itai.sharim on September 10, 2022

A6K2SVTQ3JQ3TC3F44H3ERSX47TRQ6R5EJGIRJKFGKZG6I4HOATQC

Dependencies

In channels

main

Change contents

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 17 [3.535]
[3.1117]
[3.1117]
```
    Dictionary<string, float> _animationLengths = new();
```
Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 22 [3.535]
[3.1204]
[3.1204]
```
        PopulateAnimationLength();
```

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 28 [3.535]

[3.1369]

    }
    void PopulateAnimationLength() {
        RuntimeAnimatorController ac = _animator.runtimeAnimatorController;
        foreach (var animation in ac.animationClips) {
            _animationLengths[animation.name] = animation.length;
        }

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 36 [3.535]
[3.1376]
[3.1376]
Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 45 [3.535]
B:BD[3.1614] → [3.1614:1639]
```
    void HandleIdle() {
```
[3.1614]
[3.1639]
```
    void HandleIdleState() {
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 62 [3.535]

B:BD[3.2265] → [3.2265:2355]

            case WeaveAction.State:
                _animator.Play(_slash, _layer, 0f);

[3.2265]

[3.2355]

            case WeaveAction.State weave:
                StartWeave(weave);

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 67 [3.535]
B:BD[3.2397] → [3.2397:2424]
```
    void HandleMoveTo() {
```
[3.2397]
[3.2424]
```
    void HandleMoveToState() {
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 70 [3.535]

B:BD[3.2490] → [3.2490:2542]

                _animator.Play(_idle, _layer, 0f);

[3.2490]

[3.2542]

                _animator.Update(-Mathf.Floor(_animator.GetCurrentAnimatorStateInfo(_layer).normalizedTime));
                _animator.CrossFade(_idle, 0.25f, _layer);

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 77 [3.535]

B:BD[3.2690] → [3.2690:2780]

            case WeaveAction.State:
                _animator.Play(_slash, _layer, 0f);

[3.2690]

[3.2780]

            case WeaveAction.State weave:
                StartWeave(weave);

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 83 [3.535]
B:BD[3.2824] → [3.2824:2851]
```
    void HandleFollow() {
```
[3.2824]
[3.2851]
```
    void HandleFollowState() {
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 92 [3.535]

B:BD[3.3117] → [3.3117:3207]

            case WeaveAction.State:
                _animator.Play(_slash, _layer, 0f);

[3.3117]

[3.3207]

            case WeaveAction.State weave:
                StartWeave(weave);

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 99 [3.535]
B:BD[3.3253] → [3.3253:3279]
```
    void HandleWeave() {
```
[3.3253]
[3.3279]
```
    void HandleWeaveState(WeaveAction.State currentWeave) {
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 105 [3.535]

B:BD[3.3459] → [3.3459:3510]

                _animator.Play(_run, _layer, 0f);

[3.3459]

[3.3510]

                _animator.Update(-Mathf.Floor(_animator.GetCurrentAnimatorStateInfo(_layer).normalizedTime));
                _animator.CrossFade(_run, 0.25f, _layer);

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 109 [3.535]

B:BD[3.3572] → [3.3572:3623]

                _animator.Play(_run, _layer, 0f);

[3.3572]

[3.3623]

                _animator.Update(-Mathf.Floor(_animator.GetCurrentAnimatorStateInfo(_layer).normalizedTime));
                _animator.CrossFade(_run, 0.25f, _layer);

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 112 [3.535]

B:BD[3.3647] → [3.3647:3725]

            case WeaveAction.State:
                _animator.Play(_slash);

[3.3647]

[3.3725]

            case WeaveAction.State weave:
                if (weave.CompletionStatus < 1) {
                    TransitionWeave(currentWeave, weave);
                }

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 123 [3.535]
B:BD[3.3869] → [3.3869:3900]
```
                HandleIdle();
```
[3.3869]
[3.3900]
```
                HandleIdleState();
```
Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 126 [3.535]
B:BD[3.3962] → [3.3962:3995]
```
                HandleMoveTo();
```
[3.3962]
[3.3995]
```
                HandleMoveToState();
```
Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 129 [3.535]
B:BD[3.4057] → [3.4057:4090]
```
                HandleFollow();
```
[3.4057]
[3.4090]
```
                HandleFollowState();
```

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 131 [3.535]

B:BD[3.4114] → [3.4114:4183]

            case WeaveAction.State:
                HandleWeave();

[3.4114]

[3.4183]

            case WeaveAction.State currentWeave:
                HandleWeaveState(currentWeave);

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 142 [3.535]

[3.4391]

        }
    }
    void StartWeave(WeaveAction.State nextWeave) {
        _animator.Update(-Mathf.Floor(_animator.GetCurrentAnimatorStateInfo(_layer).normalizedTime));
        _animator.CrossFade(_slash, 0.25f, _layer);
        float animationLength = _animationLengths[_slash];
        if (nextWeave.Move.speed > 0) {
            float desiredSpeed = animationLength / nextWeave.Move.speed;
            _animator.SetFloat($"SlashSpeed", desiredSpeed);

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 154 [3.535]

[3.4409]

    void TransitionWeave(WeaveAction.State currentWeave, WeaveAction.State nextWeave) {
        if (currentWeave.Move != nextWeave.Move) {
            float animationLength = _animationLengths[_slash];
            if (nextWeave.Move.speed > 0) {
                float desiredSpeed = animationLength / nextWeave.Move.speed;
                _animator.SetFloat($"SlashSpeed", desiredSpeed);
            }
        }
    }

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 15 [4.9309]
B:BD[4.9634] → [3.33886106:33886160]
```
    static State resetState = new(false, 0f, false);
```
[4.9634]
[4.9634]
```
    static State resetState = new(true, 1f, false, default);
```

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 37 [4.9309]

B:BD[3.33886341] → [3.33886341:33886420]

            stateToReturn = new State(isAdvanced, CompletionStatus(), false);

[3.33886341]

[4.10584]

            stateToReturn = new State(isAdvanced, CompletionStatus(), false, _runeWeaving.runeWeaving.GetCurrentMove());

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 42 [4.9309]

B:BD[3.33886519] → [3.33886519:33886614]

                stateToReturn = new State(false, CompletionStatus(), stateToReturn.IsMoving);

[3.33886519]

[3.33886614]

                stateToReturn = new State(false, CompletionStatus(), stateToReturn.IsMoving, _runeWeaving.runeWeaving.GetCurrentMove());

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 61 [4.9309]

B:BD[3.33886709] → [3.33886709:33886893]

        Vector3 source = new Vector3(_weaver.transform.position.x, 0, _weaver.transform.position.z);
        Vector3 target = new Vector3(_target.position.x, 0, _target.position.z);

[3.33886709]

[3.33886893]

        // Incorrect in case there are hills. should calc range from feet.
        Vector3 source = new(_weaver.transform.position.x, 0, _weaver.transform.position.z);
        Vector3 target = new(_target.position.x, 0, _target.position.z);

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 72 [4.9309]

B:BD[5.806] → [3.33886994:33887074]

        public State(bool isAdvanced, float completionStatus, bool isMoving) {

[5.806]

[5.871]

        public CombatMove Move { get; }
        public State(bool isAdvanced, float completionStatus, bool isMoving, CombatMove move) {

Insertion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 78 [4.9309]
[3.33887109]
[5.959]
```
            Move = move;
```

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 40 [6.294]

B:BD[4.40990] → [4.40990:41185]

                GameObject timeNode = Instantiate(TimeCounterNodeTemplate, TimeCounterTransform);
                TextMeshProUGUI secLabel = timeNode.GetComponentInChildren<TextMeshProUGUI>();

[4.40990]

[6.1824]

                while (_martialSequenceTime > _timeSequenceNodes.Count) {
                    GameObject timeNode = Instantiate(TimeCounterNodeTemplate, TimeCounterTransform);
                    TextMeshProUGUI secLabel = timeNode.GetComponentInChildren<TextMeshProUGUI>();

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 44 [6.294]

B:BD[6.1826] → [4.41186:41356]

                secLabel.text = (_timeSequenceNodes.Count + 1).ToString();
                _timeSequenceNodes.Add(timeNode);
                timeNode.SetActive(true);

[6.1826]

[4.41356]

                    secLabel.text = (_timeSequenceNodes.Count + 1).ToString();
                    _timeSequenceNodes.Add(timeNode);
                    timeNode.SetActive(true);
                }

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 50 [6.294]

B:BD[4.41448] → [4.41448:41650]

                GameObject timeNodeToRemove = _timeSequenceNodes[^1];
                _timeSequenceNodes.RemoveAt(_timeSequenceNodes.Count - 1);
                Destroy(timeNodeToRemove.gameObject);

[4.41448]

[4.41650]

                while (_martialSequenceTime + 1 < _timeSequenceNodes.Count) {
                    GameObject timeNodeToRemove = _timeSequenceNodes[^1];
                    _timeSequenceNodes.RemoveAt(_timeSequenceNodes.Count - 1);
                    Destroy(timeNodeToRemove.gameObject);
                }

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 61 [6.294]

[4.42041]

            RectTransform combatMoveNodeNodeTransform = combatMoveNode.GetComponent<RectTransform>();

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 67 [6.294]
[6.2637]
[4.42207]
```
            combatMoveNodeNodeTransform.sizeDelta *= move.speed;
```

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 26 [7.761]

[4.86471]

[7.1130]

    }
    public CombatMove GetCurrentMove() {
        return martialSequence.GetCurrentMove();

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 42 [7.2175]
[7.2394]
[8.3986]
```
    }
```

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 45 [7.2175]

[8.3988]

[7.2404]

    public CombatMove GetCurrentMove() {
        CombatMove move = default;
        if (currentMoveIdx < combatMoves.Count) {
            move = combatMoves[currentMoveIdx];
        } 
        return move;

Replacement in Assets/ScriptableObjects/CombatScriptableObjects/Moves/Stab.asset at line 18 [9.10547]
B:BD[9.10988] → [9.10988:11004]
```
    speed: 0.85
```
[9.10988]
```
    speed: 0.5
```
Replacement in Assets/ScriptableObjects/CombatScriptableObjects/Moves/SpinningSlash.asset at line 18 [9.11282]
B:BD[9.11741] → [9.11741:11754]
```
    speed: 1
```
[9.11741]
```
    speed: 3
```

Replacement in Assets/Scenes/SampleScene.unity at line 865 [10.780110080]

B:BD[10.780121071] → [3.33887940:33888019]

  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}

[10.780121071]

[3.33888019]

  m_LocalRotation: {x: 0.22914574, y: -0.070709124, z: 0.016692158, w: 0.970677}

Replacement in Assets/Scenes/SampleScene.unity at line 4405 [10.780110080]
B:BD[10.780161886] → [2.2817:2856]
```
    m_SensorSize: {x: 2.2373135, y: 1}
```
[10.780161886]
[10.780161925]
```
    m_SensorSize: {x: 2.238806, y: 1}
```

Replacement in Assets/Scenes/SampleScene.unity at line 4421 [10.780110080]

B:BD[10.780162310] → [3.33917937:33918016]

  m_LocalRotation: {x: 0.22914572, y: -0.07070914, z: 0.01669216, w: 0.970677}

[10.780162310]

[3.33918016]

  m_LocalRotation: {x: 0.22914574, y: -0.070709124, z: 0.016692158, w: 0.970677}

Replacement in Assets/Characters/Animations/GreatSwordSlash.fbx.meta at line 57 [3.30200944]
B:BD[3.30202369] → [3.30202369:30202401]
```
      keepOriginalPositionXZ: 0
```
[3.30202369]
[3.30202401]
```
      keepOriginalPositionXZ: 1
```
Replacement in Assets/Characters/Animations/GreatSwordIdle5.fbx.meta at line 57 [3.30961466]
B:BD[3.30962892] → [3.30962892:30962924]
```
      keepOriginalPositionXZ: 0
```
[3.30962892]
[3.30962924]
```
      keepOriginalPositionXZ: 1
```

File deletion: Amazon.controller.meta

BF:BFD[3.33877606] → [3.33877830:33877876]

BF:BFD[3.33877876] → [3.33877640:33877640]

B:BD[3.33877640] → [3.33877641:33877829]

fileFormatVersion: 2
guid: 00653437f5240dc4bbafa1f8fa3072b9
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 9100000
  userData: 
  assetBundleName: 
  assetBundleVariant:

File deletion: Amazon.controller

BF:BFD[3.33877606] → [3.33885564:33885605]

BF:BFD[3.33885605] → [3.33877878:33877878]

B:BD[3.33877878] → [3.33877879:33885563]

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-6586782901838545764
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle2
  m_Speed: 1
  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: -203655887218126122, guid: 4bbe65069c3b1c64182a932d852eeb9a,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-6503941457538665111
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle3
  m_Speed: 1
  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: -203655887218126122, guid: 18dbdb86e2cebab4b9764773620071e1,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-4970865630859154500
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle5
  m_Speed: 1
  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: -203655887218126122, guid: 445d3866cba7fe14f84c9baa06065120,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-824070473891477386
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle1
  m_Speed: 1
  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: -203655887218126122, guid: ba942db276a46b94fbc0a6b96974fb26,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!91 &9100000
AnimatorController:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Amazon
  serializedVersion: 5
  m_AnimatorParameters: []
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: base
    m_StateMachine: {fileID: 7924647021352512456}
    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
    m_BlendingMode: 0
    m_SyncedLayerIndex: -1
    m_DefaultWeight: 0
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1102 &665723749381914017
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordSlash
  m_Speed: 1
  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: -203655887218126122, guid: 6a941caedcd9a1d4ca0e3f1c213b79de,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &3011430063804800624
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Empty
  m_Speed: 1
  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: 0}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &6024168295091334178
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordForwardRun
  m_Speed: 1
  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: -203655887218126122, guid: 08961b84c904dc840baa1b8625486a2c,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &7733726895630004942
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle4
  m_Speed: 1
  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: -203655887218126122, guid: 64514a60671cdef429fe9f73aee5becd,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1107 &7924647021352512456
AnimatorStateMachine:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: base
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 6024168295091334178}
    m_Position: {x: 500, y: 200, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 665723749381914017}
    m_Position: {x: 500, y: 60, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3011430063804800624}
    m_Position: {x: 30, y: 220, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6586782901838545764}
    m_Position: {x: 260, y: 400, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6503941457538665111}
    m_Position: {x: 260, y: 440, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -824070473891477386}
    m_Position: {x: 260, y: 360, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7733726895630004942}
    m_Position: {x: 260, y: 480, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -4970865630859154500}
    m_Position: {x: 260, y: 520, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  m_EntryPosition: {x: 50, y: 120, z: 0}
  m_ExitPosition: {x: 950, y: 240, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 3011430063804800624}

File addition: GreatSword.controller.meta (---x------)

[3.33877606]

fileFormatVersion: 2
guid: 00653437f5240dc4bbafa1f8fa3072b9
NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 9100000
  userData: 
  assetBundleName: 
  assetBundleVariant:

File addition: GreatSword.controller (---x------)

[3.33877606]

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-6586782901838545764
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle2
  m_Speed: 1
  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: -203655887218126122, guid: 4bbe65069c3b1c64182a932d852eeb9a,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-6503941457538665111
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle3
  m_Speed: 1
  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: -203655887218126122, guid: 18dbdb86e2cebab4b9764773620071e1,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-4970865630859154500
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle5
  m_Speed: 1
  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: -203655887218126122, guid: 445d3866cba7fe14f84c9baa06065120,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &-824070473891477386
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle1
  m_Speed: 1
  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: -203655887218126122, guid: ba942db276a46b94fbc0a6b96974fb26,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!91 &9100000
AnimatorController:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSword
  serializedVersion: 5
  m_AnimatorParameters:
  - m_Name: SlashSpeed
    m_Type: 1
    m_DefaultFloat: 1
    m_DefaultInt: 0
    m_DefaultBool: 0
    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: base
    m_StateMachine: {fileID: 7924647021352512456}
    m_Mask: {fileID: 0}
    m_Motions: []
    m_Behaviours: []
    m_BlendingMode: 0
    m_SyncedLayerIndex: -1
    m_DefaultWeight: 0
    m_IKPass: 0
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
--- !u!1102 &665723749381914017
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordSlash
  m_Speed: 1
  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: 1
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
  m_Motion: {fileID: -203655887218126122, guid: 6a941caedcd9a1d4ca0e3f1c213b79de,
    type: 3}
  m_Tag: 
  m_SpeedParameter: SlashSpeed
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &3011430063804800624
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Empty
  m_Speed: 1
  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: 0}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &6024168295091334178
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordForwardRun
  m_Speed: 1
  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: -203655887218126122, guid: 08961b84c904dc840baa1b8625486a2c,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1102 &7733726895630004942
AnimatorState:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: GreatSwordIdle4
  m_Speed: 1
  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: -203655887218126122, guid: 64514a60671cdef429fe9f73aee5becd,
    type: 3}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
--- !u!1107 &7924647021352512456
AnimatorStateMachine:
  serializedVersion: 6
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: base
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: 6024168295091334178}
    m_Position: {x: 500, y: 200, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 665723749381914017}
    m_Position: {x: 500, y: 60, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 3011430063804800624}
    m_Position: {x: 30, y: 220, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6586782901838545764}
    m_Position: {x: 260, y: 400, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -6503941457538665111}
    m_Position: {x: 260, y: 440, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -824070473891477386}
    m_Position: {x: 260, y: 360, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 7733726895630004942}
    m_Position: {x: 260, y: 480, z: 0}
  - serializedVersion: 1
    m_State: {fileID: -4970865630859154500}
    m_Position: {x: 260, y: 520, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
  m_EntryPosition: {x: 50, y: 120, z: 0}
  m_ExitPosition: {x: 950, y: 240, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 3011430063804800624}

Fix WeaveBuilder showing move time incorrectly. Add CrossFade between some animations

Dependencies

In channels

Change contents

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 17 [3.535]

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 22 [3.535]

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 28 [3.535]

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 36 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 45 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 62 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 67 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 70 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 77 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 83 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 92 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 99 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 105 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 109 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 112 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 123 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 126 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 129 [3.535]

Replacement in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 131 [3.535]

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 142 [3.535]

Insertion in Assets/Scripts/UnitHandling/Animations/AnimationManager.cs at line 154 [3.535]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 15 [4.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 37 [4.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 42 [4.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 61 [4.9309]

Replacement in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 72 [4.9309]

Insertion in Assets/Scripts/UnitHandling/Actions/WeaveAction.cs at line 78 [4.9309]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 40 [6.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 44 [6.294]

Replacement in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 50 [6.294]

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 61 [6.294]

Insertion in Assets/Scripts/UI/WeaveBuilder/WeaveNavigator.cs at line 67 [6.294]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/RuneWeaving.cs at line 26 [7.761]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 42 [7.2175]

Insertion in Assets/Scripts/Combat/Weaving/Sequences/MartialSequence.cs at line 45 [7.2175]

Replacement in Assets/ScriptableObjects/CombatScriptableObjects/Moves/Stab.asset at line 18 [9.10547]

Replacement in Assets/ScriptableObjects/CombatScriptableObjects/Moves/SpinningSlash.asset at line 18 [9.11282]

Replacement in Assets/Scenes/SampleScene.unity at line 865 [10.780110080]

Replacement in Assets/Scenes/SampleScene.unity at line 4405 [10.780110080]

Replacement in Assets/Scenes/SampleScene.unity at line 4421 [10.780110080]

Replacement in Assets/Characters/Animations/GreatSwordSlash.fbx.meta at line 57 [3.30200944]

Replacement in Assets/Characters/Animations/GreatSwordIdle5.fbx.meta at line 57 [3.30961466]

File deletion: Amazon.controller.meta

File deletion: Amazon.controller

File addition: GreatSword.controller.meta (---x------)

File addition: GreatSword.controller (---x------)