Skip to content

code/oleg-zhirnov/UpgradePuppetMaster #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ku6epnec wants to merge 1 commit into
base: MVP/march-22
Choose a base branch
from
Open

code/oleg-zhirnov/UpgradePuppetMaster #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 30 additions & 23 deletions Assets/AdditiveAssets/Animations/Controllers/CharacterAnimator.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,19 +989,19 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: THSpearSpecialHoldAttack1
m_Speed: 1
m_Speed: 0.5
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_Mirror: 1
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c36035eaef5d9ab4eb68cde076ba3946, type: 3}
m_Motion: {fileID: 7400000, guid: 5a8cb3faadd26c241858bb7c33cd6ad9, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -1385,7 +1385,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OHMaceSimpleAttack1
m_Speed: 0.7
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -1397,7 +1397,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 9e5d42c64f4181e4e92729d62fa2d0fd, type: 3}
m_Motion: {fileID: 7400000, guid: 7aae4195d1959d74ca2f13607e7ddeed, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -1437,7 +1437,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: THSwordSimpleAttack1
m_Speed: 1
m_Speed: 0.7
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -1449,7 +1449,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 04cb27dc01c081446ba2c02f2761f01d, type: 3}
m_Motion: {fileID: 7400000, guid: 5b72bc0754f747942bcfe73b412774de, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -1761,7 +1761,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OHSwordSimpleAttack1
m_Speed: 0.7
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -1773,7 +1773,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 58f2909dff975b54c8395d479180996e, type: 3}
m_Motion: {fileID: 7400000, guid: a1cbf1cbd36ee9c4a8ef296ce00d37b7, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -1787,7 +1787,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: THSwordSimpleHoldAttack1
m_Speed: 1
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -1799,7 +1799,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c9cdccfb9d6cfef4d9992105a94b5d86, type: 3}
m_Motion: {fileID: 7400000, guid: 5de86916ab3d90144900c389910c3a98, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -2137,7 +2137,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OHDaggerSimpleHoldAttack1
m_Speed: 1
m_Speed: 0.6
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand Down Expand Up @@ -2218,6 +2218,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: New Bool
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -2815,7 +2821,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OHSwordSimpleHoldAttack1
m_Speed: 0.8
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -2827,7 +2833,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 841b2c438c95c83479a59db0d737063d, type: 3}
m_Motion: {fileID: 7400000, guid: fef0d93e821944f458ed5e503c29eac1, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -3302,7 +3308,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: THSwordSpecialAttack1
m_Speed: 1
m_Speed: 0.7
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -3314,7 +3320,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 06e24acb759a2ac4c965d56b0101f8ba, type: 3}
m_Motion: {fileID: 7400000, guid: 4ed328375bdc8d646833a8acfc4a9eae, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -3437,7 +3443,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OHDaggerSimpleAttack1
m_Speed: 1
m_Speed: 0.6
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand Down Expand Up @@ -3588,7 +3594,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: THSpearSpecialAttack1
m_Speed: 1
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand Down Expand Up @@ -3859,7 +3865,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 82d5b5f0c15f39540a67037f33d533b1, type: 3}
m_Motion: {fileID: -203655887218126122, guid: fa5817858965a6c43898ea1ca7cfaba1,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -4159,7 +4166,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: THSwordSpecialHoldAttack1
m_Speed: 1
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -4171,7 +4178,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 018ce46eeecfeae4abb8016f2c6841ca, type: 3}
m_Motion: {fileID: 7400000, guid: b3c60c6cb3dee0b45a4b283acc96fd35, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -4185,7 +4192,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OHMaceSimpleHoldAttack1
m_Speed: 1
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand All @@ -4197,7 +4204,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: fef0d93e821944f458ed5e503c29eac1, type: 3}
m_Motion: {fileID: 7400000, guid: a1cbf1cbd36ee9c4a8ef296ce00d37b7, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down
Loading