-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* added new redeemable christmas pets, Santa Octopus, Santa Raccoon and Magic Raccoon! But also a normal Octopus Pet and various Raccoon pets available from drops. * added new pet type: Cat of various colors, these cats are quite unique walking on their hind legs and will automatically have a santa hat during december months! They even change their emotions now and then. * added a system to mark training targets (except for enemies) as invalid for 20 seconds when a player can't reach the target and immediately change to a new target. * fixed an issue where players would not continue embarking the ferry after returning from dungeon or raid. * fixed a long standing issue with players always rotating back and forth when training a skill that has the player standing still in one spot. * removed bad placements of gathering areas on Atria causing players to stop gathering. * improved the local avoidance slightly to make sure players dont completely stack into eachother.
- Loading branch information
Showing
39 changed files
with
2,248 additions
and
130 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,331 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1102 &-7334871540534725079 | ||
| AnimatorState: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Idle | ||
| m_Speed: 1 | ||
| m_CycleOffset: 0 | ||
| m_Transitions: | ||
| - {fileID: -4192648023471041557} | ||
| - {fileID: 6987488598604373849} | ||
| 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: 7400016, guid: 25ad57180a90d8e4593b445584860267, type: 3} | ||
| m_Tag: | ||
| m_SpeedParameter: | ||
| m_MirrorParameter: | ||
| m_CycleOffsetParameter: | ||
| m_TimeParameter: | ||
| --- !u!1101 &-4192648023471041557 | ||
| AnimatorStateTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: | ||
| - m_ConditionMode: 3 | ||
| m_ConditionEvent: Run | ||
| m_EventTreshold: 0 | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: 5626839303610757567} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 3 | ||
| m_TransitionDuration: 0 | ||
| m_TransitionOffset: 0 | ||
| m_ExitTime: 0.9 | ||
| m_HasExitTime: 0 | ||
| m_HasFixedDuration: 1 | ||
| m_InterruptionSource: 0 | ||
| m_OrderedInterruption: 1 | ||
| m_CanTransitionToSelf: 1 | ||
| --- !u!1107 &-3661600563774453372 | ||
| AnimatorStateMachine: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Base Layer | ||
| m_ChildStates: | ||
| - serializedVersion: 1 | ||
| m_State: {fileID: -7334871540534725079} | ||
| m_Position: {x: 300, y: 80, z: 0} | ||
| - serializedVersion: 1 | ||
| m_State: {fileID: 5626839303610757567} | ||
| m_Position: {x: 340, y: 150, z: 0} | ||
| - serializedVersion: 1 | ||
| m_State: {fileID: -516954471981048536} | ||
| m_Position: {x: 370, y: 210, z: 0} | ||
| m_ChildStateMachines: [] | ||
| m_AnyStateTransitions: [] | ||
| m_EntryTransitions: | ||
| - {fileID: -2601540087856763394} | ||
| m_StateMachineTransitions: {} | ||
| m_StateMachineBehaviours: [] | ||
| m_AnyStatePosition: {x: 50, y: 20, z: 0} | ||
| m_EntryPosition: {x: 50, y: 120, z: 0} | ||
| m_ExitPosition: {x: 800, y: 120, z: 0} | ||
| m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} | ||
| m_DefaultState: {fileID: -7334871540534725079} | ||
| --- !u!1109 &-2601540087856763394 | ||
| AnimatorTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: [] | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: -7334871540534725079} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 1 | ||
| --- !u!1101 &-904221189342670539 | ||
| AnimatorStateTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: | ||
| - m_ConditionMode: 4 | ||
| m_ConditionEvent: Run | ||
| m_EventTreshold: 0.1 | ||
| - m_ConditionMode: 2 | ||
| m_ConditionEvent: Sleeping | ||
| m_EventTreshold: 0 | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: -7334871540534725079} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 3 | ||
| m_TransitionDuration: 0 | ||
| m_TransitionOffset: 0 | ||
| m_ExitTime: 0.9 | ||
| m_HasExitTime: 0 | ||
| m_HasFixedDuration: 1 | ||
| m_InterruptionSource: 0 | ||
| m_OrderedInterruption: 1 | ||
| m_CanTransitionToSelf: 1 | ||
| --- !u!1102 &-516954471981048536 | ||
| AnimatorState: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Sleeping | ||
| m_Speed: 1 | ||
| m_CycleOffset: 0 | ||
| m_Transitions: | ||
| - {fileID: 23833871731112248} | ||
| - {fileID: 823153542985372984} | ||
| 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: b51c1043d37dcca49ab4b15434e67da0, type: 2} | ||
| 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: Octopus | ||
| serializedVersion: 5 | ||
| m_AnimatorParameters: | ||
| - m_Name: Run | ||
| m_Type: 1 | ||
| m_DefaultFloat: 0 | ||
| m_DefaultInt: 0 | ||
| m_DefaultBool: 0 | ||
| m_Controller: {fileID: 0} | ||
| - m_Name: Walk | ||
| m_Type: 1 | ||
| m_DefaultFloat: 0 | ||
| m_DefaultInt: 0 | ||
| m_DefaultBool: 0 | ||
| m_Controller: {fileID: 0} | ||
| - m_Name: Sleeping | ||
| m_Type: 4 | ||
| m_DefaultFloat: 0 | ||
| m_DefaultInt: 0 | ||
| m_DefaultBool: 0 | ||
| m_Controller: {fileID: 0} | ||
| m_AnimatorLayers: | ||
| - serializedVersion: 5 | ||
| m_Name: Base Layer | ||
| m_StateMachine: {fileID: -3661600563774453372} | ||
| 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!1101 &23833871731112248 | ||
| AnimatorStateTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: | ||
| - m_ConditionMode: 3 | ||
| m_ConditionEvent: Run | ||
| m_EventTreshold: 0 | ||
| - m_ConditionMode: 2 | ||
| m_ConditionEvent: Sleeping | ||
| m_EventTreshold: 0 | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: 5626839303610757567} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 3 | ||
| m_TransitionDuration: 0 | ||
| m_TransitionOffset: 0 | ||
| m_ExitTime: 0.9 | ||
| m_HasExitTime: 0 | ||
| m_HasFixedDuration: 1 | ||
| m_InterruptionSource: 0 | ||
| m_OrderedInterruption: 1 | ||
| m_CanTransitionToSelf: 1 | ||
| --- !u!1101 &823153542985372984 | ||
| AnimatorStateTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: | ||
| - m_ConditionMode: 2 | ||
| m_ConditionEvent: Sleeping | ||
| m_EventTreshold: 0 | ||
| - m_ConditionMode: 4 | ||
| m_ConditionEvent: Run | ||
| m_EventTreshold: 0.1 | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: -7334871540534725079} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 3 | ||
| m_TransitionDuration: 0 | ||
| m_TransitionOffset: 0 | ||
| m_ExitTime: 0.9 | ||
| m_HasExitTime: 0 | ||
| m_HasFixedDuration: 1 | ||
| m_InterruptionSource: 0 | ||
| m_OrderedInterruption: 1 | ||
| m_CanTransitionToSelf: 1 | ||
| --- !u!1102 &5626839303610757567 | ||
| AnimatorState: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Run | ||
| m_Speed: 1 | ||
| m_CycleOffset: 0 | ||
| m_Transitions: | ||
| - {fileID: 8807170435992150335} | ||
| - {fileID: -904221189342670539} | ||
| 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: 7400026, guid: 25ad57180a90d8e4593b445584860267, type: 3} | ||
| m_Tag: | ||
| m_SpeedParameter: | ||
| m_MirrorParameter: | ||
| m_CycleOffsetParameter: | ||
| m_TimeParameter: | ||
| --- !u!1101 &6987488598604373849 | ||
| AnimatorStateTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: | ||
| - m_ConditionMode: 1 | ||
| m_ConditionEvent: Sleeping | ||
| m_EventTreshold: 0 | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: -516954471981048536} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 3 | ||
| m_TransitionDuration: 0 | ||
| m_TransitionOffset: 0 | ||
| m_ExitTime: 0.9 | ||
| m_HasExitTime: 0 | ||
| m_HasFixedDuration: 1 | ||
| m_InterruptionSource: 0 | ||
| m_OrderedInterruption: 1 | ||
| m_CanTransitionToSelf: 1 | ||
| --- !u!1101 &8807170435992150335 | ||
| AnimatorStateTransition: | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: | ||
| m_Conditions: | ||
| - m_ConditionMode: 4 | ||
| m_ConditionEvent: Run | ||
| m_EventTreshold: 0.1 | ||
| - m_ConditionMode: 1 | ||
| m_ConditionEvent: Sleeping | ||
| m_EventTreshold: 0 | ||
| m_DstStateMachine: {fileID: 0} | ||
| m_DstState: {fileID: -516954471981048536} | ||
| m_Solo: 0 | ||
| m_Mute: 0 | ||
| m_IsExit: 0 | ||
| serializedVersion: 3 | ||
| m_TransitionDuration: 0 | ||
| m_TransitionOffset: 0 | ||
| m_ExitTime: 0.9 | ||
| m_HasExitTime: 0 | ||
| m_HasFixedDuration: 1 | ||
| m_InterruptionSource: 0 | ||
| m_OrderedInterruption: 1 | ||
| m_CanTransitionToSelf: 1 |
Oops, something went wrong.