From 43d2012da4c798f28fb9a87a944f5c859a81373b Mon Sep 17 00:00:00 2001 From: James B Date: Wed, 22 May 2024 17:54:03 +0200 Subject: [PATCH] FOF prep content & code (#55) * Update to Unity 6 beta and allow exporting animations to custom location * Update rimworld refs. * Add option to change cooldowns. * Add Rider support, hide skill cooldown if skills are disabled. * Update assemblies. Start new animations. * Add source animations for FOF. * Optimizations in anim renderer. * Allow animator interpolation. * Update idle controller comp for FOF. * Active checks move outside of main method. * Expose more comp methods. * Expose attack animation methods. * Add fists, allow pointing at idle override. * Fix for PreDraw not being called. * Add idle, expose flavour anims method. * Basic south anims. * Update rimworld refs. * More FOF content. * Add Neo Samurai support. * Add option to revert to old hand graphics. * Add support for revia race retexture. * Change new option label. --- .../.idea/.idea.AnimationMod/.idea/.gitignore | 13 + .../1.5/.idea/.idea.AnimationMod/.idea/.name | 1 + .../.idea/.idea.AnimationMod/.idea/aws.xml | 20 + .../.idea.AnimationMod/.idea/encodings.xml | 4 + .../.idea.AnimationMod/.idea/indexLayout.xml | 8 + .../.idea/.idea.AnimationMod/.idea/misc.xml | 5 + .../.idea/.idea.AnimationMod/.idea/vcs.xml | 6 + .../AMRetextureSupport.csproj | 2 +- .../AlienRacesPatch/AlienRacesPatch.csproj | 2 +- .../1.5/AnimationMod/AMSettings/Settings.cs | 30 +- Source/1.5/AnimationMod/AnimDef.cs | 1 + Source/1.5/AnimationMod/AnimRenderer.cs | 119 +- Source/1.5/AnimationMod/AnimationMod.csproj | 2 +- Source/1.5/AnimationMod/AudioUtility.cs | 88 +- .../AutoDuel/AutoFriendlyDuelMapComp.cs | 3 +- Source/1.5/AnimationMod/Core.cs | 6 +- Source/1.5/AnimationMod/Data/AnimData.cs | 24 + .../Events/Workers/ClashAudioWorker.cs | 14 +- Source/1.5/AnimationMod/Extensions.cs | 2 + Source/1.5/AnimationMod/GameComp.cs | 2 +- Source/1.5/AnimationMod/Hands/HandUtility.cs | 24 + .../AnimationMod/Idle/IdleControllerComp.cs | 199 +- Source/1.5/AnimationMod/Idle/IdleType.cs | 3 +- .../AnimationMod/Outcome/OutcomeUtility.cs | 4 +- ...h_PawnRenderer_ParallelPreRenderPawnAt.cs} | 11 +- .../Patch_PawnRenderer_RenderPawnAt.cs | 8 + Source/1.5/AnimationMod/Reqs/MustBeFists.cs | 6 + Source/1.5/AnimationMod/Reqs/ReqInput.cs | 2 + .../UniqueSkills/UniqueSkillInstance.cs | 3 +- Source/1.5/CAI5000Patch/CAI5000Patch.csproj | 2 +- .../CombatExtendedPatch.csproj | 2 +- .../FacialAnimationPatch.csproj | 2 +- .../LightsaberPatch/LightsaberPatch.csproj | 2 +- Source/1.5/ModRequestAPI/ModRequestAPI.csproj | 2 +- .../PerformanceOptimizerPatch.csproj | 2 +- .../1.5/TacticowlPatch/TacticowlPatch.csproj | 2 +- .../.idea/.idea.Animations/.idea/.gitignore | 13 + .../.idea.Animations/.idea/encodings.xml | 4 + .../.idea.Animations/.idea/indexLayout.xml | 8 + .../.idea/.idea.Animations/.idea/misc.xml | 5 + .../.idea/.idea.Animations/.idea/vcs.xml | 6 + Source/Animations/Assets/AnimData.cs | 1 - .../Animation/FOF_CrossHighHorizontal.anim | 481 +++ .../FOF_CrossHighHorizontal.anim.meta | 8 + .../Assets/Animation/FOF_CrossHorizontal.anim | 445 +++ .../Animation/FOF_CrossHorizontal.anim.meta | 8 + .../Animation/FOF_FightingHorizontal.anim | 733 +++++ .../FOF_FightingHorizontal.anim.meta | 8 + .../Assets/Animation/FOF_FightingSouth.anim | 802 +++++ .../Animation/FOF_FightingSouth.anim.meta | 8 + .../Animations/Assets/Animation/FOF_Idle.anim | 442 +++ .../Assets/Animation/FOF_Idle.anim.meta | 8 + .../Assets/Animation/FOF_JabHorizontal.anim | 409 +++ .../Animation/FOF_JabHorizontal.anim.meta | 8 + .../Assets/Animation/FOF_JabSouth.anim | 640 ++++ .../Assets/Animation/FOF_JabSouth.anim.meta | 8 + .../Assets/Animation/FOF_MoveHorizontal.anim | 517 ++++ .../Animation/FOF_MoveHorizontal.anim.meta | 8 + .../Assets/Animation/FOF_MoveVertical.anim | 622 ++++ .../Animation/FOF_MoveVertical.anim.meta | 8 + .../Assets/Animation/FOF_Uppercut.anim | 544 ++++ .../Assets/Animation/FOF_Uppercut.anim.meta | 8 + .../_FistsOfFuryControllerSolo.controller | 333 +++ ..._FistsOfFuryControllerSolo.controller.meta | 8 + Source/Animations/Assets/EditorRenderer.cs | 32 +- .../Animations/Assets/Resources/SpriteMat.mat | 1 + .../Assets/Scenes/SampleScene.unity | 2628 +++++++++++++---- .../Animations/Assets/Scripts/ExportHelper.cs | 31 + .../Assets/Scripts/ExportHelper.cs.meta | 11 + Source/Animations/Packages/manifest.json | 11 +- Source/Animations/Packages/packages-lock.json | 43 +- .../ProjectSettings/MultiplayerManager.asset | 7 + .../ProjectSettings/ProjectSettings.asset | 193 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../SceneTemplateSettings.json | 97 +- .../UserSettings/Layouts/default-2022.dwlt | 54 +- .../UserSettings/Layouts/default-6000.dwlt | 1499 ++++++++++ .../Gnm_NeoKanasaibo_gunmar.neosamurai.json | 19 + .../Gnm_NeoKunai_gunmar.neosamurai.json | 19 + .../Gnm_NeoNaginata_gunmar.neosamurai.json | 19 + .../Gnm_NeoNodachi_gunmar.neosamurai.json | 19 + .../Gnm_NeoUchigatana_gunmar.neosamurai.json | 18 + .../Gnm_Nodachi_gunmar.neosamurai.json | 13 + .../Gnm_Uchigatana_gunmar.neosamurai.json | 12 + ...abbitKnife_Pale_amaoto.rabbitprotocol.json | 11 + ...sedSerratedDagger_sgg1.raviaretexture.json | 11 + ...sedSerratedScythe_sgg1.raviaretexture.json | 13 + ...ssedSerratedSword_sgg1.raviaretexture.json | 11 + .../ReviaChainSword_sgg1.raviaretexture.json | 12 + ...viaSerratedDagger_sgg1.raviaretexture.json | 12 + ...viaSerratedScythe_sgg1.raviaretexture.json | 14 + ...eviaSerratedSword_sgg1.raviaretexture.json | 12 + .../ReviaWarPick_sgg1.raviaretexture.json | 14 + WeaponTweakData/amaoto.rabbitprotocol.txt | 1 + WeaponTweakData/gunmar.neosamurai.txt | 1 + WeaponTweakData/sgg1.raviaretexture.txt | 1 + 96 files changed, 10645 insertions(+), 917 deletions(-) create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/.gitignore create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/.name create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/aws.xml create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/encodings.xml create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/indexLayout.xml create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/misc.xml create mode 100644 Source/1.5/.idea/.idea.AnimationMod/.idea/vcs.xml rename Source/1.5/AnimationMod/Patches/{Patch_Corpse_DrawAt.cs => Patch_PawnRenderer_ParallelPreRenderPawnAt.cs} (91%) create mode 100644 Source/1.5/AnimationMod/Reqs/MustBeFists.cs create mode 100644 Source/Animations/.idea/.idea.Animations/.idea/.gitignore create mode 100644 Source/Animations/.idea/.idea.Animations/.idea/encodings.xml create mode 100644 Source/Animations/.idea/.idea.Animations/.idea/indexLayout.xml create mode 100644 Source/Animations/.idea/.idea.Animations/.idea/misc.xml create mode 100644 Source/Animations/.idea/.idea.Animations/.idea/vcs.xml create mode 100644 Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim create mode 100644 Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim create mode 100644 Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim create mode 100644 Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_FightingSouth.anim create mode 100644 Source/Animations/Assets/Animation/FOF_FightingSouth.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_Idle.anim create mode 100644 Source/Animations/Assets/Animation/FOF_Idle.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_JabHorizontal.anim create mode 100644 Source/Animations/Assets/Animation/FOF_JabHorizontal.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_JabSouth.anim create mode 100644 Source/Animations/Assets/Animation/FOF_JabSouth.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim create mode 100644 Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_MoveVertical.anim create mode 100644 Source/Animations/Assets/Animation/FOF_MoveVertical.anim.meta create mode 100644 Source/Animations/Assets/Animation/FOF_Uppercut.anim create mode 100644 Source/Animations/Assets/Animation/FOF_Uppercut.anim.meta create mode 100644 Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller create mode 100644 Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller.meta create mode 100644 Source/Animations/Assets/Scripts/ExportHelper.cs create mode 100644 Source/Animations/Assets/Scripts/ExportHelper.cs.meta create mode 100644 Source/Animations/ProjectSettings/MultiplayerManager.asset create mode 100644 Source/Animations/UserSettings/Layouts/default-6000.dwlt create mode 100644 WeaponTweakData/Gnm_NeoKanasaibo_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Gnm_NeoKunai_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Gnm_NeoNaginata_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Gnm_NeoNodachi_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Gnm_NeoUchigatana_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Gnm_Nodachi_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Gnm_Uchigatana_gunmar.neosamurai.json create mode 100644 WeaponTweakData/Melee_RabbitKnife_Pale_amaoto.rabbitprotocol.json create mode 100644 WeaponTweakData/ReviaBlessedSerratedDagger_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaBlessedSerratedScythe_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaBlessedSerratedSword_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaChainSword_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaSerratedDagger_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaSerratedScythe_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaSerratedSword_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/ReviaWarPick_sgg1.raviaretexture.json create mode 100644 WeaponTweakData/amaoto.rabbitprotocol.txt create mode 100644 WeaponTweakData/gunmar.neosamurai.txt create mode 100644 WeaponTweakData/sgg1.raviaretexture.txt diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/.gitignore b/Source/1.5/.idea/.idea.AnimationMod/.idea/.gitignore new file mode 100644 index 00000000..9e4eb23e --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/projectSettingsUpdater.xml +/contentModel.xml +/.idea.AnimationMod.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/.name b/Source/1.5/.idea/.idea.AnimationMod/.idea/.name new file mode 100644 index 00000000..1ab04771 --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/.name @@ -0,0 +1 @@ +AnimationMod \ No newline at end of file diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/aws.xml b/Source/1.5/.idea/.idea.AnimationMod/.idea/aws.xml new file mode 100644 index 00000000..2e16898d --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/aws.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/encodings.xml b/Source/1.5/.idea/.idea.AnimationMod/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/indexLayout.xml b/Source/1.5/.idea/.idea.AnimationMod/.idea/indexLayout.xml new file mode 100644 index 00000000..7b08163c --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/misc.xml b/Source/1.5/.idea/.idea.AnimationMod/.idea/misc.xml new file mode 100644 index 00000000..acebe251 --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Source/1.5/.idea/.idea.AnimationMod/.idea/vcs.xml b/Source/1.5/.idea/.idea.AnimationMod/.idea/vcs.xml new file mode 100644 index 00000000..b2bdec2d --- /dev/null +++ b/Source/1.5/.idea/.idea.AnimationMod/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Source/1.5/AMRetextureSupport/AMRetextureSupport.csproj b/Source/1.5/AMRetextureSupport/AMRetextureSupport.csproj index 0ebb11f9..ebe9405e 100644 --- a/Source/1.5/AMRetextureSupport/AMRetextureSupport.csproj +++ b/Source/1.5/AMRetextureSupport/AMRetextureSupport.csproj @@ -18,7 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Source/1.5/AlienRacesPatch/AlienRacesPatch.csproj b/Source/1.5/AlienRacesPatch/AlienRacesPatch.csproj index 3eb48fa1..91bd9789 100644 --- a/Source/1.5/AlienRacesPatch/AlienRacesPatch.csproj +++ b/Source/1.5/AlienRacesPatch/AlienRacesPatch.csproj @@ -12,7 +12,7 @@ - + diff --git a/Source/1.5/AnimationMod/AMSettings/Settings.cs b/Source/1.5/AnimationMod/AMSettings/Settings.cs index 3bc903b6..90bda131 100644 --- a/Source/1.5/AnimationMod/AMSettings/Settings.cs +++ b/Source/1.5/AnimationMod/AMSettings/Settings.cs @@ -2,12 +2,14 @@ using System; using System.Collections.Generic; using System.Linq; +using JetBrains.Annotations; using UnityEngine; using Verse; using LudeonTK; namespace AM.AMSettings; +[UsedImplicitly(ImplicitUseKindFlags.Assign, ImplicitUseTargetFlags.Members)] public class Settings : SimpleSettingsBase { [TweakValue("Melee Animation")] @@ -36,6 +38,13 @@ public class Settings : SimpleSettingsBase [WebContent("Skills", false)] public bool EnableUniqueSkills = true; + [Label("Unique Skill Cooldown Multiplier")] + [Description("A multiplier on the cooldown of all unique skills.\nHigher percentage means longer cooldown.")] + [Percentage] + [Range(0.01f, 10f)] + [VisibleIf(nameof(EnableUniqueSkills))] + public float SkillCooldownFactor = 1f; + [Label("Animated Pawns Considered Invisible")] [Description("When in an animation, such as an execution, pawns are considered invisible by all other pawns and turrets: " + "they will not be actively targeted or shot at. This makes executions less risky.\n" + @@ -86,7 +95,7 @@ public class Settings : SimpleSettingsBase public float GrappleAttemptMTBSecondsEnemy = 40; [Label("Minimum Melee Skill")] - [Description("The minumum melee skill required to use a lasso.\nAffects all pawns.")] + [Description("The minimum melee skill required to use a lasso.\nAffects all pawns.")] [Range(0, 20)] public int MinMeleeSkillToLasso = 4; @@ -98,7 +107,7 @@ public class Settings : SimpleSettingsBase [Label("Max Pawn Mass")] [Description("The maximum mass that a pawn can have in order for it to be lassoed. The mass is measured in kilograms. You can check the mass of pawns in their Stat sheet.\nSet to zero to disable the mass limit.")] [Min(0)] - public float MaxLassoMass = 0f; + public float MaxLassoMass; [Label("Max Pawn Size")] [Description("The maximum 'body size' that a pawn can have in order for it to be lassoed.\nFor reference, here are some example body sizes:\n" + @@ -179,7 +188,7 @@ public class Settings : SimpleSettingsBase [Description("Allows animals to be executed.\nYou are a bad person if you enable this.")] [VisibleIf(nameof(EnableExecutions))] - public bool AnimalsCanBeExecuted = false; + public bool AnimalsCanBeExecuted; [Range(0, 10)] [Percentage] @@ -252,6 +261,12 @@ public class Settings : SimpleSettingsBase [WebContent("HandsEnabled", false)] public bool ShowHands = true; + [Label("Dynamic Hand Color & Appearance")] + [VisibleIf(nameof(ShowHands))] + [Description("When enabled, the color and appearance of hands will be based on clothes covering hands, then bionic hand color, then skin color, in that order and as appropriate.\n" + + "If disabled, the color of hands will always be based on skin color.")] + public bool AdvancedHandVisuals = true; + [Label("Damage Effect")] [Description("Enable or disable the damage affect in animations.\n" + "The damage effect is normally a small, temporary puff of blood.")] @@ -324,7 +339,7 @@ public class Settings : SimpleSettingsBase "If set to 0, the thread count is automatically determined based on your CPU, and if set to 1 then multi-threaded processing is disabled.\n" + "Set to 1 if you experience error spam caused by a mod conflict, although it will decrease performance considerably.")] [Range(0, 64)] - public int MaxProcessingThreads = 0; + public int MaxProcessingThreads; [Description("When enabled, multiple CPU threads are used to calculate complex matrix transformation needed for animations.\n" + "The number of threads is given by the Max Processing Threads setting.")] @@ -347,7 +362,7 @@ public class Settings : SimpleSettingsBase [Description("Positive values act as a lethality bonus for friendly pawns (including slaves) in execution & duel outcomes, meaning that they will be lethal more often.")] [Percentage] [Range(-1, 1)] - public float FriendlyPawnLethalityBonus = 0f; + public float FriendlyPawnLethalityBonus; [Label("Friendly Pawn Duel Ability Bonus")] [Description("Positive values act as a duel ability bonus for friendly pawns (including slaves), meaning that they will win duels more often.")] @@ -364,6 +379,11 @@ public class Settings : SimpleSettingsBase [Description("Prevents you from accidentally executing a friendly pawn by requiring you to hold the [Shift] key when selecting a friendly pawn for execution.")] public bool WarnOfFriendlyExecution = true; + [Label("Duel Volume")] + [Description("Duels make noise when swords clash. This slider controls the volume of those sounds.")] + [Percentage] + public float DuelVolumePct = 1f; + [Label("Send Anonymous Patch Statistics")] [Description("When a mod is missing a patch (that allows the melee weapons to do animations), the ID of said mod is anonymously logged to " + "let this mod's author know that a patch is needed. The only information logged is: mod ID, mod name, weapon count.\n" + diff --git a/Source/1.5/AnimationMod/AnimDef.cs b/Source/1.5/AnimationMod/AnimDef.cs index c7e2d127..a636be95 100644 --- a/Source/1.5/AnimationMod/AnimDef.cs +++ b/Source/1.5/AnimationMod/AnimDef.cs @@ -168,6 +168,7 @@ public AnimData DataNonLethal public bool canEditProbability = true; public IdleType idleType; public bool pointAtTarget; + public float pointAtTargetAngleOffset; public int returnToIdleStart, returnToIdleEnd; public int idleFrame; public ExecutionOutcome? fixedOutcome; diff --git a/Source/1.5/AnimationMod/AnimRenderer.cs b/Source/1.5/AnimationMod/AnimRenderer.cs index 5b2c36a1..44650271 100644 --- a/Source/1.5/AnimationMod/AnimRenderer.cs +++ b/Source/1.5/AnimationMod/AnimRenderer.cs @@ -1,4 +1,7 @@ -using AM.Events; +using System; +using System.Collections.Generic; +using System.Linq; +using AM.Events; using AM.Hands; using AM.Idle; using AM.Patches; @@ -8,8 +11,6 @@ using AM.Tweaks; using AM.UI; using JetBrains.Annotations; -using System; -using System.Collections.Generic; using UnityEngine; using Verse; using Verse.AI; @@ -26,7 +27,7 @@ public class AnimRenderer : IExposable { #region Static stuff - public static readonly char[] Alphabet = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' }; + public static readonly char[] Alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']; public static readonly List PostLoadPendingAnimators = new List(); public static Action PrePawnSpecialRender; public static Action PostPawnSpecialRender; @@ -35,10 +36,17 @@ public class AnimRenderer : IExposable public static IReadOnlyCollection CapturedPawns => pawnToRenderer.Keys; public static int TotalCapturedPawnCount => pawnToRenderer.Count; + private static readonly int mainTexShaderProp = Shader.PropertyToID("_MainTex"); + private static readonly int colorOneShaderProp = Shader.PropertyToID("_Color"); + private static readonly int colorTwoShaderProp = Shader.PropertyToID("_ColorTwo"); + private static readonly int cutoffAngleShaderProp = Shader.PropertyToID("CutoffAngle"); + private static readonly int polarityShaderProp = Shader.PropertyToID("Polarity"); + private static readonly int distanceShaderProp = Shader.PropertyToID("Distance"); private static readonly MaterialPropertyBlock shadowMpb = new MaterialPropertyBlock(); private static readonly List activeRenderers = new List(); private static readonly Dictionary pawnToRenderer = new Dictionary(); private static readonly Dictionary textureCache = new Dictionary(); + private static AnimPartSnapshot dummySnapshot; /// /// Tries to get the that a pawn currently belongs to. @@ -359,15 +367,17 @@ public int PawnCount private readonly Dictionary pawnToParts = new Dictionary(); private HashSet pawnsValidEvenIfDespawned = new HashSet(); private AnimPartSnapshot[] snapshots; + private AnimPartSnapshot[] interpolateFromSnapshots; private AnimPartOverrideData[] overrides; private PartWithSweep[] sweeps; private MaterialPropertyBlock pb; + private Pawn[] pawnsForPostLoad; private float time = -1; - private Pawn[] pawnsForPostLoad; private bool hasStarted; private bool lastMirrorX, lastMirrorZ; private bool hasDoneOnEnd; private bool delayedDestroy; + private float interpolationLength; [UsedImplicitly] public AnimRenderer() @@ -518,7 +528,15 @@ public void FlagAsValidIfDespawned(Pawn pawn) /// /// Gets the current state (snapshot) for a particular animation part. /// - public AnimPartSnapshot GetSnapshot(AnimPartData part) => part == null ? default : snapshots[part.Index]; + [System.Diagnostics.Contracts.Pure] + public ref AnimPartSnapshot GetSnapshot(AnimPartData part) + { + if (part == null) + { + return ref dummySnapshot; + } + return ref snapshots[part.Index]; + } /// /// Gets the override data based on the part index. @@ -802,7 +820,7 @@ public void Draw(float? atTime, float dt, Action eventO pb.Clear(); // Basic texture and color, always used. Color might be replaced, see below. - pb.SetColor("_Color", color); + pb.SetColor(colorOneShaderProp, color); if (ov.Material != null) { @@ -812,15 +830,15 @@ public void Draw(float? atTime, float dt, Action eventO if (doesUseMask && (mask = ov.Material.GetTexture(ShaderPropertyIDs.MaskTex)) != null) { // Tint is applied to the mask. - pb.SetColor("_Color", color); // Color comes from animation. - pb.SetColor("_ColorTwo", ov.Weapon.DrawColor); // Mask tint + pb.SetColor(colorOneShaderProp, color); // Color comes from animation. + pb.SetColor(colorTwoShaderProp, ov.Weapon.DrawColor); // Mask tint pb.SetTexture(ShaderPropertyIDs.MaskTex, mask); } else { // Tint is applied straight to main color. - pb.SetColor("_Color", color * ov.Weapon.DrawColor); + pb.SetColor(colorOneShaderProp, color * ov.Weapon.DrawColor); } } @@ -829,7 +847,7 @@ public void Draw(float? atTime, float dt, Action eventO ConfigureSplitDraw(snap, ref matrix, pb, ov, i, ref passes, ref tex); } - pb.SetTexture("_MainTex", tex); + pb.SetTexture(mainTexShaderProp, tex); } var finalMpb = useMPB ? pb : null; @@ -854,7 +872,7 @@ private void ConfigureSplitDraw(in AnimPartSnapshot part, ref Matrix4x4 matrix, bool fy = MirrorVertical ? !preFy : preFy; float textureRot = ov.LocalRotation * Mathf.Deg2Rad; - pb.SetFloat("CutoffAngle", textureRot * (fy ? -1f : 1f)); + pb.SetFloat(cutoffAngleShaderProp, textureRot * (fy ? -1f : 1f)); var mode = part.SplitDrawMode; if (mode == AnimData.SplitDrawMode.BeforeAndAfter) { @@ -864,7 +882,7 @@ private void ConfigureSplitDraw(in AnimPartSnapshot part, ref Matrix4x4 matrix, else matrix *= Matrix4x4.Translate(new Vector3(0, -0.9f, 0)); // This is the actual offset depth here. } - pb.SetFloat("Polarity", mode == AnimData.SplitDrawMode.Before ? 1f : -1f); + pb.SetFloat(polarityShaderProp, mode == AnimData.SplitDrawMode.Before ? 1f : -1f); // The total length of the weapon sprite, in world units (1 unit = 1 cell). float length = matrix.lossyScale.x * Remap(Mathf.Abs(Mathf.Sin(textureRot * 2f)), 0, 1f, 1f, 1.41421356237f); // sqrt(2) @@ -883,7 +901,7 @@ private void ConfigureSplitDraw(in AnimPartSnapshot part, ref Matrix4x4 matrix, if (!fx) lerp = 1 - lerp; - pb.SetFloat("Distance", distanceScale * (-1f + lerp * 2f)); + pb.SetFloat(distanceShaderProp, distanceScale * (-1f + lerp * 2f)); // Experimental, aims to fix issue where split drawing does not use the weapon ideology style. if (ov.Material?.mainTexture is Texture2D tex) @@ -1022,8 +1040,8 @@ private static bool IsPawnBeheaded(Pawn pawn, in AnimPartSnapshot bodySS, in Ani private void DrawSimpleShadow(Vector3 pos, Vector3 size, Color color) { var trs = Matrix4x4.TRS(pos, Quaternion.identity, size); - shadowMpb.SetColor("_Color", color); - shadowMpb.SetTexture("_MainTex", Content.Shadow); + shadowMpb.SetColor(colorOneShaderProp, color); + shadowMpb.SetTexture(mainTexShaderProp, Content.Shadow); Graphics.DrawMesh(MeshPool.plane10, trs, DefaultTransparent, 0, Camera, 0, shadowMpb); } @@ -1079,23 +1097,61 @@ public void Seek(float? atTime, float dt, Action eventsOutput, bool d } } - private void SeekInt(float time, Action eventsOutput, bool mirrorX = false, bool mirrorY = false) + public void SetupLerpFrom(AnimRenderer oldAnimator, float interpolationLength) { - time = Mathf.Clamp(time, 0f, Duration); + interpolateFromSnapshots = new AnimPartSnapshot[Data.Parts.Count]; + + for (int i = 0; i < interpolateFromSnapshots.Length; i++) + { + var selfPart = Data.Parts[i]; + + var found = oldAnimator.Data.Parts.FirstOrDefault(p => p.Path == selfPart.Path); + if (found == null) + continue; + + interpolateFromSnapshots[i] = oldAnimator.GetSnapshot(found); + } + + this.interpolationLength = interpolationLength; + } + + private float GetLerpTime() + { + if (interpolateFromSnapshots == null || interpolationLength == 0) + return 0; + + return time / interpolationLength; + } + private void SeekInt(float newTime, Action eventsOutput, bool mirrorX = false, bool mirrorY = false) + { + newTime = Mathf.Clamp(newTime, 0f, Duration); + + float lerpTime = GetLerpTime(); + // Pass 1: Evaluate curves, make local matrices. for (int i = 0; i < Data.Parts.Count; i++) { - snapshots[i] = new AnimPartSnapshot(Data.Parts[i], this, time); + snapshots[i] = new AnimPartSnapshot(Data.Parts[i], this, newTime); + + // Do interpolation if necessary. + if (interpolateFromSnapshots == null) + continue; + + ref var toInterpolateFrom = ref interpolateFromSnapshots[i]; + if (!toInterpolateFrom.Valid) + continue; + + snapshots[i] = AnimPartSnapshot.Lerp(toInterpolateFrom, snapshots[i], lerpTime); } // Pass 2: Resolve world matrices using inheritance tree. for (int i = 0; i < Data.Parts.Count; i++) snapshots[i].UpdateWorldMatrix(mirrorX, mirrorY); - float start = Mathf.Min(this.time, time); - float end = Mathf.Max(this.time, time); - this.time = time; + float start = Mathf.Min(this.time, newTime); + float end = Mathf.Max(this.time, newTime); + this.time = newTime; if (eventsOutput == null) return; @@ -1226,17 +1282,19 @@ public void OnEnd() private void SpawnDroppedHeads() { - if (ExecutionOutcome == ExecutionOutcome.Kill) + if (ExecutionOutcome != ExecutionOutcome.Kill) { - var comp = Map.GetAnimManager(); + return; + } + + var comp = Map.GetAnimManager(); - foreach (var index in Def.spawnDroppedHeadsForPawnIndices) - { - if (index < 0 || index >= Pawns.Count) - continue; + foreach (var index in Def.spawnDroppedHeadsForPawnIndices) + { + if (index < 0 || index >= Pawns.Count) + continue; - comp.AddDroppedHeadFor(Pawns[index], this); - } + comp.AddDroppedHeadFor(Pawns[index], this); } } @@ -1446,7 +1504,6 @@ public void ConfigureHandsForPawn(Pawn pawn, int index) if (handCount == 1) healthDrawMain = false; - } } diff --git a/Source/1.5/AnimationMod/AnimationMod.csproj b/Source/1.5/AnimationMod/AnimationMod.csproj index e55d4564..e7e93628 100644 --- a/Source/1.5/AnimationMod/AnimationMod.csproj +++ b/Source/1.5/AnimationMod/AnimationMod.csproj @@ -32,7 +32,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Source/1.5/AnimationMod/AudioUtility.cs b/Source/1.5/AnimationMod/AudioUtility.cs index ad81d390..e8165967 100644 --- a/Source/1.5/AnimationMod/AudioUtility.cs +++ b/Source/1.5/AnimationMod/AudioUtility.cs @@ -1,4 +1,5 @@ -using RimWorld; +using System; +using RimWorld; using Verse; namespace AM; @@ -16,29 +17,24 @@ public static SoundDef GetPawnHitSound(Thing attackerWeapon) return attackerWeapon.def.meleeHitSound; } - // TODO attempt to extract tool info from thingDef. - //if (this.tool != null && !this.tool.soundMeleeHit.NullOrUndefined()) - //{ - // return this.tool.soundMeleeHit; - //} - //attackerWeaponDef.tools[0].soundMeleeHit - VerbProperties verbProps = attackerWeapon?.def.verbs?.FirstOrFallback(); - if (attackerWeapon != null && attackerWeapon.Stuff != null) + if (attackerWeapon is not { Stuff: not null }) { - if (verbProps != null && verbProps.meleeDamageDef.armorCategory == DamageArmorCategoryDefOf.Sharp) - { - if (!attackerWeapon.Stuff.stuffProps.soundMeleeHitSharp.NullOrUndefined()) - { - return attackerWeapon.Stuff.stuffProps.soundMeleeHitSharp; - } - } - else if (!attackerWeapon.Stuff.stuffProps.soundMeleeHitBlunt.NullOrUndefined()) + return SoundDefOf.Pawn_Melee_Punch_HitPawn; + } + + if (verbProps != null && verbProps.meleeDamageDef.armorCategory == DamageArmorCategoryDefOf.Sharp) + { + if (!attackerWeapon.Stuff.stuffProps.soundMeleeHitSharp.NullOrUndefined()) { - return attackerWeapon.Stuff.stuffProps.soundMeleeHitBlunt; + return attackerWeapon.Stuff.stuffProps.soundMeleeHitSharp; } } + else if (!attackerWeapon.Stuff.stuffProps.soundMeleeHitBlunt.NullOrUndefined()) + { + return attackerWeapon.Stuff.stuffProps.soundMeleeHitBlunt; + } return SoundDefOf.Pawn_Melee_Punch_HitPawn; } @@ -65,14 +61,70 @@ public static SoundDef GetWeaponClashSound(Thing weapon1, Thing weapon2) private static WeaponMaterial GetMaterial(Thing weapon) { if (weapon?.Stuff == null) + { + if (IsMadeFromExclusive(weapon.def, thing => thing.IsStuff && IsWoody(thing))) + { + return WeaponMaterial.Wood; + } + + if (IsMadeFromExclusive(weapon.def, thing => thing.IsStuff && IsStony(thing))) + { + return WeaponMaterial.Stone; + } + return WeaponMaterial.Metal; + } if (IsWoody(weapon.Stuff)) + { return WeaponMaterial.Wood; + } return IsStony(weapon.Stuff) ? WeaponMaterial.Stone : WeaponMaterial.Metal; } + private static bool IsMadeFromExclusive(ThingDef thing, Predicate isValidMaterial) + { + if (thing.AllRecipes == null || thing.AllRecipes.Count == 0) + { + return false; + } + + foreach (var rec in thing.AllRecipes) + { + if (!IsValidRecipe(rec, isValidMaterial)) + { + return false; + } + } + + return true; + } + + private static bool IsValidRecipe(RecipeDef rec, Predicate isValidMaterial) + { + if (rec.ingredients.Count != 1) + { + return false; + } + + var ing = rec.ingredients[0]; + if (ing.IsFixedIngredient || ing.filter == null) + { + return isValidMaterial(ing.FixedIngredient); + } + + foreach (var item in ing.filter.AllowedThingDefs) + { + if (!isValidMaterial(item)) + { + return false; + } + } + + return true; + } + private static bool IsStony(ThingDef material) { return material.stuffProps.categories.Contains(StuffCategoryDefOf.Stony); diff --git a/Source/1.5/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs b/Source/1.5/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs index 641ef47e..0fa7a14b 100644 --- a/Source/1.5/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs +++ b/Source/1.5/AnimationMod/AutoDuel/AutoFriendlyDuelMapComp.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using Verse; using LudeonTK; +using Verse.AI.Group; namespace AM.AutoDuel; @@ -162,7 +163,7 @@ public static bool CanPawnDuel(Pawn pawn) bool canInterruptJob = pawn.CurJobDef?.playerInterruptible ?? true; bool isJobPlayerForced = pawn.CurJob?.playerForced ?? false; - + if (!canInterruptJob || isJobPlayerForced) return false; diff --git a/Source/1.5/AnimationMod/Core.cs b/Source/1.5/AnimationMod/Core.cs index e5750646..490b925a 100644 --- a/Source/1.5/AnimationMod/Core.cs +++ b/Source/1.5/AnimationMod/Core.cs @@ -29,6 +29,7 @@ public class Core : Mod public static Settings Settings; public static Harmony Harmony; public static bool IsSimpleSidearmsActive; + public static bool IsFistsOfFuryActive; public static bool IsTacticowlActive; private readonly Queue<(string title, Action action)> lateLoadActions = new Queue<(string title, Action action)>(); @@ -51,9 +52,10 @@ public static void Error(string msg, Exception e = null) Verse.Log.Error(e.ToString()); } - private static void CheckSimpleSidearms() + private static void CheckForActiveMods() { IsSimpleSidearmsActive = ModLister.GetActiveModWithIdentifier("PeteTimesSix.SimpleSidearms") != null; + IsFistsOfFuryActive = ModLister.GetActiveModWithIdentifier("co.uk.epicguru.fistsoffury") != null; IsTacticowlActive = ModLister.GetActiveModWithIdentifier("owlchemist.tacticowl") != null; } @@ -207,7 +209,7 @@ public Core(ModContentPack content) : base(content) AnimRenderer.DefaultTransparent ??= new Material(ShaderTypeDefOf.Transparent.Shader); }); - AddLateLoadAction(false, "Checking for Simple Sidearms install...", CheckSimpleSidearms); + AddLateLoadAction(false, "Checking for Simple Sidearms install...", CheckForActiveMods); AddLateLoadAction(false, "Checking for patch conflicts...", () => LogPotentialConflicts(Harmony)); AddLateLoadAction(false, "Finding all lassos...", AM.Content.FindAllLassos); diff --git a/Source/1.5/AnimationMod/Data/AnimData.cs b/Source/1.5/AnimationMod/Data/AnimData.cs index d68feeec..72bf96b8 100644 --- a/Source/1.5/AnimationMod/Data/AnimData.cs +++ b/Source/1.5/AnimationMod/Data/AnimData.cs @@ -352,6 +352,30 @@ public AnimPartSnapshot GetSnapshot(AnimRenderer renderer) public struct AnimPartSnapshot { + public static AnimPartSnapshot Lerp(in AnimPartSnapshot a, in AnimPartSnapshot b, float t) + { + AnimPartSnapshot result = new AnimPartSnapshot + { + Time = Mathf.LerpUnclamped(a.Time, b.Time, t), + FlipX = t > 0.5f ? b.FlipX : a.FlipX, + FlipY = t > 0.5f ? b.FlipY : a.FlipY, + Active = t > 0.5f ? b.Active : a.Active, + Color = Color.LerpUnclamped(a.Color, b.Color, t), + LocalPosition = Vector3.LerpUnclamped(a.LocalPosition, b.LocalPosition, t), + LocalRotation = Quaternion.SlerpUnclamped(Quaternion.Euler(a.LocalRotation), Quaternion.Euler(b.LocalRotation), t).eulerAngles, + LocalScale = Vector3.LerpUnclamped(a.LocalScale, b.LocalScale, t), + Direction = t > 0.5f ? b.Direction : a.Direction, + DataA = Mathf.LerpUnclamped(a.DataA, b.DataA, t), + DataB = Mathf.LerpUnclamped(a.DataB, b.DataB, t), + DataC = Mathf.LerpUnclamped(a.DataC, b.DataC, t), + FrameIndex = (int)Mathf.LerpUnclamped(a.FrameIndex, b.FrameIndex, t), + SplitDrawMode = t > 0.5f ? b.SplitDrawMode : a.SplitDrawMode + }; + + result.UpdateLocalMatrix(); + return result; + } + public bool Valid => Part != null; public string TexturePath => Part?.TexturePath == null ? null : (Part.TexturePath + (FrameIndex > 0 ? FrameIndex.ToString() : null)); public string PartName => Part?.Name; diff --git a/Source/1.5/AnimationMod/Events/Workers/ClashAudioWorker.cs b/Source/1.5/AnimationMod/Events/Workers/ClashAudioWorker.cs index dbd424e6..f8202378 100644 --- a/Source/1.5/AnimationMod/Events/Workers/ClashAudioWorker.cs +++ b/Source/1.5/AnimationMod/Events/Workers/ClashAudioWorker.cs @@ -1,5 +1,4 @@ -using AM; -using UnityEngine; +using UnityEngine; using Verse; using Verse.Sound; @@ -11,6 +10,11 @@ public class ClashAudioWorker : EventWorkerBase public override void Run(AnimEventInput i) { + if (Core.Settings.DuelVolumePct <= 0) + { + return; + } + var weapon1 = i.GetPawnFromIndex(0)?.GetFirstMeleeWeapon(); var weapon2 = i.GetPawnFromIndex(1)?.GetFirstMeleeWeapon(); @@ -19,7 +23,11 @@ public override void Run(AnimEventInput i) return; var pos = i.Animator.RootTransform.MultiplyPoint3x4(Vector3.zero); - sound.PlayOneShot(SoundInfo.InMap(new TargetInfo(new IntVec3(pos), i.Animator.Map))); + + var soundInfo = SoundInfo.InMap(new TargetInfo(new IntVec3(pos), i.Animator.Map)); + soundInfo.volumeFactor = Core.Settings.DuelVolumePct; + + sound.PlayOneShot(soundInfo); } } } diff --git a/Source/1.5/AnimationMod/Extensions.cs b/Source/1.5/AnimationMod/Extensions.cs index 3eec57ca..4ea673e7 100644 --- a/Source/1.5/AnimationMod/Extensions.cs +++ b/Source/1.5/AnimationMod/Extensions.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; +using JetBrains.Annotations; using UnityEngine; using Verse; using Verse.AI; @@ -45,6 +46,7 @@ public static bool IsInAnimation(this Pawn pawn) public static bool IsInAnimation(this Pawn pawn, out AnimRenderer animRenderer) => (animRenderer = AnimRenderer.TryGetAnimator(pawn)) != null; + [UsedImplicitly] // Used in Fists Of Fury public static bool IsInActiveMeleeCombat(this Pawn pawn) => pawn.jobs?.curDriver is JobDriver_AttackMelee or JobDriver_AttackStatic; diff --git a/Source/1.5/AnimationMod/GameComp.cs b/Source/1.5/AnimationMod/GameComp.cs index 0950912e..0b7f19a9 100644 --- a/Source/1.5/AnimationMod/GameComp.cs +++ b/Source/1.5/AnimationMod/GameComp.cs @@ -112,7 +112,7 @@ public override void GameComponentTick() AnimRenderer.RemoveDestroyed(); GrabUtility.Tick(); - Patch_Corpse_DrawAt.Tick(); + Patch_PawnRenderer_ParallelPreRenderPawnAt.Tick(); const float DT = 1 / 60f; diff --git a/Source/1.5/AnimationMod/Hands/HandUtility.cs b/Source/1.5/AnimationMod/Hands/HandUtility.cs index 34dfea73..fe93f0f3 100644 --- a/Source/1.5/AnimationMod/Hands/HandUtility.cs +++ b/Source/1.5/AnimationMod/Hands/HandUtility.cs @@ -92,6 +92,18 @@ private static int GetNaturalHandData(Pawn pawn, Span output) { if (!IsHand(part)) continue; + + if (!Core.Settings.AdvancedHandVisuals) + { + // Write hand with natural skin color. + if (!TryWriteToOutput(ref count, output, new HandInfo + { + Color = GetSkinColor(pawn), + Flags = HandFlags.Natural + })){ return count; } + + continue; + } // Check for clothes or armor covering the hand. Color? apparelColor = TryGetColorOfApparelCoveringHand(part); @@ -132,6 +144,18 @@ private static int GetArtificialHandData(Pawn pawn, Span output) if (!IsArtificialHand(addedPart.Part, out var actualHandPart)) continue; + + // If advanced hands are disabled, report this artificial hand as a natural one with regular skin color. + if (!Core.Settings.AdvancedHandVisuals) + { + if (!TryWriteToOutput(ref count, output, new HandInfo + { + Color = GetSkinColor(pawn), + Flags = HandFlags.Natural + })){ return count; } + + continue; + } Color? apparelColor = TryGetColorOfApparelCoveringHand(actualHandPart); Color color = apparelColor ?? TryGetArtificialHandColor(addedPart.def) ?? GetSkinColor(pawn); diff --git a/Source/1.5/AnimationMod/Idle/IdleControllerComp.cs b/Source/1.5/AnimationMod/Idle/IdleControllerComp.cs index 27eeffaf..2a55df59 100644 --- a/Source/1.5/AnimationMod/Idle/IdleControllerComp.cs +++ b/Source/1.5/AnimationMod/Idle/IdleControllerComp.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using AM.AMSettings; using AM.Patches; @@ -46,20 +46,43 @@ private static void LogSkills(Pawn pawn) } } - public AnimRenderer CurrentAnimation; + protected static AnimDef SelectRandomAnim(IReadOnlyList anims, AnimDef preferNotThis) + { + if (anims.Count == 0) + return null; + + if (anims.Count == 1) + return anims[0]; + + for (int i = 0; i < 20; i++) + { + var picked = anims.RandomElementByWeight(d => d.Probability); + if (picked != preferNotThis) + return picked; + } + // Fallback in case there are not alternatives. + return anims.RandomElementByWeight(d => d.Probability); + } + + public AnimRenderer CurrentAnimation => currentAnimation; + public bool IsFistsOfFuryComp { get; protected set; } = false; + + private UniqueSkillInstance[] skills; + private AnimDef lastAttack; + private AnimDef lastFlavour; + private AnimRenderer currentAnimation; private float pauseAngle; private int pauseTicks; private bool isPausing; private float lastSpeed; private float lastDelta; - private AnimDef lastAttack; - private AnimDef lastFlavour; private uint ticksMoving; private int drawTick; - private UniqueSkillInstance[] skills; + [TweakValue("Melee Animation")] + protected static bool IsLeftHanded; // TODO make instance, or come from pawn. - public void PreDraw() + public virtual void PreDraw() { if (parent is not Pawn pawn || CurrentAnimation == null) return; @@ -85,17 +108,34 @@ public void PreDraw() } } - private bool ShouldBeActive(out Thing weapon) + protected bool SimpleShouldBeActiveChecks(out Pawn pawn) + { + pawn = parent as Pawn; + return Core.Settings.AnimateAtIdle + && pawn != null + && (pawn.CurJob == null || !pawn.CurJob.def.neverShowWeapon) + && !pawn.Dead + && !pawn.Downed + && pawn.Spawned; + } + + protected bool AdditionalShouldBeActiveChecks() + { + foreach (var item in ShouldDrawAdditional) + { + if (!item(this)) + return false; + } + + return true; + } + + protected virtual bool ShouldBeActive(out Thing weapon) { weapon = null; // Basic checks: - if (!Core.Settings.AnimateAtIdle - || parent is not Pawn pawn - || (pawn.CurJob != null && pawn.CurJob.def.neverShowWeapon) - || pawn.Dead - || pawn.Downed - || !pawn.Spawned) + if (!SimpleShouldBeActiveChecks(out Pawn pawn)) { return false; } @@ -110,14 +150,11 @@ private bool ShouldBeActive(out Thing weapon) vanillaShouldDraw = true; } - // Dual wield check. - // Additional draw check: // Used for mod compatibility such as Fog of War etc. - foreach (var item in ShouldDrawAdditional) + if (!AdditionalShouldBeActiveChecks()) { - if (!item(this)) - return false; + return false; } // Has a valid melee weapon: @@ -168,9 +205,9 @@ private void TickSkills() } } - private void TickActive(Thing weapon) + protected virtual void TickActive(Thing weapon) { - bool IsPlayingAnim() => CurrentAnimation is {IsDestroyed: false}; + bool IsPlayingAnim() => CurrentAnimation is { IsDestroyed: false }; var pawn = (Pawn)parent; @@ -183,13 +220,13 @@ private void TickActive(Thing weapon) ticksMoving = 0; bool isMoving = ticksMoving >= 2; - var tweak = weapon.TryGetTweakData(); + var tweak = weapon?.TryGetTweakData(); bool isAttacking = IsPlayingAnim() && CurrentAnimation.Def.idleType.IsAttack(); // If attacking, it takes priority over everything else. if (isAttacking) { - DoAttackPausing(); + UpdateAttackAnimation(); return; } @@ -209,25 +246,25 @@ private void TickActive(Thing weapon) } // Randomly interrupt idle with Flavour. - TickFlavour(tweak); + HandleStartingFlavourAnim(tweak); // Mirror and loop: if (CurrentAnimation == null) return; bool shouldLoop = CurrentAnimation.Def.idleType.IsIdle(false) || CurrentAnimation.Def.idleType.IsMove(); - bool shouldBeMirrored = pawn.Rotation == Rot4.West || pawn.Rotation == Rot4.North; + bool shouldBeMirrored = pawn.Rotation == Rot4.West || (pawn.Rotation == (IsLeftHanded ? Rot4.South : Rot4.North)); CurrentAnimation.Loop = shouldLoop; CurrentAnimation.MirrorHorizontal = shouldBeMirrored; // Normally animation root transform is set from the draw method. - // However when pawns are culled, the draw method is not called so the animation - // position can get out of sync. These lines ensure that the matrix is updated if the draw hasn't be called due to culling. + // However, when pawns are culled, the draw method is not called so the animation + // position can get out of sync. These lines ensure that the matrix is updated if the draw hasn't been called due to culling. if (Find.TickManager.TicksAbs - drawTick >= 2) CurrentAnimation.RootTransform = MakePawnMatrix(pawn, pawn.Rotation == Rot4.North); } - private void DoAttackPausing() + protected virtual void UpdateAttackAnimation() { if (pauseTicks > 0) { @@ -262,14 +299,19 @@ private void DoAttackPausing() } } + protected virtual AnimDef GetMovementAnimation(ItemTweakData tweak, bool horizontal) + { + return horizontal ? tweak.GetMoveHorizontalAnimation() : tweak.GetMoveVerticalAnimation(); + } + private void EnsuringMoving(Pawn pawn, ItemTweakData tweak) { bool horizontal = pawn.Rotation.IsHorizontal; - var anim = horizontal ? tweak.GetMoveHorizontalAnimation() : tweak.GetMoveVerticalAnimation(); + var anim = GetMovementAnimation(tweak, horizontal); if (anim == null) { - Core.Warn($"Missing movement animation for {tweak.ItemDefName}, horizontal: {horizontal}"); + Core.Warn($"Missing movement animation for {tweak?.ItemDefName ?? ""}, horizontal: {horizontal}"); return; } @@ -286,7 +328,10 @@ private void EnsuringMoving(Pawn pawn, ItemTweakData tweak) CurrentAnimation.TimeScale = GetMoveAnimationSpeed(pawn); } - private void EnsureFacingOrIdle(Pawn pawn, ItemTweakData tweak) + /// + /// Handles animations when the pawn is not moving. + /// + protected virtual void EnsureFacingOrIdle(Pawn pawn, ItemTweakData tweak) { var rot = pawn.Rotation; bool facingSouth = rot == Rot4.South; @@ -314,7 +359,12 @@ private void EnsureFacingOrIdle(Pawn pawn, ItemTweakData tweak) CurrentAnimation.Seek(idleTime, 0f, null); } - private void TickFlavour(ItemTweakData tweak) + protected virtual IReadOnlyList GetFlavourAnimations(ItemTweakData tweakData) + { + return tweakData.GetFlavourAnimations(); + } + + private void HandleStartingFlavourAnim(ItemTweakData tweak) { // Check if disabled from settings: if (Core.Settings.FlavourMTB <= 0f) @@ -329,7 +379,7 @@ private void TickFlavour(ItemTweakData tweak) return; // Pick random flavour. - var anim = Random(tweak.GetFlavourAnimations(), lastFlavour); + var anim = SelectRandomAnim(GetFlavourAnimations(tweak), lastFlavour); lastFlavour = anim; // Play said flavour. @@ -337,7 +387,7 @@ private void TickFlavour(ItemTweakData tweak) StartAnim(anim); } - private void StartAnim(AnimDef def) + protected void StartAnim(AnimDef def) { ClearAnimation(); @@ -346,7 +396,7 @@ private void StartAnim(AnimDef def) DoNotRegisterPawns = true, }; - if (!args.TryTrigger(out CurrentAnimation)) + if (!args.TryTrigger(out currentAnimation)) Core.Error($"Failed to start idle anim '{def}'!"); } @@ -364,25 +414,6 @@ private static float GetMoveAnimationSpeed(Pawn pawn) return Mathf.Clamp(Mathf.Pow(dstPerSecond / REF_SPEED, EXP), MIN_COEF, MAX_COEF) * Core.Settings.MoveAnimSpeedCoef; } - private static AnimDef Random(IReadOnlyList anims, AnimDef preferNotThis) - { - if (anims.Count == 0) - return null; - - if (anims.Count == 1) - return anims[0]; - - for (int i = 0; i < 20; i++) - { - var picked = anims.RandomElementByWeight(d => d.Probability); - if (picked != preferNotThis) - return picked; - } - - // Fallback in case there are not alternatives. - return anims.RandomElementByWeight(d => d.Probability); - } - private Thing GetMeleeWeapon() { var weapon = (parent as Pawn)?.equipment?.Primary; @@ -391,27 +422,38 @@ private Thing GetMeleeWeapon() return null; } - public void NotifyPawnDidMeleeAttack(Thing target, Verb_MeleeAttack verbUsed) + protected virtual IReadOnlyList GetAttackAnimationsFor(Pawn pawn, Thing weapon, out bool allowPauseEver) + { + allowPauseEver = true; + var tweak = weapon?.TryGetTweakData(); + if (tweak == null) + return null; + + return tweak.GetAttackAnimations(pawn.Rotation); + } + + public virtual void NotifyPawnDidMeleeAttack(Thing target, Verb_MeleeAttack verbUsed) { // Check valid state. var pawn = parent as Pawn; var weapon = GetMeleeWeapon(); - var tweak = weapon?.TryGetTweakData(); - if (tweak == null) + var rot = pawn.Rotation; + var anims = GetAttackAnimationsFor(pawn, weapon, out bool allowPauseEver); + if (anims == null || anims.Count == 0) + { + Core.Warn($"Failed to find any attack animation to play for {weapon}, rot: {rot.AsVector2}!"); return; + } // Attempt to get an attack animation for current weapon and stance. - var rot = pawn.Rotation; bool didHit = target != null && Patch_Verb_MeleeAttack_ApplyMeleeDamageToTarget.lastTarget == target; - // Get list of attack animations. - var anims = tweak.GetAttackAnimations(rot); - var anim = Random(anims, lastAttack); + var anim = SelectRandomAnim(anims, lastAttack); lastAttack = anim; if (anim == null) { - Core.Warn($"Failed to find any attack animation to play for {weapon} {tweak.GetCategory()}, rot: {rot.AsVector2} !"); + Core.Warn($"Failed to find any attack animation to play for {weapon}, rot: {rot.AsVector2}!"); return; } @@ -437,7 +479,7 @@ public void NotifyPawnDidMeleeAttack(Thing target, Verb_MeleeAttack verbUsed) pauseAngle = angle; // Only if we actually hit: - if (didHit && Core.Settings.AttackPauseDuration != AttackPauseIntensity.Disabled) + if (didHit && allowPauseEver && Core.Settings.AttackPauseDuration != AttackPauseIntensity.Disabled) pauseTicks = (int)Core.Settings.AttackPauseDuration; } @@ -452,7 +494,7 @@ public void NotifyPawnDidMeleeAttack(Thing target, Verb_MeleeAttack verbUsed) }; ClearAnimation(); - if (!args.TryTrigger(out CurrentAnimation)) + if (!args.TryTrigger(out currentAnimation)) { Core.Error($"Failed to trigger attack animation for {pawn} ({args}). Dead: {pawn.Dead}, Downed: {pawn.Downed}, InAnim: {pawn.TryGetAnimator() != null}"); } @@ -480,8 +522,7 @@ private Matrix4x4 MakePawnMatrix(Pawn pawn, bool north) if (CurrentAnimation == null || !CurrentAnimation.Def.pointAtTarget) return animationMatrix; - float frame = CurrentAnimation.CurrentTime * 60f; - float lerp = Mathf.InverseLerp(CurrentAnimation.Def.returnToIdleStart, CurrentAnimation.Def.returnToIdleEnd, frame); + float lerp = GetPointAtTargetLerp(); const float IDLE_ANGLE = 0; float point = -pauseAngle; @@ -499,10 +540,22 @@ private Matrix4x4 MakePawnMatrix(Pawn pawn, bool north) point -= 90; } + point += CurrentAnimation.Def.pointAtTargetAngleOffset; + float a = Mathf.LerpAngle(point, IDLE_ANGLE, lerp); return animationMatrix * Matrix4x4.Rotate(Quaternion.Euler(0f, a, 0f)); } + /// + /// 0 is point at target, 1 is idle. + /// + protected virtual float GetPointAtTargetLerp() + { + float frame = CurrentAnimation.CurrentTime * 60f; + float lerp = Mathf.InverseLerp(CurrentAnimation.Def.returnToIdleStart, CurrentAnimation.Def.returnToIdleEnd, frame); + return lerp; + } + public override void PostDeSpawn(Map map) { base.PostDeSpawn(map); @@ -517,15 +570,13 @@ public override void PostDestroy(DestroyMode mode, Map previousMap) public void ClearAnimation() { - if (CurrentAnimation == null) + if (currentAnimation == null) return; + + if (!currentAnimation.IsDestroyed) + currentAnimation.Destroy(); - //Core.Log($"[{parent}] Cleared {CurrentAnimation?.ToString() ?? "null"}"); - - if (!CurrentAnimation.IsDestroyed) - CurrentAnimation.Destroy(); - - CurrentAnimation = null; + currentAnimation = null; } public override void PostExposeData() @@ -538,7 +589,9 @@ public override void PostExposeData() return; if (skills == null || skills.Any(s => s == null)) + { PopulateSkills(); + } for (int i = 0; i < skills.Length; i++) { @@ -578,7 +631,7 @@ private void PopulateSkills() var instance = Activator.CreateInstance(list[i].instanceClass) as UniqueSkillInstance; if (instance == null) { - Log.Error($"Failed to create instance of class '{list[i].instanceClass}'. This will surely cause issues down the line."); + Core.Error($"Failed to create instance of class '{list[i].instanceClass}'. This will surely cause issues down the line."); continue; } diff --git a/Source/1.5/AnimationMod/Idle/IdleType.cs b/Source/1.5/AnimationMod/Idle/IdleType.cs index 29b759d6..309425fe 100644 --- a/Source/1.5/AnimationMod/Idle/IdleType.cs +++ b/Source/1.5/AnimationMod/Idle/IdleType.cs @@ -8,5 +8,6 @@ public enum IdleType Flavour, AttackHorizontal, AttackSouth, - AttackNorth + AttackNorth, + IdleSpecial, } diff --git a/Source/1.5/AnimationMod/Outcome/OutcomeUtility.cs b/Source/1.5/AnimationMod/Outcome/OutcomeUtility.cs index 7e4f660b..c28a3665 100644 --- a/Source/1.5/AnimationMod/Outcome/OutcomeUtility.cs +++ b/Source/1.5/AnimationMod/Outcome/OutcomeUtility.cs @@ -500,8 +500,8 @@ private static bool Kill(Pawn killer, Pawn pawn, in AdditionalArgs args) if (pawn.Corpse != null) { // Do corpse interpolation - interpolates the corpse to the correct position, after the animated position. - Patch_Corpse_DrawAt.Interpolators[pawn.Corpse] = new CorpseInterpolate(pawn.Corpse, ss.GetWorldPosition()); - Patch_Corpse_DrawAt.OverrideRotations[pawn] = ss.GetWorldDirection(); + Patch_PawnRenderer_ParallelPreRenderPawnAt.Interpolators[pawn.Corpse] = new CorpseInterpolate(pawn.Corpse, ss.GetWorldPosition()); + Patch_PawnRenderer_ParallelPreRenderPawnAt.OverrideRotations[pawn] = ss.GetWorldDirection(); } else if (!isDeathless) { diff --git a/Source/1.5/AnimationMod/Patches/Patch_Corpse_DrawAt.cs b/Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_ParallelPreRenderPawnAt.cs similarity index 91% rename from Source/1.5/AnimationMod/Patches/Patch_Corpse_DrawAt.cs rename to Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_ParallelPreRenderPawnAt.cs index 9835d707..55d1a00f 100644 --- a/Source/1.5/AnimationMod/Patches/Patch_Corpse_DrawAt.cs +++ b/Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_ParallelPreRenderPawnAt.cs @@ -7,8 +7,11 @@ namespace AM.Patches; +/// +/// This patch is just for corpse offsets, nothing else. +/// [HarmonyPatch(typeof(PawnRenderer), nameof(PawnRenderer.ParallelPreRenderPawnAt))] // Corpse DrawAt was removed in 1.5 -public static class Patch_Corpse_DrawAt +public static class Patch_PawnRenderer_ParallelPreRenderPawnAt { public static readonly Dictionary Interpolators = new Dictionary(); public static readonly Dictionary OverrideRotations = new Dictionary(); @@ -22,12 +25,10 @@ public static void Tick() } } - [HarmonyPriority(Priority.Last)] + [HarmonyPriority(Priority.First)] private static void Prefix(PawnRenderer __instance, ref Vector3 drawLoc, ref Rot4? rotOverride) { - var corpse = __instance.pawn.ParentHolder as Corpse; - - if (corpse == null) + if (__instance.pawn.ParentHolder is not Corpse corpse) return; DoOffsetLogic(corpse, ref drawLoc, ref rotOverride); diff --git a/Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnAt.cs b/Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnAt.cs index 2b09b5be..c1ef4f7e 100644 --- a/Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnAt.cs +++ b/Source/1.5/AnimationMod/Patches/Patch_PawnRenderer_RenderPawnAt.cs @@ -1,4 +1,5 @@ using AM.Grappling; +using AM.Idle; using HarmonyLib; using RimWorld; using UnityEngine; @@ -27,6 +28,13 @@ public static bool Prefix(Pawn ___pawn, PawnRenderTree ___renderTree, ref PawnRe { __state = null; // Harmony requires this to be initialized. + // Fists of fury component needs it's PreDraw called here, because normally it is only called when equipment is aiming. + if (Core.IsFistsOfFuryActive) + { + var comp = ___pawn.TryGetComp(); + comp?.PreDraw(); + } + // Draw the ropes that bind the pawn when being grappled. DrawGrappleRopeIfRequired(___pawn); diff --git a/Source/1.5/AnimationMod/Reqs/MustBeFists.cs b/Source/1.5/AnimationMod/Reqs/MustBeFists.cs new file mode 100644 index 00000000..c5ef17f9 --- /dev/null +++ b/Source/1.5/AnimationMod/Reqs/MustBeFists.cs @@ -0,0 +1,6 @@ +namespace AM.Reqs; + +public sealed class MustBeFists : Req +{ + public override bool Evaluate(ReqInput input) => input.IsFists; +} \ No newline at end of file diff --git a/Source/1.5/AnimationMod/Reqs/ReqInput.cs b/Source/1.5/AnimationMod/Reqs/ReqInput.cs index 4fb1a4ed..6caddab7 100644 --- a/Source/1.5/AnimationMod/Reqs/ReqInput.cs +++ b/Source/1.5/AnimationMod/Reqs/ReqInput.cs @@ -11,6 +11,7 @@ public struct ReqInput public MeleeWeaponType TypeFlags; public WeaponSize SizeFlags; public WeaponCat CategoryFlags; + public bool IsFists; public ReqInput(ThingDef weapon) : this(TweakDataManager.TryGetTweak(weapon)) { @@ -22,6 +23,7 @@ public ReqInput(ItemTweakData td) WeaponDef = td?.GetDef(); TweakData = td; TypeFlags = td?.MeleeWeaponType ?? 0; + IsFists = false; var pair = td?.GetCategory() ?? (default, default); SizeFlags = pair.size; diff --git a/Source/1.5/AnimationMod/UniqueSkills/UniqueSkillInstance.cs b/Source/1.5/AnimationMod/UniqueSkills/UniqueSkillInstance.cs index d880a10b..0e77c785 100644 --- a/Source/1.5/AnimationMod/UniqueSkills/UniqueSkillInstance.cs +++ b/Source/1.5/AnimationMod/UniqueSkills/UniqueSkillInstance.cs @@ -6,7 +6,6 @@ public abstract class UniqueSkillInstance : IExposable { public UniqueSkillDef Def; public Pawn Pawn; - public int TickLastTriggered = -1000000; public virtual void ExposeData() @@ -19,7 +18,7 @@ public virtual void ExposeData() public float GetCooldownSecondsLeft() { int ticksSinceLast = GenTicks.TicksGame - TickLastTriggered; - return (Def.baseCooldownTicks - ticksSinceLast) / 60f; + return ((Def.baseCooldownTicks * Core.Settings.SkillCooldownFactor) - ticksSinceLast) / 60f; } /// diff --git a/Source/1.5/CAI5000Patch/CAI5000Patch.csproj b/Source/1.5/CAI5000Patch/CAI5000Patch.csproj index dc9a809e..b70e7162 100644 --- a/Source/1.5/CAI5000Patch/CAI5000Patch.csproj +++ b/Source/1.5/CAI5000Patch/CAI5000Patch.csproj @@ -29,7 +29,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Source/1.5/CombatExtendedPatch/CombatExtendedPatch.csproj b/Source/1.5/CombatExtendedPatch/CombatExtendedPatch.csproj index 3284f991..17fd7f8b 100644 --- a/Source/1.5/CombatExtendedPatch/CombatExtendedPatch.csproj +++ b/Source/1.5/CombatExtendedPatch/CombatExtendedPatch.csproj @@ -30,7 +30,7 @@ False all - + diff --git a/Source/1.5/FacialAnimationPatch/FacialAnimationPatch.csproj b/Source/1.5/FacialAnimationPatch/FacialAnimationPatch.csproj index 9516cd72..6872a6fd 100644 --- a/Source/1.5/FacialAnimationPatch/FacialAnimationPatch.csproj +++ b/Source/1.5/FacialAnimationPatch/FacialAnimationPatch.csproj @@ -12,7 +12,7 @@ - + runtime diff --git a/Source/1.5/LightsaberPatch/LightsaberPatch.csproj b/Source/1.5/LightsaberPatch/LightsaberPatch.csproj index 99aedd47..1bbe2713 100644 --- a/Source/1.5/LightsaberPatch/LightsaberPatch.csproj +++ b/Source/1.5/LightsaberPatch/LightsaberPatch.csproj @@ -20,7 +20,7 @@ False all - + diff --git a/Source/1.5/ModRequestAPI/ModRequestAPI.csproj b/Source/1.5/ModRequestAPI/ModRequestAPI.csproj index 8737ecad..ad00ba77 100644 --- a/Source/1.5/ModRequestAPI/ModRequestAPI.csproj +++ b/Source/1.5/ModRequestAPI/ModRequestAPI.csproj @@ -11,7 +11,7 @@ - + diff --git a/Source/1.5/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj b/Source/1.5/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj index f8f90375..2641b1a7 100644 --- a/Source/1.5/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj +++ b/Source/1.5/PerformanceOptimizerPatch/PerformanceOptimizerPatch.csproj @@ -31,7 +31,7 @@ all - + diff --git a/Source/1.5/TacticowlPatch/TacticowlPatch.csproj b/Source/1.5/TacticowlPatch/TacticowlPatch.csproj index 11d2b137..b93ba883 100644 --- a/Source/1.5/TacticowlPatch/TacticowlPatch.csproj +++ b/Source/1.5/TacticowlPatch/TacticowlPatch.csproj @@ -20,7 +20,7 @@ False all - + diff --git a/Source/Animations/.idea/.idea.Animations/.idea/.gitignore b/Source/Animations/.idea/.idea.Animations/.idea/.gitignore new file mode 100644 index 00000000..2d00e486 --- /dev/null +++ b/Source/Animations/.idea/.idea.Animations/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/contentModel.xml +/projectSettingsUpdater.xml +/.idea.Animations.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Source/Animations/.idea/.idea.Animations/.idea/encodings.xml b/Source/Animations/.idea/.idea.Animations/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/Source/Animations/.idea/.idea.Animations/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Source/Animations/.idea/.idea.Animations/.idea/indexLayout.xml b/Source/Animations/.idea/.idea.Animations/.idea/indexLayout.xml new file mode 100644 index 00000000..7b08163c --- /dev/null +++ b/Source/Animations/.idea/.idea.Animations/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Source/Animations/.idea/.idea.Animations/.idea/misc.xml b/Source/Animations/.idea/.idea.Animations/.idea/misc.xml new file mode 100644 index 00000000..acebe251 --- /dev/null +++ b/Source/Animations/.idea/.idea.Animations/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Source/Animations/.idea/.idea.Animations/.idea/vcs.xml b/Source/Animations/.idea/.idea.Animations/.idea/vcs.xml new file mode 100644 index 00000000..b2bdec2d --- /dev/null +++ b/Source/Animations/.idea/.idea.Animations/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Source/Animations/Assets/AnimData.cs b/Source/Animations/Assets/AnimData.cs index b753f9f6..2f6c28ba 100644 --- a/Source/Animations/Assets/AnimData.cs +++ b/Source/Animations/Assets/AnimData.cs @@ -196,7 +196,6 @@ public static string Save(AnimationClip clip, AnimationDataCreator creator, Rect foreach (var go in EnumerateChildrenDeep(animatorRoot)) { string path = MakeRelativePath(animatorRoot, go); - Debug.Log($"{go} adds {path}"); if (paths.Add(path)) { //Debug.LogWarning($"Saved {path} from being stripped from the output."); diff --git a/Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim b/Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim new file mode 100644 index 00000000..c94ef0b0 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim @@ -0,0 +1,481 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_CrossHighHorizontal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.511, y: 0.25, z: -0.007} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 0.3228284, y: 0.25, z: -0.14} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 0.446, y: 0.25, z: -0.108} + inSlope: {x: 0.55593693, y: 0, z: 0.28444445} + outSlope: {x: 0.55593693, y: 0, z: 0.28444445} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.55 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.051, y: 0.15, z: 0.223} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 0.926, y: 0.15, z: -0.047} + inSlope: {x: 0.98999953, y: 0, z: -3.0674999} + outSlope: {x: 0.98999953, y: 0, z: -3.0674999} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 0.959, y: 0.15, z: -0.186} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.36666667 + value: {x: 0.58934087, y: 0.15, z: -0.147} + inSlope: {x: -1.5047998, y: 0, z: 0.3264} + outSlope: {x: -1.5047998, y: 0, z: 0.3264} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.55 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.55 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.511 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.3228284 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.446 + inSlope: 0.55593693 + outSlope: 0.55593693 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.007 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -0.14 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -0.108 + inSlope: 0.28444445 + outSlope: 0.28444445 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.128 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.051 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.926 + inSlope: 0.98999953 + outSlope: 0.98999953 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.959 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: 0.58934087 + inSlope: -1.5047998 + outSlope: -1.5047998 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.223 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -0.047 + inSlope: -3.0674999 + outSlope: -3.0674999 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -0.186 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: -0.147 + inSlope: 0.3264 + outSlope: 0.3264 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim.meta b/Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim.meta new file mode 100644 index 00000000..5c01c4f6 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_CrossHighHorizontal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e13c5828a6c64dc49b5c89493bafa2e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim b/Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim new file mode 100644 index 00000000..21c14cf9 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim @@ -0,0 +1,445 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_CrossHorizontal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.511, y: 0.25, z: -0.007} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 0.3228284, y: 0.25, z: -0.14} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 0.446, y: 0.25, z: -0.108} + inSlope: {x: 0.55593693, y: 0, z: 0.28444445} + outSlope: {x: 0.55593693, y: 0, z: 0.28444445} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.55 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.051, y: 0.15, z: -0.018} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 0.926, y: 0.15, z: 0.062} + inSlope: {x: 0.98999953, y: 0, z: 0} + outSlope: {x: 0.98999953, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 0.959, y: 0.15, z: 0.044} + inSlope: {x: 0, y: 0, z: -0.14896551} + outSlope: {x: 0, y: 0, z: -0.14896551} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.55 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.55 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.511 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.3228284 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.446 + inSlope: 0.55593693 + outSlope: 0.55593693 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.007 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -0.14 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: -0.108 + inSlope: 0.28444445 + outSlope: 0.28444445 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.128 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.051 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.926 + inSlope: 0.98999953 + outSlope: 0.98999953 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.959 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.018 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.062 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.044 + inSlope: -0.14896551 + outSlope: -0.14896551 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.55 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim.meta b/Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim.meta new file mode 100644 index 00000000..9dd60440 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_CrossHorizontal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: adb86060038774d4c8100a24ae60b798 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim b/Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim new file mode 100644 index 00000000..d4b35726 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim @@ -0,0 +1,733 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_FightingHorizontal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 0.52588034, y: 0.25, z: 0.094} + inSlope: {x: -0.20533153, y: 0, z: 0} + outSlope: {x: -0.20533153, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.46666667 + value: {x: 0.47717863, y: 0.25, z: 0.12482495} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.73333335 + value: {x: 0.53, y: 0.25, z: 0.10823339} + inSlope: {x: 0.21293639, y: 0, z: 0} + outSlope: {x: 0.21293639, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: -0.10212269} + outSlope: {x: 0, y: 0, z: -0.10212269} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.3893647} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.15 + value: {x: 0.52588034, y: 0.25, z: 0.094} + inSlope: {x: -0.2129364, y: 0, z: 0} + outSlope: {x: -0.2129364, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.3666667 + value: {x: 0.47717863, y: 0.25, z: 0.14928478} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.6 + value: {x: 0.5186829, y: 0.25, z: 0.09929174} + inSlope: {x: 0.24213524, y: 0, z: 0} + outSlope: {x: 0.24213524, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.65 + value: {x: 0.53, y: 0.25, z: 0.103541195} + inSlope: {x: 0.20533152, y: 0, z: 0.1539897} + outSlope: {x: 0.20533152, y: 0, z: 0.1539897} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.8333334 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: -0.10212269} + outSlope: {x: 0, y: 0, z: -0.10212269} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.3893647} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.35 + value: {x: 0.24679166, y: 0.15, z: -0.088997334} + inSlope: {x: -0.29656813, y: 0, z: -0.45761254} + outSlope: {x: -0.29656813, y: 0, z: -0.45761254} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.41666666 + value: {x: 0.22922331, y: 0.15, z: -0.12744996} + inSlope: {x: -0.22357653, y: 0, z: -0.7044847} + outSlope: {x: -0.22357653, y: 0, z: -0.7044847} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.23598821} + - serializedVersion: 3 + time: 0.6166667 + value: {x: 0.22505072, y: 0.15, z: -0.15091047} + inSlope: {x: 0.24400128, y: 0, z: 0.30759412} + outSlope: {x: 0.24400128, y: 0, z: 0.30759412} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.7652375, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6333333 + value: {x: 0.2296317, y: 0.15, z: -0.14543796} + inSlope: {x: 0.3042687, y: 0, z: 0.3479816} + outSlope: {x: 0.3042687, y: 0, z: 0.3479816} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.2666667 + value: {x: 0.27195105, y: 0.15, z: -0.12744996} + inSlope: {x: -0.19655553, y: 0, z: 0.33279675} + outSlope: {x: -0.19655553, y: 0, z: 0.33279675} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.14459294} + - serializedVersion: 3 + time: 1.5333333 + value: {x: 0.26693177, y: 0.15, z: -0.06726456} + inSlope: {x: 0.24400128, y: 0, z: 0.13175781} + outSlope: {x: 0.24400128, y: 0, z: 0.13175781} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.7652375, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5666667 + value: {x: 0.2755896, y: 0.15, z: -0.06320232} + inSlope: {x: 0.27312317, y: 0, z: 0.112181455} + outSlope: {x: 0.27312317, y: 0, z: 0.112181455} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.8333334 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.8333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.52588034 + inSlope: -0.20533153 + outSlope: -0.20533153 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.46666667 + value: 0.47717863 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.73333335 + value: 0.53 + inSlope: 0.21293639 + outSlope: 0.21293639 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0.52588034 + inSlope: -0.2129364 + outSlope: -0.2129364 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.47717863 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.65 + value: 0.53 + inSlope: 0.20533152 + outSlope: 0.20533152 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.46666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.73333335 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.65 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.128 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.094 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.46666667 + value: 0.12482495 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.73333335 + value: 0.10823339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.128 + inSlope: -0.10212269 + outSlope: -0.10212269 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.3893647 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0.094 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.14928478 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6 + value: 0.09929174 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: 0.128 + inSlope: -0.10212269 + outSlope: -0.10212269 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.3893647 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0.22505072 + inSlope: 0.24400128 + outSlope: 0.24400128 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.7652375 + - serializedVersion: 3 + time: 0.9166667 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5333333 + value: 0.26693177 + inSlope: 0.24400128 + outSlope: 0.24400128 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.7652375 + - serializedVersion: 3 + time: 1.8333334 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.35 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.12744996 + inSlope: -0.7044847 + outSlope: -0.7044847 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.23598821 + - serializedVersion: 3 + time: 0.9166667 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + value: -0.12744996 + inSlope: 0.33279675 + outSlope: 0.33279675 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.14459294 + - serializedVersion: 3 + time: 1.8333334 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim.meta b/Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim.meta new file mode 100644 index 00000000..7cb36d3d --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_FightingHorizontal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a851aab1863ac043923cfe89adfb083 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_FightingSouth.anim b/Source/Animations/Assets/Animation/FOF_FightingSouth.anim new file mode 100644 index 00000000..fdc75116 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_FightingSouth.anim @@ -0,0 +1,802 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_FightingSouth + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.161, y: 0.25, z: -0.24} + inSlope: {x: -0.056272116, y: 0, z: 0} + outSlope: {x: -0.056272116, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.15217838, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: 0.14601326, y: 0.25, z: -0.27647784} + inSlope: {x: -0.06242463, y: 0, z: -0.24852498} + outSlope: {x: -0.06242463, y: 0, z: -0.24852498} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.41666666 + value: {x: 0.15066656, y: 0.25, z: -0.289} + inSlope: {x: 0.14196022, y: 0, z: 0.26937208} + outSlope: {x: 0.14196022, y: 0, z: 0.26937208} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.11634511} + - serializedVersion: 3 + time: 0.43333334 + value: {x: 0.15323755, y: 0.25, z: -0.28464508} + inSlope: {x: 0.16677351, y: 0, z: 0.25330037} + outSlope: {x: 0.16677351, y: 0, z: 0.25330037} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.14577194, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.14945601, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.68333334 + value: {x: 0.17365536, y: 0.25, z: -0.2464101} + inSlope: {x: 0.004226637, y: 0, z: 0.07092254} + outSlope: {x: 0.004226637, y: 0, z: 0.07092254} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 0.161, y: 0.25, z: -0.24} + inSlope: {x: -0.106030695, y: 0, z: 0} + outSlope: {x: -0.106030695, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.1281848, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.1166667 + value: {x: 0.15597507, y: 0.25, z: -0.27005556} + inSlope: {x: 0.00956025, y: 0, z: -0.2139435} + outSlope: {x: 0.00956025, y: 0, z: -0.2139435} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.3 + value: {x: 0.14866866, y: 0.25, z: -0.2920796} + inSlope: {x: -0.12810507, y: 0, z: 0.046459567} + outSlope: {x: -0.12810507, y: 0, z: 0.046459567} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.14577194, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.18512648, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.3333334 + value: {x: 0.14526117, y: 0.25, z: -0.289} + inSlope: {x: -0.07744005, y: 0, z: 0.1407208} + outSlope: {x: -0.07744005, y: 0, z: 0.1407208} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.14154243} + - serializedVersion: 3 + time: 1.6 + value: {x: 0.1564564, y: 0.25, z: -0.2538814} + inSlope: {x: 0.091309726, y: 0, z: 0.10694486} + outSlope: {x: 0.091309726, y: 0, z: 0.10694486} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.8333334 + value: {x: 0.161, y: 0.25, z: -0.24} + inSlope: {x: -0.106030695, y: 0, z: 0} + outSlope: {x: -0.106030695, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.1281848, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.131, y: 0.25, z: -0.171} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.2 + value: {x: -0.14049768, y: 0.25, z: -0.15440835} + inSlope: {x: -0.072629355, y: 0, z: 0.113936864} + outSlope: {x: -0.072629355, y: 0, z: 0.113936864} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.36666667 + value: {x: -0.15040404, y: 0.25, z: -0.14435188} + inSlope: {x: -0.030727802, y: 0, z: -0.029356204} + outSlope: {x: -0.030727802, y: 0, z: -0.029356204} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.1757077} + - serializedVersion: 3 + time: 0.41666666 + value: {x: -0.15120715, y: 0.25, z: -0.14587888} + inSlope: {x: 0, y: 0, z: -0.031761847} + outSlope: {x: 0, y: 0, z: -0.031761847} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.68333334 + value: {x: -0.14009471, y: 0.25, z: -0.1564295} + inSlope: {x: 0.060352027, y: 0, z: -0.048451126} + outSlope: {x: 0.060352027, y: 0, z: -0.048451126} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.9166667 + value: {x: -0.131, y: 0.25, z: -0.171} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.1166667 + value: {x: -0.14102367, y: 0.25, z: -0.1502944} + inSlope: {x: -0.07546155, y: 0, z: 0.13739301} + outSlope: {x: -0.07546155, y: 0, z: 0.13739301} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.2833333 + value: {x: -0.150812, y: 0.25, z: -0.14043038} + inSlope: {x: -0.024793718, y: 0, z: -0.067401804} + outSlope: {x: -0.024793718, y: 0, z: -0.067401804} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.20295867} + - serializedVersion: 3 + time: 1.3333334 + value: {x: -0.15120715, y: 0.25, z: -0.14352138} + inSlope: {x: 0.010536456, y: 0, z: -0.05678534} + outSlope: {x: 0.010536456, y: 0, z: -0.05678534} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.10992384, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.6 + value: {x: -0.13948283, y: 0.25, z: -0.1564295} + inSlope: {x: 0.057401806, y: 0, z: -0.055581134} + outSlope: {x: 0.057401806, y: 0, z: -0.055581134} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.8333334 + value: {x: -0.131, y: 0.25, z: -0.171} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.9166667 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.8333334 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 934071076 + attribute: 3166393104 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 1 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.8333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.9166667 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.8333334 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.161 + inSlope: -0.056272116 + outSlope: -0.056272116 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.15217838 + - serializedVersion: 3 + time: 0.43333334 + value: 0.15323755 + inSlope: 0.16677351 + outSlope: 0.16677351 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.14577194 + outWeight: 0.14945601 + - serializedVersion: 3 + time: 0.9166667 + value: 0.161 + inSlope: -0.106030695 + outSlope: -0.106030695 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.1281848 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3 + value: 0.14866866 + inSlope: -0.12810507 + outSlope: -0.12810507 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.14577194 + outWeight: 0.18512648 + - serializedVersion: 3 + time: 1.8333334 + value: 0.161 + inSlope: -0.106030695 + outSlope: -0.106030695 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.1281848 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1166667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.289 + inSlope: 0.26937208 + outSlope: 0.26937208 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.11634511 + - serializedVersion: 3 + time: 0.9166667 + value: -0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: -0.289 + inSlope: 0.1407208 + outSlope: 0.1407208 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.14154243 + - serializedVersion: 3 + time: 1.8333334 + value: -0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.131 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.15120715 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: -0.131 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: -0.15120715 + inSlope: 0.010536456 + outSlope: 0.010536456 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.10992384 + - serializedVersion: 3 + time: 1.8333334 + value: -0.131 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.68333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1166667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.6 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.171 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.36666667 + value: -0.14435188 + inSlope: -0.029356204 + outSlope: -0.029356204 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.1757077 + - serializedVersion: 3 + time: 0.68333334 + value: -0.1564295 + inSlope: -0.048451126 + outSlope: -0.048451126 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: -0.171 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2833333 + value: -0.14043038 + inSlope: -0.067401804 + outSlope: -0.067401804 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.20295867 + - serializedVersion: 3 + time: 1.6 + value: -0.1564295 + inSlope: -0.055581134 + outSlope: -0.055581134 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: -0.171 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_FightingSouth.anim.meta b/Source/Animations/Assets/Animation/FOF_FightingSouth.anim.meta new file mode 100644 index 00000000..885eb740 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_FightingSouth.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f942a990d6340e045a1878c74b0f8a91 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_Idle.anim b/Source/Animations/Assets/Animation/FOF_Idle.anim new file mode 100644 index 00000000..99df0fe5 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_Idle.anim @@ -0,0 +1,442 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_Idle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.339, y: 0.25, z: -0.143} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.1333333 + value: {x: 0.339, y: 0.25, z: -0.111} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 0.339, y: 0.25, z: -0.143} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.339, y: 0.25, z: -0.143} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: -0.339, y: 0.25, z: -0.111} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: -0.339, y: 0.25, z: -0.143} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 934071076 + attribute: 3166393104 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 1 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 2 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1333333 + value: 0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1333333 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.143 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.1333333 + value: -0.111 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -0.143 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.143 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.111 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -0.143 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_Idle.anim.meta b/Source/Animations/Assets/Animation/FOF_Idle.anim.meta new file mode 100644 index 00000000..1f86d4f4 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a9d6f4a8e5e5dd4f861c7fb3ec2f7aa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_JabHorizontal.anim b/Source/Animations/Assets/Animation/FOF_JabHorizontal.anim new file mode 100644 index 00000000..b9715ae1 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_JabHorizontal.anim @@ -0,0 +1,409 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_JabHorizontal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.052, y: -0.1, z: 0.11} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0.929, y: 0.25, z: 0.078} + inSlope: {x: 0, y: 0, z: -0.375} + outSlope: {x: 0, y: 0, z: -0.375} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0.7888834, y: 0.25, z: -0.015} + inSlope: {x: -0.6102857, y: 0, z: 0} + outSlope: {x: -0.6102857, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.37, y: 0.15, z: -0.129} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0.111, y: 0.15, z: -0.219} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.052 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.929 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.7888834 + inSlope: -0.6102857 + outSlope: -0.6102857 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.11 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.078 + inSlope: -0.375 + outSlope: -0.375 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: -0.015 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.128 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.37 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.111 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.129 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.219 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_JabHorizontal.anim.meta b/Source/Animations/Assets/Animation/FOF_JabHorizontal.anim.meta new file mode 100644 index 00000000..0e1d3c75 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_JabHorizontal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b30d05d0737c3fc4288ecc52302db701 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_JabSouth.anim b/Source/Animations/Assets/Animation/FOF_JabSouth.anim new file mode 100644 index 00000000..408f2eff --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_JabSouth.anim @@ -0,0 +1,640 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_JabSouth + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.205, y: 0.25, z: -0.031} + inSlope: {x: -0.056272116, y: 0, z: 0} + outSlope: {x: -0.056272116, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.15217838, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0.06, y: -0.1, z: -0.74} + inSlope: {x: 0, y: 0, z: -2.2559996} + outSlope: {x: 0, y: Infinity, z: -2.2559996} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.026, y: 0.25, z: -0.834} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.161, y: 0.25, z: -0.24} + inSlope: {x: -0.056272116, y: 0, z: 1.3162462} + outSlope: {x: -0.056272116, y: 0, z: 1.3162462} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.15217838, y: 0.33333334, z: 0.40493128} + - serializedVersion: 3 + time: 0.76666665 + value: {x: 0.186, y: 0.25, z: -0.20167913} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8666667 + value: {x: 0.161, y: 0.25, z: -0.23829101} + inSlope: {x: -0.056272116, y: 0, z: -0.6979712} + outSlope: {x: -0.056272116, y: 0, z: -0.6979712} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.46645898} + outWeight: {x: 0.15217838, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.131, y: 0.25, z: -0.171} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.11666667 + value: {x: -0.195, y: 0.25, z: -0.038} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.45 + value: {x: -0.133, y: 0.25, z: -0.191} + inSlope: {x: 0.069473706, y: 0, z: 0} + outSlope: {x: 0.069473706, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.75 + value: {x: -0.122, y: 0.25, z: -0.17482592} + inSlope: {x: 0, y: 0, z: 0.03672881} + outSlope: {x: 0, y: 0, z: 0.03672881} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8666667 + value: {x: -0.131, y: 0.25, z: -0.171} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8666667 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 934071076 + attribute: 3166393104 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 1 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6666667 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8666667 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.205 + inSlope: -0.056272116 + outSlope: -0.056272116 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.15217838 + - serializedVersion: 3 + time: 0.083333336 + value: 0.06 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.026 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.161 + inSlope: -0.056272116 + outSlope: -0.056272116 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.15217838 + - serializedVersion: 3 + time: 0.76666665 + value: 0.186 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0.161 + inSlope: -0.056272116 + outSlope: -0.056272116 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.15217838 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.76666665 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.031 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0.74 + inSlope: -2.2559996 + outSlope: -2.2559996 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -0.834 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.24 + inSlope: 1.3162462 + outSlope: 1.3162462 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.40493128 + - serializedVersion: 3 + time: 0.76666665 + value: -0.20167913 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: -0.23829101 + inSlope: -0.6979712 + outSlope: -0.6979712 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.46645898 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.131 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: -0.195 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: -0.133 + inSlope: 0.069473706 + outSlope: 0.069473706 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: -0.122 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: -0.131 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.171 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: -0.038 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: -0.191 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: -0.17482592 + inSlope: 0.03672881 + outSlope: 0.03672881 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8666667 + value: -0.171 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_JabSouth.anim.meta b/Source/Animations/Assets/Animation/FOF_JabSouth.anim.meta new file mode 100644 index 00000000..c5c51ec2 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_JabSouth.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01ab1ffb312f8ca4dbc7bedca49c5f6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim b/Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim new file mode 100644 index 00000000..7f03ea6a --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim @@ -0,0 +1,517 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_MoveHorizontal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.357, y: -0.1, z: -0.187} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: -0.024500012, y: -0.1, z: -0.34355554} + inSlope: {x: -2.1280582, y: 0, z: 0} + outSlope: {x: -2.1280582, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.2050302, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.41666666 + value: {x: -0.406, y: -0.1, z: -0.187} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6166667 + value: {x: -0.024500012, y: -0.1, z: -0.34355554} + inSlope: {x: 2.0244157, y: 0, z: 0} + outSlope: {x: 2.0244157, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.2224865, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 0.357, y: -0.1, z: -0.187} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.416, y: 0.15, z: -0.174} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0, y: 0.15, z: -0.33055553} + inSlope: {x: 1.9031452, y: 0, z: 0} + outSlope: {x: 1.9031452, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.2374525, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.41666666 + value: {x: 0.416, y: 0.15, z: -0.174} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6166667 + value: {x: 0, y: 0.15, z: -0.33055553} + inSlope: {x: -2.1315007, y: 0, z: 0} + outSlope: {x: -2.1315007, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.20440722, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: -0.416, y: 0.15, z: -0.174} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.357 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.024500012 + inSlope: -2.1280582 + outSlope: -2.1280582 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.2050302 + - serializedVersion: 3 + time: 0.41666666 + value: -0.406 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: -0.024500012 + inSlope: 2.0244157 + outSlope: 2.0244157 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.2224865 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.357 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.187 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.34355554 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.187 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: -0.34355554 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.187 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.416 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: 1.9031452 + outSlope: 1.9031452 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.2374525 + - serializedVersion: 3 + time: 0.41666666 + value: 0.416 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0 + inSlope: -2.1315007 + outSlope: -2.1315007 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.20440722 + - serializedVersion: 3 + time: 0.8333333 + value: -0.416 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.174 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.33055553 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.174 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: -0.33055553 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.174 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim.meta b/Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim.meta new file mode 100644 index 00000000..3205f016 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_MoveHorizontal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6701493e381514418599c0b2489ca73 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_MoveVertical.anim b/Source/Animations/Assets/Animation/FOF_MoveVertical.anim new file mode 100644 index 00000000..14a10995 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_MoveVertical.anim @@ -0,0 +1,622 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_MoveVertical + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.339, y: 0.25, z: -0.143} + inSlope: {x: 0, y: 0, z: -1.7979364} + outSlope: {x: 0, y: 0, z: -1.7979364} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.40794846} + - serializedVersion: 3 + time: 0.2 + value: {x: 0.20895922, y: 0.25, z: -0.40763113} + inSlope: {x: 0, y: 0, z: -0.28031746} + outSlope: {x: 0, y: 0, z: -0.28031746} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0.21099944, y: 0.25, z: -0.41} + inSlope: {x: 0.23870587, y: 0, z: 0} + outSlope: {x: 0.23870587, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.41666666 + value: {x: 0.3468782, y: -0.1, z: -0.16089152} + inSlope: {x: 0.23870587, y: 0, z: 1.904947} + outSlope: {x: 0.23870587, y: Infinity, z: 1.904947} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.43333334 + value: {x: 0.3489184, y: -0.1, z: -0.12910846} + inSlope: {x: 0, y: Infinity, z: 1.904947} + outSlope: {x: 0, y: Infinity, z: 1.904947} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6166667 + value: {x: 0.19810605, y: -0.1, z: 0.11752384} + inSlope: {x: 0, y: Infinity, z: 0.29306856} + outSlope: {x: 0, y: Infinity, z: 0.29306856} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6333333 + value: {x: 0.20047887, y: -0.1, z: 0.12} + inSlope: {x: 0.27704203, y: Infinity, z: 0} + outSlope: {x: 0.27704203, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 0.339, y: 0.25, z: -0.143} + inSlope: {x: 0, y: Infinity, z: -1.8214004} + outSlope: {x: 0, y: 0, z: -1.8214004} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.37562224} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.339, y: -0.1, z: -0.143} + inSlope: {x: 0, y: 0, z: 1.5761055} + outSlope: {x: 0, y: Infinity, z: 1.5761055} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.3950659} + - serializedVersion: 3 + time: 0.2 + value: {x: -0.22984499, y: -0.1, z: 0.11743597} + inSlope: {x: 0, y: Infinity, z: 0.30264223} + outSlope: {x: 0, y: Infinity, z: 0.30264223} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: -0.23186702, y: -0.1, z: 0.12} + inSlope: {x: -0.23608647, y: 0, z: 0} + outSlope: {x: -0.23608647, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.41666666 + value: {x: -0.34991026, y: 0.25, z: -0.12910849} + inSlope: {x: 0, y: 0, z: -1.904947} + outSlope: {x: 0, y: 0, z: -1.904947} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6333333 + value: {x: -0.19507343, y: 0.25, z: -0.41} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: -0.339, y: -0.1, z: -0.143} + inSlope: {x: 0, y: Infinity, z: 1.7595997} + outSlope: {x: 0, y: Infinity, z: 1.7595997} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.31514558} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.41666666 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8333333 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 934071076 + attribute: 3166393104 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 1 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.41666666 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.8333333 + value: 3e-45 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: Direction + path: BodyA + classID: 114 + script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + flags: 1 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.20895922 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0.3489184 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6166667 + value: 0.19810605 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: -0.1 + inSlope: Infinity + outSlope: 0 + tangentMode: 7 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.25 + inSlope: Infinity + outSlope: 0 + tangentMode: 7 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.143 + inSlope: -1.7979364 + outSlope: -1.7979364 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.40794846 + - serializedVersion: 3 + time: 0.21666667 + value: -0.41 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.143 + inSlope: -1.8214004 + outSlope: -1.8214004 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.37562224 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: -0.22984499 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: -0.34991026 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: -0.19507343 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.339 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.41666666 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.143 + inSlope: 1.5761055 + outSlope: 1.5761055 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.3950659 + - serializedVersion: 3 + time: 0.21666667 + value: 0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6333333 + value: -0.41 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.143 + inSlope: 1.7595997 + outSlope: 1.7595997 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.31514558 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_MoveVertical.anim.meta b/Source/Animations/Assets/Animation/FOF_MoveVertical.anim.meta new file mode 100644 index 00000000..254748ca --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_MoveVertical.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 662e8610a07da1449975d84b9771fc1a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/FOF_Uppercut.anim b/Source/Animations/Assets/Animation/FOF_Uppercut.anim new file mode 100644 index 00000000..7a2337b1 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_Uppercut.anim @@ -0,0 +1,544 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_Uppercut + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.17855048, y: 0.15, z: -0.198} + inSlope: {x: 0, y: 0, z: 1.2373252} + outSlope: {x: 5.9824843, y: 0, z: -2.3555014} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.5344767} + outWeight: {x: 0.27838758, y: 0.33333334, z: 0.25780466} + - serializedVersion: 3 + time: 0.05 + value: {x: 0.8082229, y: 0.15, z: 0.344} + inSlope: {x: 0.78583217, y: 0, z: 5.8257575} + outSlope: {x: 0.78583217, y: 0, z: 5.8257575} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.2728987, y: 0.33333334, z: 0.13293315} + outWeight: {x: 0.37650082, y: 0.33333334, z: 0.20154366} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 0.78610265, y: 0.15222636, z: 0.5606025} + inSlope: {x: 0, y: 0.029144881, z: 0} + outSlope: {x: 0, y: 0.029144881, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.7810029, y: 0.15277687, z: 0.5558319} + inSlope: {x: -0.2993352, y: 0, z: -0.28146556} + outSlope: {x: -0.2993352, y: 0, z: -0.28146556} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: -1.0684129} + outSlope: {x: 0, y: 0, z: -1.0684129} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.19485411} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 0.332, y: 0.15, z: -0.05} + inSlope: {x: 0, y: 0, z: 1.3587863} + outSlope: {x: -0.613798, y: 0, z: 1.3587863} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.15552759} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.19485411} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandB + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.42559007, y: 0.25, z: 0.04659006} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.05 + value: {x: 0.38923705, y: 0.25, z: -0.029310953} + inSlope: {x: -1.1631614, y: 0, z: -2.3941207} + outSlope: {x: -1.1631614, y: 0, z: -2.3941207} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 0.33836997, y: 0.25, z: -0.12863004} + inSlope: {x: -0.5805612, y: 0, z: -0.93672305} + outSlope: {x: -0.5805612, y: 0, z: -0.93672305} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.13929467, y: 0.33333334, z: 0.10886623} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.33045694, y: 0.25, z: -0.16018814} + inSlope: {x: 0.28206626, y: 0, z: -0.06375063} + outSlope: {x: 0.28206626, y: 0, z: -0.06375063} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.4 + value: {x: 0.499, y: 0.25, z: -0.038} + inSlope: {x: 0.414053, y: 0, z: 0.45287654} + outSlope: {x: 0.414053, y: 0, z: 0.45287654} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: 0.6547245} + outSlope: {x: 0, y: 0, z: 0.6547245} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.23186779} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 0.573, y: 0.25, z: 0.128} + inSlope: {x: 0, y: 0, z: 0.1160129} + outSlope: {x: 0, y: 0, z: 0.1160129} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.1689167} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: HandA + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4130413766 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1865960828 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.9166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.17855048 + inSlope: 0 + outSlope: 5.9824843 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.27838758 + - serializedVersion: 3 + time: 0.05 + value: 0.8082229 + inSlope: 0.78583217 + outSlope: 0.78583217 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.2728987 + outWeight: 0.37650082 + - serializedVersion: 3 + time: 0.13333334 + value: 0.78610265 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.332 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.332 + inSlope: 0 + outSlope: -0.613798 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.15277687 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.198 + inSlope: 1.2373252 + outSlope: -2.3555014 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.5344767 + outWeight: 0.25780466 + - serializedVersion: 3 + time: 0.05 + value: 0.344 + inSlope: 5.8257575 + outSlope: 5.8257575 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.13293315 + outWeight: 0.20154366 + - serializedVersion: 3 + time: 0.13333334 + value: 0.5606025 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -0.05 + inSlope: -1.0684129 + outSlope: -1.0684129 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.19485411 + - serializedVersion: 3 + time: 0.9166667 + value: -0.05 + inSlope: 1.3587863 + outSlope: 1.3587863 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.15552759 + outWeight: 0.19485411 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandB + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.42559007 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.33836997 + inSlope: -0.5805612 + outSlope: -0.5805612 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.13929467 + - serializedVersion: 3 + time: 0.4 + value: 0.499 + inSlope: 0.414053 + outSlope: 0.414053 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.573 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.05 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0.25 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.04659006 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -0.12863004 + inSlope: -0.93672305 + outSlope: -0.93672305 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.10886623 + - serializedVersion: 3 + time: 0.4 + value: -0.038 + inSlope: 0.45287654 + outSlope: 0.45287654 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.128 + inSlope: 0.6547245 + outSlope: 0.6547245 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.23186779 + - serializedVersion: 3 + time: 0.9166667 + value: 0.128 + inSlope: 0.1160129 + outSlope: 0.1160129 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.1689167 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: HandA + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Source/Animations/Assets/Animation/FOF_Uppercut.anim.meta b/Source/Animations/Assets/Animation/FOF_Uppercut.anim.meta new file mode 100644 index 00000000..317c0ee6 --- /dev/null +++ b/Source/Animations/Assets/Animation/FOF_Uppercut.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb728b95338c57446bcec588f6a32017 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller b/Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller new file mode 100644 index 00000000..58b10825 --- /dev/null +++ b/Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller @@ -0,0 +1,333 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8052826254145657621 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_JabSouth + 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: 7400000, guid: 01ab1ffb312f8ca4dbc7bedca49c5f6f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4824087468077411918 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_Uppercut + 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: 7400000, guid: eb728b95338c57446bcec588f6a32017, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2969765494451686056 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_CrossHighHorizontal + 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: 7400000, guid: e13c5828a6c64dc49b5c89493bafa2e3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2966949396794874009 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_MoveVertical + 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: 7400000, guid: 662e8610a07da1449975d84b9771fc1a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2742747173866105437 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_JabHorizontal + 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: 7400000, guid: b30d05d0737c3fc4288ecc52302db701, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-1406282831380350225 +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: 6376313504249517768} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -798428168349807222} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2742747173866105437} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3953810177321134364} + m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4824087468077411918} + m_Position: {x: 340, y: 260, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2969765494451686056} + m_Position: {x: 375, y: 325, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3889883522413643985} + m_Position: {x: 410, y: 390, z: 0} + - serializedVersion: 1 + m_State: {fileID: 550110661280990329} + m_Position: {x: 445, y: 455, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8052826254145657621} + m_Position: {x: 480, y: 520, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2966949396794874009} + m_Position: {x: 515, y: 585, 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: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6376313504249517768} +--- !u!1102 &-798428168349807222 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_FightingHorizontal + 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: 7400000, guid: 1a851aab1863ac043923cfe89adfb083, 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: _FistsOfFuryControllerSolo + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1406282831380350225} + 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 &550110661280990329 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_FightingVertical + 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: 7400000, guid: f942a990d6340e045a1878c74b0f8a91, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3889883522413643985 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_Idle + 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: 7400000, guid: 1a9d6f4a8e5e5dd4f861c7fb3ec2f7aa, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3953810177321134364 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_CrossHorizontal + 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: 7400000, guid: adb86060038774d4c8100a24ae60b798, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6376313504249517768 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FOF_MoveSouth + 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: 7400000, guid: d6701493e381514418599c0b2489ca73, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller.meta b/Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller.meta new file mode 100644 index 00000000..c0fa9601 --- /dev/null +++ b/Source/Animations/Assets/Animation/_FistsOfFuryControllerSolo.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65811b72c281da243bde4dd8d449a755 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Assets/EditorRenderer.cs b/Source/Animations/Assets/EditorRenderer.cs index b53157cd..2f9c717e 100644 --- a/Source/Animations/Assets/EditorRenderer.cs +++ b/Source/Animations/Assets/EditorRenderer.cs @@ -122,6 +122,12 @@ private static Type GetType(string name) private IEnumerator SaveCoroutine(AnimationDataCreator t, AnimationClip clip) { + if (!EnsureSaveLocation()) + { + Debug.LogWarning("Export cancelled."); + yield break; + } + yield return null; window.recording = false; @@ -138,6 +144,12 @@ private IEnumerator SaveCoroutine(AnimationDataCreator t, AnimationClip clip) private IEnumerator SaveAllCoroutine(AnimationDataCreator t) { + if (!EnsureSaveLocation()) + { + Debug.LogWarning("Export cancelled."); + yield break; + } + yield return null; var controller = t.GetComponent(); @@ -159,16 +171,30 @@ private IEnumerator SaveAllCoroutine(AnimationDataCreator t) } } + private static bool EnsureSaveLocation() + { + if (IsValid()) + return true; + + EditorUtility.DisplayDialog("Set Output Folder", "You must pick an output folder for the animations.\nPlease select the 'Animations' folder in your mod.", "Ok"); + + ExportHelper.ShowChangeExportLocationDialogue(); + return IsValid(); + + static bool IsValid() => !string.IsNullOrEmpty(ExportHelper.OutputDirectoryPath) && Directory.Exists(ExportHelper.OutputDirectoryPath); + } + private Rect Save(AnimationDataCreator t, AnimationClip clip) { - string FILE = @$"../..\Animations\{clip.name}.json"; + string fileName = $"{clip.name}.json"; + string file = Path.Combine(ExportHelper.OutputDirectoryPath, fileName); var bounds = PopulateSweeps(clip, t); string json = AnimData.Save(clip, t, bounds); - File.WriteAllText(FILE, json); + File.WriteAllText(file, json); - Debug.Log($"Wrote {clip.name} in {new FileInfo(FILE).Length / 1024f:F1} Kb to {new FileInfo(FILE).FullName}. Bounds: {bounds}"); + Debug.Log($"Wrote {clip.name} in {new FileInfo(file).Length / 1024f:F1} Kb to {new FileInfo(file).FullName}. Bounds: {bounds}"); return bounds; } diff --git a/Source/Animations/Assets/Resources/SpriteMat.mat b/Source/Animations/Assets/Resources/SpriteMat.mat index 7c1b7ee4..36083b46 100644 --- a/Source/Animations/Assets/Resources/SpriteMat.mat +++ b/Source/Animations/Assets/Resources/SpriteMat.mat @@ -135,6 +135,7 @@ Material: - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &7475857324708480414 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/Source/Animations/Assets/Scenes/SampleScene.unity b/Source/Animations/Assets/Scenes/SampleScene.unity index 87b19509..096fc72a 100644 --- a/Source/Animations/Assets/Scenes/SampleScene.unity +++ b/Source/Animations/Assets/Scenes/SampleScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 1 m_FogColor: {r: 0.65080994, g: 0.666729, b: 0.7075472, a: 1} m_FogMode: 3 @@ -44,7 +44,6 @@ RenderSettings: LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 12 - m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 0 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 1 m_BakeBackend: 1 @@ -628,6 +624,68 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &110140248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 110140249} + - component: {fileID: 110140250} + m_Layer: 0 + m_Name: HeadB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &110140249 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 110140248} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.11, y: 0.05, z: -0.327} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1705354041} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &110140250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 110140248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HeadB + TexturePath: Female_Average_Normal_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0.1, y: 0.34} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 1 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &110630908 GameObject: m_ObjectHideFlags: 0 @@ -752,6 +810,68 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 176844402} SplitDrawMode: 0 +--- !u!1 &114701327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114701328} + - component: {fileID: 114701329} + m_Layer: 0 + m_Name: Clothes IGNORED + m_TagString: AnimIgnore + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &114701328 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114701327} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.026061773, z: 0} + m_LocalScale: {x: 3.2099998, y: 1, z: 1.9699999} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1730186973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114701329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114701327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: + TexturePath: AM/Weapons/Weebstick_Glint + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 54 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0, g: 0.29352832, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &128419373 GameObject: m_ObjectHideFlags: 0 @@ -943,6 +1063,82 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 1744158425} SplitDrawMode: 2 +--- !u!1 &153692503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 153692504} + - component: {fileID: 153692506} + - component: {fileID: 153692505} + m_Layer: 0 + m_Name: BodyB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &153692504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153692503} + serializedVersion: 2 + 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: 454409610} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &153692505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153692503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + m_Name: + m_EditorClassIdentifier: + Direction: 3 +--- !u!114 &153692506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153692503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: BodyB + TexturePath: Naked_Female_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 1 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &154945084 GameObject: m_ObjectHideFlags: 0 @@ -1420,6 +1616,68 @@ Transform: - {fileID: 416506342} m_Father: {fileID: 890458934} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &203053820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 203053821} + - component: {fileID: 203053822} + m_Layer: 0 + m_Name: HandB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &203053821 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203053820} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.146, y: -0.05, z: -0.011} + m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 792937248} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &203053822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203053820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HandB + TexturePath: + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &204324821 GameObject: m_ObjectHideFlags: 0 @@ -1668,7 +1926,7 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &262066802 +--- !u!1 &273804156 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1676,70 +1934,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 262066803} - - component: {fileID: 262066805} - - component: {fileID: 262066804} + - component: {fileID: 273804157} + - component: {fileID: 273804158} m_Layer: 0 - m_Name: BodyA - m_TagString: Untagged + m_Name: Clothes IGNORED + m_TagString: AnimIgnore m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &262066803 + m_IsActive: 0 +--- !u!4 &273804157 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262066802} + m_GameObject: {fileID: 273804156} serializedVersion: 2 - 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.026061773, z: 0} + m_LocalScale: {x: 3.2099998, y: 1, z: 1.9699999} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2096330808} - - {fileID: 1540955982} - - {fileID: 1590016865} - - {fileID: 872575473} - m_Father: {fileID: 558904575} + m_Children: [] + m_Father: {fileID: 1437817306} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &262066804 +--- !u!114 &273804158 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262066802} + m_GameObject: {fileID: 273804156} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: - Direction: 1 ---- !u!114 &262066805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262066802} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} - m_Name: - m_EditorClassIdentifier: - CustomName: BodyA - TexturePath: Naked_Female_east - DoNotIncludeTexture: 1 + CustomName: + TexturePath: AM/Weapons/Weebstick_Glint + DoNotIncludeTexture: 0 IdleOffset: {x: 0, y: 0} - IdleRotation: 0 - IdleScale: {x: 1.5, y: 1.5} + IdleRotation: 54 + IdleScale: {x: 1, y: 1} IdleFlipX: 0 IdleFlipY: 0 TransparentByDefault: 0 - Tint: {r: 1, g: 1, b: 1, a: 1} + Tint: {r: 0, g: 0.29352832, b: 1, a: 1} DataA: 0 DataB: 0 DataC: 0 @@ -1748,7 +1988,7 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &273804156 +--- !u!1 &285905452 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1756,52 +1996,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 273804157} - - component: {fileID: 273804158} + - component: {fileID: 285905453} + - component: {fileID: 285905454} m_Layer: 0 - m_Name: Clothes IGNORED - m_TagString: AnimIgnore + m_Name: HandGrabSparks + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &273804157 +--- !u!4 &285905453 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 273804156} + m_GameObject: {fileID: 285905452} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.026061773, z: 0} - m_LocalScale: {x: 3.2099998, y: 1, z: 1.9699999} + 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: 1437817306} + m_Father: {fileID: 1047008476} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &273804158 +--- !u!114 &285905454 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 273804156} + m_GameObject: {fileID: 285905452} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: CustomName: - TexturePath: AM/Weapons/Weebstick_Glint + TexturePath: AM/HandGrabSparks DoNotIncludeTexture: 0 IdleOffset: {x: 0, y: 0} - IdleRotation: 54 + IdleRotation: 0 IdleScale: {x: 1, y: 1} IdleFlipX: 0 IdleFlipY: 0 TransparentByDefault: 0 - Tint: {r: 0, g: 0.29352832, b: 1, a: 1} + Tint: {r: 1, g: 1, b: 1, a: 1} DataA: 0 DataB: 0 DataC: 0 @@ -2002,7 +2242,7 @@ GameObject: m_IsActive: 0 --- !u!95 &336344998 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2016,6 +2256,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -2130,6 +2371,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2294,6 +2538,146 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &371353037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 371353038} + - component: {fileID: 371353040} + - component: {fileID: 371353039} + m_Layer: 0 + m_Name: BodyA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &371353038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371353037} + serializedVersion: 2 + 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: + - {fileID: 1417317145} + - {fileID: 825323544} + m_Father: {fileID: 485215799} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &371353039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371353037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + m_Name: + m_EditorClassIdentifier: + Direction: 3 +--- !u!114 &371353040 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371353037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: BodyA + TexturePath: Naked_Female_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 1 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 +--- !u!1 &381651223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 381651224} + - component: {fileID: 381651225} + m_Layer: 0 + m_Name: HandGrabSparks + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &381651224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381651223} + serializedVersion: 2 + 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: 485215799} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &381651225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 381651223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: + TexturePath: AM/HandGrabSparks + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &392469733 GameObject: m_ObjectHideFlags: 0 @@ -2638,6 +3022,39 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &454409609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 454409610} + m_Layer: 0 + m_Name: PawnBContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &454409610 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454409609} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1705354041} + - {fileID: 153692504} + m_Father: {fileID: 1047008476} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &473008353 GameObject: m_ObjectHideFlags: 0 @@ -2764,7 +3181,7 @@ Transform: - {fileID: 564682611} m_Father: {fileID: 1955818713} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &500098915 +--- !u!1 &485215796 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2772,40 +3189,131 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 500098916} - - component: {fileID: 500098917} + - component: {fileID: 485215799} + - component: {fileID: 485215798} + - component: {fileID: 485215797} m_Layer: 0 - m_Name: Portal + m_Name: TEMP_ENEMY m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &500098916 +--- !u!95 &485215797 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485215796} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 65811b72c281da243bde4dd8d449a755, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &485215798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 485215796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} + m_Name: + m_EditorClassIdentifier: + Clip: {fileID: 7400000, guid: d6701493e381514418599c0b2489ca73, type: 2} + SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} + AllowLoadingFromJson: 0 + SweepDisplayMode: 3 + SweepGhostTime: 0.25 + OverridePairs: + - PartName: HandA + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandB + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandA2 + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandB2 + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + InspectAllCurves: 0 + Points: [] + MirrorHorizontal: 0 + MirrorVertical: 0 +--- !u!4 &485215799 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500098915} + m_GameObject: {fileID: 485215796} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 860491604} + m_Children: + - {fileID: 371353038} + - {fileID: 381651224} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &500098917 -MonoBehaviour: +--- !u!1 &500098915 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500098915} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + serializedVersion: 6 + m_Component: + - component: {fileID: 500098916} + - component: {fileID: 500098917} + m_Layer: 0 + m_Name: Portal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &500098916 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500098915} + serializedVersion: 2 + 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: 860491604} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &500098917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500098915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: CustomName: @@ -2970,7 +3478,7 @@ GameObject: m_IsActive: 0 --- !u!95 &523862468 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2984,6 +3492,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -3001,7 +3510,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} m_Name: m_EditorClassIdentifier: - Clip: {fileID: 7400000, guid: dfed3fb91ddbcf241950b5516684c437, type: 2} + Clip: {fileID: 7400000, guid: 0e70444c0dd186e4d826cc2a72ce3755, type: 2} SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} AllowLoadingFromJson: 0 SweepDisplayMode: 3 @@ -3196,6 +3705,68 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Direction: 1 +--- !u!1 &549637500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 549637501} + - component: {fileID: 549637502} + m_Layer: 0 + m_Name: HandA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &549637501 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 549637500} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.05, z: 0} + m_LocalScale: {x: 0.175, y: 0.17500001, z: 0.175} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 737143570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &549637502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 549637500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HandA2 + TexturePath: + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &550200955 GameObject: m_ObjectHideFlags: 0 @@ -3336,96 +3907,6 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &558904572 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 558904575} - - component: {fileID: 558904574} - - component: {fileID: 558904573} - m_Layer: 0 - m_Name: Pawn Pair Unarmed - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!95 &558904573 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558904572} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 699e16f58d4eb2c4fb3230412e22ac45, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &558904574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558904572} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} - m_Name: - m_EditorClassIdentifier: - Clip: {fileID: 7400000, guid: 9dfe9c1c254de834b918925eb19a39f7, type: 2} - SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} - AllowLoadingFromJson: 0 - SweepDisplayMode: 3 - SweepGhostTime: 0.25 - OverridePairs: - - PartName: HandA - Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} - PreventDraw: 0 - - PartName: HandB - Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} - PreventDraw: 0 - - PartName: HandA2 - Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} - PreventDraw: 0 - - PartName: HandB2 - Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} - PreventDraw: 0 - InspectAllCurves: 0 - Points: [] - MirrorHorizontal: 0 - MirrorVertical: 0 ---- !u!4 &558904575 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558904572} - serializedVersion: 2 - 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: - - {fileID: 262066803} - - {fileID: 2112027106} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &564682610 GameObject: m_ObjectHideFlags: 0 @@ -4020,6 +4501,57 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 1170415614} SplitDrawMode: 0 +--- !u!1 &658869361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 658869362} + - component: {fileID: 658869363} + m_Layer: 0 + m_Name: Sweeper + m_TagString: AnimIgnore + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &658869362 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658869361} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325136785} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!114 &658869363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658869361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13855950eb4b2c540afe94c38843ef05, type: 3} + m_Name: + m_EditorClassIdentifier: + ForPart: {fileID: 1325136784} + Mesh: {fileID: 0} + UpDst: 0.8 + DownDst: 0 + MakeMesh: 0 + Filter: {fileID: 343237697} + GhostTime: 1 --- !u!1 &660689195 GameObject: m_ObjectHideFlags: 0 @@ -4304,6 +4836,40 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &737143569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 737143570} + m_Layer: 0 + m_Name: PawnBHolding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &737143570 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 737143569} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 549637501} + - {fileID: 1704769554} + - {fileID: 1325136785} + m_Father: {fileID: 1047008476} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &739240441 GameObject: m_ObjectHideFlags: 0 @@ -4381,7 +4947,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Direction: 3 ---- !u!1 &759602320 +--- !u!1 &758745600 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4389,36 +4955,129 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 759602321} - - component: {fileID: 759602322} - - component: {fileID: 759602323} + - component: {fileID: 758745603} + - component: {fileID: 758745602} + - component: {fileID: 758745601} m_Layer: 0 - m_Name: BodyA + m_Name: Pawn Solo FISTS OF FURY m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &759602321 -Transform: +--- !u!95 &758745601 +Animator: + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 759602320} - serializedVersion: 2 - 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: - - {fileID: 1602439824} - - {fileID: 1126629422} - m_Father: {fileID: 890458934} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &759602322 -MonoBehaviour: - m_ObjectHideFlags: 0 + m_GameObject: {fileID: 758745600} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 65811b72c281da243bde4dd8d449a755, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &758745602 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758745600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} + m_Name: + m_EditorClassIdentifier: + Clip: {fileID: 7400000, guid: 662e8610a07da1449975d84b9771fc1a, type: 2} + SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} + AllowLoadingFromJson: 0 + SweepDisplayMode: 3 + SweepGhostTime: 0.25 + OverridePairs: + - PartName: HandA + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandB + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandA2 + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandB2 + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + InspectAllCurves: 0 + Points: [] + MirrorHorizontal: 0 + MirrorVertical: 0 +--- !u!4 &758745603 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758745600} + serializedVersion: 2 + 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: + - {fileID: 1730186973} + - {fileID: 765970810} + - {fileID: 971596377} + - {fileID: 801657218} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &759602320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 759602321} + - component: {fileID: 759602322} + - component: {fileID: 759602323} + m_Layer: 0 + m_Name: BodyA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &759602321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 759602320} + serializedVersion: 2 + 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: + - {fileID: 1602439824} + - {fileID: 1126629422} + m_Father: {fileID: 890458934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &759602322 +MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4459,7 +5118,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Direction: 1 ---- !u!1 &762661941 +--- !u!1 &765970809 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4467,8 +5126,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 762661942} - - component: {fileID: 762661943} + - component: {fileID: 765970810} + - component: {fileID: 765970811} m_Layer: 0 m_Name: HandA m_TagString: Untagged @@ -4476,34 +5135,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &762661942 +--- !u!4 &765970810 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 762661941} + m_GameObject: {fileID: 765970809} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.414, y: 0.25, z: 0.115} + m_LocalPosition: {x: 0.573, y: 0.25, z: 0.128} m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2112027106} + m_Father: {fileID: 758745603} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &762661943 +--- !u!114 &765970811 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 762661941} + m_GameObject: {fileID: 765970809} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: - CustomName: HandA2 + CustomName: HandA TexturePath: DoNotIncludeTexture: 0 IdleOffset: {x: 0, y: 0} @@ -4521,6 +5180,40 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &792937247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 792937248} + m_Layer: 0 + m_Name: PawnAHolding + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &792937248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792937247} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1492750094} + - {fileID: 203053821} + - {fileID: 981850622} + m_Father: {fileID: 1047008476} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &794315270 GameObject: m_ObjectHideFlags: 0 @@ -4583,6 +5276,68 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &801657217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 801657218} + - component: {fileID: 801657219} + m_Layer: 0 + m_Name: HandGrabSparks + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &801657218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 801657217} + serializedVersion: 2 + 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: 758745603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &801657219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 801657217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: + TexturePath: AM/HandGrabSparks + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &801686177 GameObject: m_ObjectHideFlags: 0 @@ -4803,7 +5558,7 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &830711226 +--- !u!1 &825323543 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4811,52 +5566,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 830711227} - - component: {fileID: 830711228} + - component: {fileID: 825323544} + - component: {fileID: 825323545} m_Layer: 0 - m_Name: HandB - m_TagString: Untagged + m_Name: Clothes IGNORED + m_TagString: AnimIgnore m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &830711227 + m_IsActive: 0 +--- !u!4 &825323544 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 830711226} + m_GameObject: {fileID: 825323543} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.174, y: 0.15, z: -0.071} - m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} + m_LocalPosition: {x: 0, y: 0.026061773, z: 0} + m_LocalScale: {x: 3.2099998, y: 1, z: 1.9699999} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2112027106} + m_Father: {fileID: 371353038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &830711228 +--- !u!114 &825323545 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 830711226} + m_GameObject: {fileID: 825323543} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: - CustomName: HandB2 - TexturePath: + CustomName: + TexturePath: AM/Weapons/Weebstick_Glint DoNotIncludeTexture: 0 IdleOffset: {x: 0, y: 0} - IdleRotation: 0 + IdleRotation: 54 IdleScale: {x: 1, y: 1} IdleFlipX: 0 IdleFlipY: 0 TransparentByDefault: 0 - Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + Tint: {r: 0, g: 0.29352832, b: 1, a: 1} DataA: 0 DataB: 0 DataC: 0 @@ -5275,68 +6030,6 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &872575472 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 872575473} - - component: {fileID: 872575474} - m_Layer: 0 - m_Name: HandB - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &872575473 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872575472} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.174, y: 0.15, z: -0.071} - m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 262066803} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &872575474 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 872575472} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} - m_Name: - m_EditorClassIdentifier: - CustomName: HandB - TexturePath: - DoNotIncludeTexture: 0 - IdleOffset: {x: 0, y: 0} - IdleRotation: 0 - IdleScale: {x: 1, y: 1} - IdleFlipX: 0 - IdleFlipY: 0 - TransparentByDefault: 0 - Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} - DataA: 0 - DataB: 0 - DataC: 0 - FlipX: 0 - FlipY: 0 - FrameIndex: 0 - SplitDrawPivot: {fileID: 0} - SplitDrawMode: 0 --- !u!1 &888116117 GameObject: m_ObjectHideFlags: 0 @@ -5419,7 +6112,7 @@ GameObject: m_IsActive: 0 --- !u!95 &890458932 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5433,6 +6126,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -5581,7 +6275,7 @@ GameObject: m_IsActive: 0 --- !u!95 &913407782 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5595,6 +6289,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -5959,7 +6654,7 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &972698377 +--- !u!1 &971596376 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5967,24 +6662,86 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 972698378} + - component: {fileID: 971596377} + - component: {fileID: 971596378} m_Layer: 0 - m_Name: TurnRopeR + m_Name: HandB m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &972698378 +--- !u!4 &971596377 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 972698377} + m_GameObject: {fileID: 971596376} serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.97685933, z: 0, w: 0.21388295} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.332, y: 0.15, z: -0.05} + m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 758745603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971596378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971596376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HandB + TexturePath: + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 +--- !u!1 &972698377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 972698378} + m_Layer: 0 + m_Name: TurnRopeR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &972698378 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 972698377} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.97685933, z: 0, w: 0.21388295} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -6181,6 +6938,120 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &981850621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981850622} + - component: {fileID: 981850623} + m_Layer: 0 + m_Name: ItemA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &981850622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981850621} + serializedVersion: 2 + 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: + - {fileID: 987345544} + m_Father: {fileID: 792937248} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &981850623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981850621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: ItemA + TexturePath: LongSword + DoNotIncludeTexture: 1 + IdleOffset: {x: 0.34, y: -0.03} + IdleRotation: 0 + IdleScale: {x: 1.1, y: 1.1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 1509840458} + SplitDrawMode: 0 +--- !u!1 &987345543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 987345544} + - component: {fileID: 987345545} + m_Layer: 0 + m_Name: Sweeper + m_TagString: AnimIgnore + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &987345544 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987345543} + serializedVersion: 2 + 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: 981850622} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &987345545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987345543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13855950eb4b2c540afe94c38843ef05, type: 3} + m_Name: + m_EditorClassIdentifier: + ForPart: {fileID: 981850621} + Mesh: {fileID: 0} + UpDst: 0.8 + DownDst: 0 + MakeMesh: 0 + Filter: {fileID: 343237697} + GhostTime: 1 --- !u!1 &987502971 GameObject: m_ObjectHideFlags: 0 @@ -6215,6 +7086,68 @@ Transform: - {fileID: 187991164} m_Father: {fileID: 1768372577} m_LocalEulerAnglesHint: {x: 0, y: -36.057, z: 0} +--- !u!1 &991767867 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 991767868} + - component: {fileID: 991767869} + m_Layer: 0 + m_Name: Clothes IGNORED + m_TagString: AnimIgnore + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &991767868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991767867} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.026061773, z: 0} + m_LocalScale: {x: 3.2099998, y: 1, z: 1.9699999} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1897604950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &991767869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991767867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: + TexturePath: AM/Weapons/Weebstick_Glint + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 54 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0, g: 0.29352832, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1012855610 GameObject: m_ObjectHideFlags: 0 @@ -6394,6 +7327,102 @@ Transform: - {fileID: 1143557291} m_Father: {fileID: 1886388652} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -67.293} +--- !u!1 &1047008473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047008476} + - component: {fileID: 1047008475} + - component: {fileID: 1047008474} + m_Layer: 0 + m_Name: Pawn Pair Detatched Head FISTS OF FURY + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!95 &1047008474 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047008473} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c46ae82709ec0074f873709b14030b8c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1047008475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047008473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} + m_Name: + m_EditorClassIdentifier: + Clip: {fileID: 7400000, guid: bcae8537e1b822f47a1ac9e81cc5903a, type: 2} + SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} + AllowLoadingFromJson: 0 + SweepDisplayMode: 3 + SweepGhostTime: 0.25 + OverridePairs: + - PartName: HandA + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandB + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandA2 + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + - PartName: HandB2 + Texture: {fileID: 2800000, guid: c1217ca012db3f64ba08c19db5e8cec1, type: 3} + PreventDraw: 0 + InspectAllCurves: 0 + Points: [] + MirrorHorizontal: 0 + MirrorVertical: 0 +--- !u!4 &1047008476 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047008473} + serializedVersion: 2 + 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: + - {fileID: 1897604950} + - {fileID: 792937248} + - {fileID: 737143570} + - {fileID: 285905453} + - {fileID: 1509840457} + - {fileID: 1530285102} + - {fileID: 454409610} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1049297084 GameObject: m_ObjectHideFlags: 0 @@ -7239,6 +8268,37 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &1156962770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1156962771} + m_Layer: 0 + m_Name: ------------------------------------------------ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1156962771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1156962770} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.6496845, y: -0.000000020475019, z: 0.17175692} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1165899524 GameObject: m_ObjectHideFlags: 0 @@ -7744,6 +8804,69 @@ MonoBehaviour: MakeMesh: 0 Filter: {fileID: 343237697} GhostTime: 1 +--- !u!1 &1325136784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325136785} + - component: {fileID: 1325136786} + m_Layer: 0 + m_Name: ItemB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1325136785 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325136784} + serializedVersion: 2 + 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: + - {fileID: 658869362} + m_Father: {fileID: 737143570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1325136786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325136784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: ItemB + TexturePath: LongSword + DoNotIncludeTexture: 1 + IdleOffset: {x: 0.34, y: -0.03} + IdleRotation: 0 + IdleScale: {x: 1.1, y: 1.1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 1 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1345851103 GameObject: m_ObjectHideFlags: 0 @@ -7930,68 +9053,6 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &1373644818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1373644819} - - component: {fileID: 1373644820} - m_Layer: 0 - m_Name: HeadB - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1373644819 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373644818} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.05, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2112027106} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1373644820 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1373644818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} - m_Name: - m_EditorClassIdentifier: - CustomName: HeadB - TexturePath: Female_Average_Normal_east - DoNotIncludeTexture: 1 - IdleOffset: {x: 0.1, y: 0.34} - IdleRotation: 0 - IdleScale: {x: 1.5, y: 1.5} - IdleFlipX: 0 - IdleFlipY: 0 - TransparentByDefault: 0 - Tint: {r: 1, g: 1, b: 1, a: 1} - DataA: 0 - DataB: 0 - DataC: 0 - FlipX: 1 - FlipY: 0 - FrameIndex: 0 - SplitDrawPivot: {fileID: 0} - SplitDrawMode: 0 --- !u!1 &1374060897 GameObject: m_ObjectHideFlags: 0 @@ -8150,6 +9211,68 @@ Transform: - {fileID: 188105328} m_Father: {fileID: 1914720448} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1417317144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1417317145} + - component: {fileID: 1417317146} + m_Layer: 0 + m_Name: HeadA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1417317145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417317144} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 371353038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1417317146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417317144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HeadA + TexturePath: Female_Average_Normal_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0.1, y: 0.34} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 1 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1429335593 GameObject: m_ObjectHideFlags: 0 @@ -8598,6 +9721,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8646,6 +9772,68 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1492750093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1492750094} + - component: {fileID: 1492750095} + m_Layer: 0 + m_Name: HandA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1492750094 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492750093} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.05, z: 0} + m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 792937248} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1492750095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1492750093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HandA + TexturePath: + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1495901740 GameObject: m_ObjectHideFlags: 0 @@ -8793,6 +9981,68 @@ Transform: - {fileID: 2091834493} m_Father: {fileID: 336345000} m_LocalEulerAnglesHint: {x: 0, y: 33.687, z: 0} +--- !u!1 &1509840456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1509840457} + - component: {fileID: 1509840458} + m_Layer: 0 + m_Name: WeaponACutoff + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1509840457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509840456} + serializedVersion: 2 + 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: 1047008476} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1509840458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509840456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: + TexturePath: + DoNotIncludeTexture: 1 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1512001849 GameObject: m_ObjectHideFlags: 0 @@ -9128,7 +10378,7 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &1531572618 +--- !u!1 &1530285101 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9136,45 +10386,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1531572619} - - component: {fileID: 1531572620} + - component: {fileID: 1530285102} + - component: {fileID: 1530285103} m_Layer: 0 - m_Name: HandB + m_Name: QuestionMark m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1531572619 + m_IsActive: 0 +--- !u!4 &1530285102 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531572618} + m_GameObject: {fileID: 1530285101} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.146, y: -0.05, z: -0.011} - m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 250038063} - m_Father: {fileID: 987502972} + m_Children: [] + m_Father: {fileID: 1047008476} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1531572620 +--- !u!114 &1530285103 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531572618} + m_GameObject: {fileID: 1530285101} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: - CustomName: HandB - TexturePath: + CustomName: + TexturePath: AM/QuestionMark DoNotIncludeTexture: 0 IdleOffset: {x: 0, y: 0} IdleRotation: 0 @@ -9182,7 +10431,7 @@ MonoBehaviour: IdleFlipX: 0 IdleFlipY: 0 TransparentByDefault: 0 - Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + Tint: {r: 1, g: 1, b: 1, a: 1} DataA: 0 DataB: 0 DataC: 0 @@ -9191,7 +10440,7 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &1540955981 +--- !u!1 &1531572618 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9199,52 +10448,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1540955982} - - component: {fileID: 1540955983} + - component: {fileID: 1531572619} + - component: {fileID: 1531572620} m_Layer: 0 - m_Name: Clothes IGNORED - m_TagString: AnimIgnore + m_Name: HandB + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1540955982 + m_IsActive: 1 +--- !u!4 &1531572619 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540955981} + m_GameObject: {fileID: 1531572618} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.026061773, z: 0} - m_LocalScale: {x: 3.2099998, y: 1, z: 1.9699999} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.146, y: -0.05, z: -0.011} + m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 262066803} + m_Children: + - {fileID: 250038063} + m_Father: {fileID: 987502972} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1540955983 +--- !u!114 &1531572620 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540955981} + m_GameObject: {fileID: 1531572618} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} m_Name: m_EditorClassIdentifier: - CustomName: - TexturePath: AM/Weapons/Weebstick_Glint + CustomName: HandB + TexturePath: DoNotIncludeTexture: 0 IdleOffset: {x: 0, y: 0} - IdleRotation: 54 + IdleRotation: 0 IdleScale: {x: 1, y: 1} IdleFlipX: 0 IdleFlipY: 0 TransparentByDefault: 0 - Tint: {r: 0, g: 0.29352832, b: 1, a: 1} + Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} DataA: 0 DataB: 0 DataC: 0 @@ -9273,7 +10523,7 @@ GameObject: m_IsActive: 0 --- !u!95 &1550348912 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -9287,6 +10537,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -9304,7 +10555,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} m_Name: m_EditorClassIdentifier: - Clip: {fileID: 7400000, guid: 9f75553351a41154994dcbc5ee0c26ad, type: 2} + Clip: {fileID: 7400000, guid: fa62f4d96a1e87840842b2d3f564273d, type: 2} SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} AllowLoadingFromJson: 0 SweepDisplayMode: 3 @@ -9439,68 +10690,6 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 ---- !u!1 &1590016864 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1590016865} - - component: {fileID: 1590016866} - m_Layer: 0 - m_Name: HandA - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1590016865 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590016864} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.414, y: 0.25, z: 0.115} - m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 262066803} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1590016866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1590016864} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} - m_Name: - m_EditorClassIdentifier: - CustomName: HandA - TexturePath: - DoNotIncludeTexture: 0 - IdleOffset: {x: 0, y: 0} - IdleRotation: 0 - IdleScale: {x: 1, y: 1} - IdleFlipX: 0 - IdleFlipY: 0 - TransparentByDefault: 0 - Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} - DataA: 0 - DataB: 0 - DataC: 0 - FlipX: 0 - FlipY: 0 - FrameIndex: 0 - SplitDrawPivot: {fileID: 0} - SplitDrawMode: 0 --- !u!1 &1598721913 GameObject: m_ObjectHideFlags: 0 @@ -10092,10 +11281,10 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!95 &1694323722 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10109,6 +11298,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -10170,6 +11360,68 @@ Transform: - {fileID: 145386690} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1695436062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1695436063} + - component: {fileID: 1695436064} + m_Layer: 0 + m_Name: HeadA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1695436063 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695436062} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1897604950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1695436064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695436062} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HeadA + TexturePath: Female_Average_Normal_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0.1, y: 0.34} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1698047021 GameObject: m_ObjectHideFlags: 0 @@ -10221,6 +11473,178 @@ MonoBehaviour: MakeMesh: 0 Filter: {fileID: 343237697} GhostTime: 1 +--- !u!1 &1704769553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1704769554} + - component: {fileID: 1704769555} + m_Layer: 0 + m_Name: HandB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1704769554 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704769553} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.146, y: 0, z: -0.011} + m_LocalScale: {x: 0.17500001, y: 0.17500001, z: 0.175} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 737143570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1704769555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704769553} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HandB2 + TexturePath: + DoNotIncludeTexture: 0 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1, y: 1} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 0.8509804, g: 0.7254902, b: 0.5176471, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 +--- !u!1 &1705354040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1705354041} + m_Layer: 0 + m_Name: HeadContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1705354041 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705354040} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.110000014, y: 0, z: 0.327} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 110140249} + m_Father: {fileID: 454409610} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1730186972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1730186973} + - component: {fileID: 1730186975} + - component: {fileID: 1730186974} + m_Layer: 0 + m_Name: BodyA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1730186973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730186972} + serializedVersion: 2 + 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: + - {fileID: 1952415024} + - {fileID: 114701328} + m_Father: {fileID: 758745603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1730186974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730186972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + m_Name: + m_EditorClassIdentifier: + Direction: 1 +--- !u!114 &1730186975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730186972} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: BodyA + TexturePath: Naked_Female_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1744158423 GameObject: m_ObjectHideFlags: 0 @@ -10528,7 +11952,7 @@ GameObject: m_IsActive: 0 --- !u!95 &1768372575 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -10542,6 +11966,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -10559,7 +11984,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} m_Name: m_EditorClassIdentifier: - Clip: {fileID: 7400000, guid: 8a57511f747019e40bbc31539684346c, type: 2} + Clip: {fileID: 7400000, guid: 2aa360e59633a8d48bbc125628878a8b, type: 2} SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} AllowLoadingFromJson: 0 SweepDisplayMode: 3 @@ -10757,8 +12182,8 @@ Mesh: m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 m_MeshOptimizationFlags: 1 m_StreamData: serializedVersion: 2 @@ -11082,6 +12507,84 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &1897604949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1897604950} + - component: {fileID: 1897604952} + - component: {fileID: 1897604951} + m_Layer: 0 + m_Name: BodyA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1897604950 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897604949} + serializedVersion: 2 + 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: + - {fileID: 1695436063} + - {fileID: 991767868} + m_Father: {fileID: 1047008476} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1897604951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897604949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} + m_Name: + m_EditorClassIdentifier: + Direction: 1 +--- !u!114 &1897604952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1897604949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: BodyA + TexturePath: Naked_Female_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0, y: 0} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1910975290 GameObject: m_ObjectHideFlags: 0 @@ -11186,7 +12689,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1914720449 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -11200,6 +12703,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -11217,7 +12721,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1035ec63e739b8e43b63587ca5c339e4, type: 3} m_Name: m_EditorClassIdentifier: - Clip: {fileID: 7400000, guid: 1a5fe004d2c03944b967bfb72438a20d, type: 2} + Clip: {fileID: 7400000, guid: 5bef525362592274e91114e5110537b2, type: 2} SweepParams: {fileID: 11400000, guid: 8b5f4250e25ad0743a6923a3d261879b, type: 2} AllowLoadingFromJson: 0 SweepDisplayMode: 3 @@ -11441,6 +12945,68 @@ MonoBehaviour: FrameIndex: 0 SplitDrawPivot: {fileID: 0} SplitDrawMode: 0 +--- !u!1 &1952415023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1952415024} + - component: {fileID: 1952415025} + m_Layer: 0 + m_Name: HeadA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1952415024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952415023} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1730186973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1952415025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952415023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} + m_Name: + m_EditorClassIdentifier: + CustomName: HeadA + TexturePath: Female_Average_Normal_east + DoNotIncludeTexture: 1 + IdleOffset: {x: 0.1, y: 0.34} + IdleRotation: 0 + IdleScale: {x: 1.5, y: 1.5} + IdleFlipX: 0 + IdleFlipY: 0 + TransparentByDefault: 0 + Tint: {r: 1, g: 1, b: 1, a: 1} + DataA: 0 + DataB: 0 + DataC: 0 + FlipX: 0 + FlipY: 0 + FrameIndex: 0 + SplitDrawPivot: {fileID: 0} + SplitDrawMode: 0 --- !u!1 &1955818712 GameObject: m_ObjectHideFlags: 0 @@ -12195,68 +13761,6 @@ Transform: - {fileID: 518133258} m_Father: {fileID: 1505926704} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2096330807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2096330808} - - component: {fileID: 2096330809} - m_Layer: 0 - m_Name: HeadA - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2096330808 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2096330807} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.05, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 262066803} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2096330809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2096330807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} - m_Name: - m_EditorClassIdentifier: - CustomName: HeadA - TexturePath: Female_Average_Normal_east - DoNotIncludeTexture: 1 - IdleOffset: {x: 0.1, y: 0.34} - IdleRotation: 0 - IdleScale: {x: 1.5, y: 1.5} - IdleFlipX: 0 - IdleFlipY: 0 - TransparentByDefault: 0 - Tint: {r: 1, g: 1, b: 1, a: 1} - DataA: 0 - DataB: 0 - DataC: 0 - FlipX: 0 - FlipY: 0 - FrameIndex: 0 - SplitDrawPivot: {fileID: 0} - SplitDrawMode: 0 --- !u!1 &2107221218 GameObject: m_ObjectHideFlags: 0 @@ -12289,85 +13793,6 @@ Transform: - {fileID: 849620622} m_Father: {fileID: 975175972} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -67.293} ---- !u!1 &2112027105 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2112027106} - - component: {fileID: 2112027108} - - component: {fileID: 2112027107} - m_Layer: 0 - m_Name: BodyB - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2112027106 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2112027105} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1373644819} - - {fileID: 762661942} - - {fileID: 830711227} - m_Father: {fileID: 558904575} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2112027107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2112027105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0fda39bc171ca0a419f2f933cc0221b7, type: 3} - m_Name: - m_EditorClassIdentifier: - Direction: 3 ---- !u!114 &2112027108 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2112027105} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ac72458fde51c546a95b850d16b9030, type: 3} - m_Name: - m_EditorClassIdentifier: - CustomName: BodyB - TexturePath: Naked_Female_east - DoNotIncludeTexture: 1 - IdleOffset: {x: 0, y: 0} - IdleRotation: 0 - IdleScale: {x: 1.5, y: 1.5} - IdleFlipX: 0 - IdleFlipY: 0 - TransparentByDefault: 0 - Tint: {r: 1, g: 1, b: 1, a: 1} - DataA: 0 - DataB: 0 - DataC: 0 - FlipX: 1 - FlipY: 0 - FrameIndex: 0 - SplitDrawPivot: {fileID: 0} - SplitDrawMode: 0 --- !u!1 &2117230355 GameObject: m_ObjectHideFlags: 0 @@ -12603,6 +14028,9 @@ SceneRoots: - {fileID: 523862470} - {fileID: 1550348914} - {fileID: 1914720448} - - {fileID: 558904575} - {fileID: 1768372577} - {fileID: 1694323724} + - {fileID: 1156962771} + - {fileID: 1047008476} + - {fileID: 758745603} + - {fileID: 485215799} diff --git a/Source/Animations/Assets/Scripts/ExportHelper.cs b/Source/Animations/Assets/Scripts/ExportHelper.cs new file mode 100644 index 00000000..ea93575b --- /dev/null +++ b/Source/Animations/Assets/Scripts/ExportHelper.cs @@ -0,0 +1,31 @@ +using System.IO; +using System.Linq; +using UnityEditor; + +public static class ExportHelper +{ + public static string OutputDirectoryPath + { + get => EditorPrefs.GetString("MeleeAnimation_ExportFolder", null); + set => EditorPrefs.SetString("MeleeAnimation_ExportFolder", value); + } + + [MenuItem("Melee Animation/Set Export Location")] + public static void ShowChangeExportLocationDialogue() + { + string selectedPath = EditorUtility.OpenFolderPanel("Select output folder", "Assets", ""); + if (!Directory.Exists(selectedPath)) + { + EditorUtility.DisplayDialog("Failed to set output folder", "The selected folder could not be found", "Ok"); + return; + } + + if (Directory.EnumerateFiles(selectedPath, "*", SearchOption.AllDirectories).Any(file => Path.GetExtension(file) != ".json")) + { + EditorUtility.DisplayDialog("Failed to set output folder", "The selected folder contains files that are not animation files, you have probably selected the wrong folder.", "Ok"); + return; + } + + OutputDirectoryPath = selectedPath; + } +} diff --git a/Source/Animations/Assets/Scripts/ExportHelper.cs.meta b/Source/Animations/Assets/Scripts/ExportHelper.cs.meta new file mode 100644 index 00000000..212926c7 --- /dev/null +++ b/Source/Animations/Assets/Scripts/ExportHelper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 92cb5f72e262ad644a02ec27eb4f59e4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Animations/Packages/manifest.json b/Source/Animations/Packages/manifest.json index 45c759f8..ed672edd 100644 --- a/Source/Animations/Packages/manifest.json +++ b/Source/Animations/Packages/manifest.json @@ -1,13 +1,12 @@ { "dependencies": { "com.unity.editorcoroutines": "1.0.0", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.vscode": "1.2.5", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.6", - "com.unity.ugui": "1.0.0", + "com.unity.test-framework": "1.4.4", + "com.unity.timeline": "1.8.6", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Source/Animations/Packages/packages-lock.json b/Source/Animations/Packages/packages-lock.json index 91ed75c6..61f8482d 100644 --- a/Source/Animations/Packages/packages-lock.json +++ b/Source/Animations/Packages/packages-lock.json @@ -8,14 +8,14 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -32,35 +32,19 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.4.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { @@ -72,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -80,6 +64,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -127,6 +117,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -215,7 +211,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Source/Animations/ProjectSettings/MultiplayerManager.asset b/Source/Animations/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 00000000..2a936644 --- /dev/null +++ b/Source/Animations/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/Source/Animations/ProjectSettings/ProjectSettings.asset b/Source/Animations/ProjectSettings/ProjectSettings.asset index 315544b1..1e324401 100644 --- a/Source/Animations/ProjectSettings/ProjectSettings.asset +++ b/Source/Animations/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 28 productGUID: 0aa9ff0a7adb3534ab3c8a924719716f AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,10 +48,12 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -74,6 +76,9 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidApplicationEntry: 1 + androidPredictiveBackSupport: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -85,6 +90,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -92,6 +98,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -123,20 +130,16 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -148,22 +151,27 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 0000000003000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Standalone: com.DefaultCompany.DeepDive buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -173,16 +181,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 12.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 12.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -207,7 +219,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -215,7 +226,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -225,13 +235,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -246,13 +259,15 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 - AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -265,14 +280,106 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 100 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1 @@ -289,6 +396,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -335,6 +443,8 @@ PlayerSettings: m_APIs: 0b000000 m_Automatic: 0 m_BuildTargetVRSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -344,12 +454,11 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: - - m_BuildTarget: Standalone + - serializedVersion: 2 + m_BuildTarget: Standalone m_EncodingQuality: 1 - m_BuildTargetGroupHDRCubemapEncodingQuality: - - m_BuildTarget: Standalone - m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -362,7 +471,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: - macOSTargetOSVersion: 10.13.0 + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -370,7 +479,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -448,7 +557,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -490,6 +598,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -500,12 +609,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 1 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -600,6 +711,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -618,26 +730,33 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 + webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: + Android: 0 Standalone: 0 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Standalone: 6 + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_Lightweight @@ -661,11 +780,13 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -707,8 +828,16 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -716,7 +845,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 diff --git a/Source/Animations/ProjectSettings/ProjectVersion.txt b/Source/Animations/ProjectSettings/ProjectVersion.txt index 91206fdc..1069f07f 100644 --- a/Source/Animations/ProjectSettings/ProjectVersion.txt +++ b/Source/Animations/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.13f1 -m_EditorVersionWithRevision: 2022.3.13f1 (5f90a5ebde0f) +m_EditorVersion: 6000.0.0f1 +m_EditorVersionWithRevision: 6000.0.0f1 (4ff56b3ea44c) diff --git a/Source/Animations/ProjectSettings/SceneTemplateSettings.json b/Source/Animations/ProjectSettings/SceneTemplateSettings.json index 6f3e60fd..6ed312ae 100644 --- a/Source/Animations/ProjectSettings/SceneTemplateSettings.json +++ b/Source/Animations/ProjectSettings/SceneTemplateSettings.json @@ -4,164 +4,123 @@ { "userAdded": false, "type": "UnityEngine.AnimationClip", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Animations.AnimatorController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.AnimatorOverrideController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Audio.AudioMixerController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.ComputeShader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Cubemap", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.GameObject", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.LightingDataAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.LightingSettings", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Material", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.MonoScript", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.PhysicMaterial", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.VolumeProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.SceneAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Shader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.ShaderVariantCollection", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Texture", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Texture2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Timeline.TimelineAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 } ], "defaultDependencyTypeInfo": { "userAdded": false, "type": "", - "ignore": false, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, "newSceneOverride": 0 } \ No newline at end of file diff --git a/Source/Animations/UserSettings/Layouts/default-2022.dwlt b/Source/Animations/UserSettings/Layouts/default-2022.dwlt index 31efd903..8772defc 100644 --- a/Source/Animations/UserSettings/Layouts/default-2022.dwlt +++ b/Source/Animations/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349.3334 m_ShowMode: 4 - m_Title: Inspector + m_Title: Project m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 17 + controlID: 47 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -94,8 +94,8 @@ MonoBehaviour: y: 0 width: 481.33334 height: 829.3333 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -111,7 +111,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -120,15 +120,15 @@ MonoBehaviour: y: 829.3333 width: 1954.6666 height: 470.00006 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 19} - {fileID: 14} - {fileID: 13} - m_Selected: 2 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 2 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 18 + controlID: 48 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -249,7 +249,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 19 + controlID: 49 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -513,9 +513,9 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 0 + m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -523,16 +523,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 61 m_LastFolders: - - Assets/Scenes + - Assets/Scripts m_LastFoldersGridSize: 61 - m_LastProjectPath: D:\Programs\Steam\steamapps\common\RimWorld\Mods\AdvancedAnimationMod\Source\Animations + m_LastProjectPath: D:\Programs\Steam\steamapps\common\RimWorld\Mods\Melee-Animation\Source\Animations m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4a5a0000 - m_LastClickedID: 23114 - m_ExpandedIDs: 0000000004500000365a000000ca9a3bffffff7f + m_SelectedIDs: 84500000 + m_LastClickedID: 20612 + m_ExpandedIDs: 000000001250000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -560,7 +560,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000004500000 + m_ExpandedIDs: 0000000012500000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -585,9 +585,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 784e0000 - m_LastClickedInstanceID: 20088 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -700,9 +700,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4c4e0000 - m_LastClickedID: 20044 - m_ExpandedIDs: 30fbffff044c0000c04c0000844d00004c4e0000 + m_SelectedIDs: a6500000 + m_LastClickedID: 0 + m_ExpandedIDs: 10fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1093,7 +1093,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} speed: 2 - m_Value: {x: -0.7071068, y: 0, z: -0, w: -0.7071068} + m_Value: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_Size: m_Target: 1.0008484 speed: 2 diff --git a/Source/Animations/UserSettings/Layouts/default-6000.dwlt b/Source/Animations/UserSettings/Layouts/default-6000.dwlt new file mode 100644 index 00000000..133ab856 --- /dev/null +++ b/Source/Animations/UserSettings/Layouts/default-6000.dwlt @@ -0,0 +1,1499 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 0 + y: 42.666668 + width: 2560 + height: 1349.3334 + m_ShowMode: 4 + m_Title: Console + m_RootView: {fileID: 8} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 531.3333 + y: 0 + width: 1423.3333 + height: 435.33337 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 0 + y: 864 + width: 1954.6666 + height: 435.33337 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 60 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 11} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 2560 + height: 1299.3334 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 58 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1954.6666 + y: 0 + width: 605.3334 + height: 1299.3334 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 481.33334 + height: 864 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 531.3333 + height: 435.33337 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 21} + m_Panes: + - {fileID: 21} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 4} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2560 + height: 1349.3334 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2560 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 1329.3334 + width: 2560 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 12} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1954.6666 + height: 1299.3334 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 59 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 13} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1954.6666 + height: 864 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 50 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 481.33334 + y: 0 + width: 1473.3333 + height: 864 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 19} + - {fileID: 20} + - {fileID: 14} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Animator\u200B" + m_Pos: + serializedVersion: 2 + x: 481.33334 + y: 72.66667 + width: 1471.3333 + height: 808.3333 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5001514614565123132, guid: 7214957146eff1f4d870f86365dcd973, type: 2} + - {fileID: 4917503360732978627, guid: f481c483439c3a845bfcae42f6b755f5, type: 2} + - {fileID: 840593544800058019, guid: a183853c13d4ad84d8a371a65b859fed, type: 2} + - {fileID: -1754893795296981262, guid: 32a2541bea9b85f43885f95751daeeaf, type: 2} + - {fileID: 157706500883835079, guid: 14a0fcccd3eec8645883c91563375b2c, type: 2} + - {fileID: 817426115046359874, guid: c46ae82709ec0074f873709b14030b8c, type: 2} + - {fileID: -1406282831380350225, guid: 65811b72c281da243bde4dd8d449a755, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.8439878 + e01: 0 + e02: 0 + e03: 123.57303 + e10: 0 + e11: 0.8439878 + e12: 0 + e13: 15 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.9962333 + e01: 0 + e02: 0 + e03: -731.68286 + e10: 0 + e11: 0.9962333 + e12: 0 + e13: -809.1667 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.85 + e01: 0 + e02: 0 + e03: -100.88339 + e10: 0 + e11: 0.85 + e12: 0 + e13: -0.1000061 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 41.666626 + e10: 0 + e11: 1 + e12: 0 + e13: 299.66666 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 41.666626 + e10: 0 + e11: 1 + e12: 0 + e13: 289.66666 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 65811b72c281da243bde4dd8d449a755, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -1406282831380350225, guid: 65811b72c281da243bde4dd8d449a755, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Animation\u200B" + m_Pos: + serializedVersion: 2 + x: 531.3334 + y: 936.6667 + width: 1421.3333 + height: 414.33337 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 23122 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Project\u200B" + m_Pos: + serializedVersion: 2 + x: 0 + y: 936.6667 + width: 530.3333 + height: 414.33337 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: south + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_ProductIds: + m_AnyWithAssetOrigin: 0 + m_OriginalText: south + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 61 + m_LastFolders: + - Assets + m_LastFoldersGridSize: 61 + m_LastProjectPath: D:\Programs\Steam\steamapps\common\RimWorld\Mods\Melee-Animation\Source\Animations + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: b25e0000 + m_LastClickedID: 24242 + m_ExpandedIDs: 00000000b25e000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000b25e0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 525a0000 + m_LastClickedInstanceID: 23122 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 7} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 61 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Inspector\u200B" + m_Pos: + serializedVersion: 2 + x: 1954.6667 + y: 72.66667 + width: 604.3334 + height: 1278.3334 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Hierarchy\u200B" + m_Pos: + serializedVersion: 2 + x: 0 + y: 72.66667 + width: 480.33334 + height: 843 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 525a0000 + m_LastClickedID: 23122 + m_ExpandedIDs: defaffff525a0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_TrimLeadingAndTrailingWhitespace: 0 + m_ClientGUIView: {fileID: 6} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Scene\u200B" + m_Pos: + serializedVersion: 2 + x: 481.33334 + y: 72.66667 + width: 1471.3333 + height: 843 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + displayed: 1 + id: Tool Settings + index: 0 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-170.0,"y":-26.66668701171875},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":3,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: -170, y: -26.666687} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + displayed: 1 + id: unity-grid-and-snap-toolbar + index: 1 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":-141.0,"y":149.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + displayed: 1 + id: unity-scene-view-toolbar + index: 0 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + displayed: 0 + id: unity-search-toolbar + index: 2 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":-24.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -24, y: 0} + snapCorner: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-container--left + displayed: 1 + id: unity-transform-toolbar + index: 0 + contents: '{"m_Layout":2,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-container--left + displayed: 1 + id: unity-component-tools + index: 1 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-container--right + displayed: 1 + id: Orientation + index: 0 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":67.5,"y":86.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Light Settings + index: 0 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Camera + index: 1 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Cloth Constraints + index: 1 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Cloth Collisions + index: 2 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Navmesh Display + index: 4 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Agent Display + index: 5 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Obstacle Display + index: 6 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Occlusion Culling + index: 3 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Physics Debugger + index: 4 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Scene Visibility + index: 5 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Particles + index: 6 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Tilemap + index: 11 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + contents: + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/TrailRenderer + index: 7 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":48.0,"y":48.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + displayed: 0 + id: Brush Attributes + index: 2 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + displayed: 1 + id: unity-scene-view-camera-mode-toolbar + index: 1 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + displayed: 0 + id: Terrain Tools + index: 0 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__left + displayed: 0 + id: Brush Masks + index: 1 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--left + displayed: 0 + id: Scene View/Lighting Visualization Colors + index: 0 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--left + displayed: 1 + id: Overlays/OverlayMenu + index: 1 + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 24, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: SceneView/CamerasOverlay + index: 8 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/PBR Validation Settings + index: 9 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 + m_ContainerData: + - containerId: overlay-toolbar__top + scrollOffset: 0 + - containerId: overlay-toolbar__left + scrollOffset: 0 + - containerId: overlay-container--left + scrollOffset: 0 + - containerId: overlay-container--right + scrollOffset: 0 + - containerId: overlay-toolbar__right + scrollOffset: 0 + - containerId: overlay-toolbar__bottom + scrollOffset: 0 + - containerId: Floating + scrollOffset: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_DebugDrawModesUseInteractiveLightBakingData: 0 + m_Position: + m_Target: {x: 0.45962942, y: -0.000000012712271, z: 0.10663827} + speed: 2 + m_Value: {x: 0.3103178, y: 0.00000004106006, z: -0.3444369} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + speed: 2 + m_Value: {x: -0.7071068, y: 0, z: -0, w: -0.7071068} + m_Size: + m_Target: 1.3304263 + speed: 2 + m_Value: 1.2731353 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_Viewpoint: + m_SceneView: {fileID: 19} + m_CameraOverscanSettings: + m_Opacity: 50 + m_Scale: 1 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_LastDebugDrawMode: 35 + m_ViewIsLockedToObject: 0 +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Game\u200B" + m_Pos: + serializedVersion: 2 + x: 481.33334 + y: 72.66667 + width: 1471.3333 + height: 843 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 2207, y: 1233} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -735.6667 + m_HBaseRangeMax: 735.6667 + m_VBaseRangeMin: -411 + m_VBaseRangeMax: 411 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1471.3333 + height: 822 + m_Scale: {x: 0.99999994, y: 0.99999994} + m_Translation: {x: 735.6666, y: 411} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -735.6667 + y: -411.00003 + width: 1471.3334 + height: 822.00006 + m_MinimalGUI: 1 + m_defaultScale: 0.99999994 + m_LastWindowPixelSize: {x: 2207, y: 1264.5} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &21 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_TextWithWhitespace: "Console\u200B" + m_Pos: + serializedVersion: 2 + x: 0 + y: 936.6667 + width: 530.3333 + height: 414.33337 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ContainerData: [] + m_OverlaysVisible: 1 diff --git a/WeaponTweakData/Gnm_NeoKanasaibo_gunmar.neosamurai.json b/WeaponTweakData/Gnm_NeoKanasaibo_gunmar.neosamurai.json new file mode 100644 index 00000000..b8de1b34 --- /dev/null +++ b/WeaponTweakData/Gnm_NeoKanasaibo_gunmar.neosamurai.json @@ -0,0 +1,19 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_NeoKanasaibo", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.43710506, + "Rotation": 45.0, + "ScaleX": 1.1, + "ScaleY": 1.1, + "BladeStart": 0.155351371, + "BladeEnd": 0.96106, + "MeleeWeaponType": 1, + "TrailTint": { + "r": 0.372, + "g": 0.811, + "b": 0.964, + "a": 0.571605 + } +} \ No newline at end of file diff --git a/WeaponTweakData/Gnm_NeoKunai_gunmar.neosamurai.json b/WeaponTweakData/Gnm_NeoKunai_gunmar.neosamurai.json new file mode 100644 index 00000000..a93a4c4e --- /dev/null +++ b/WeaponTweakData/Gnm_NeoKunai_gunmar.neosamurai.json @@ -0,0 +1,19 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_NeoKunai", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.205504388, + "ScaleX": 1.05, + "ScaleY": 1.05, + "HandsMode": 1, + "BladeStart": 0.161875173, + "BladeEnd": 0.540264964, + "MeleeWeaponType": 48, + "TrailTint": { + "r": 0.372, + "g": 0.811, + "b": 0.964, + "a": 0.571605 + } +} \ No newline at end of file diff --git a/WeaponTweakData/Gnm_NeoNaginata_gunmar.neosamurai.json b/WeaponTweakData/Gnm_NeoNaginata_gunmar.neosamurai.json new file mode 100644 index 00000000..606fe7d7 --- /dev/null +++ b/WeaponTweakData/Gnm_NeoNaginata_gunmar.neosamurai.json @@ -0,0 +1,19 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_NeoNaginata", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.4534151, + "Rotation": 45.0, + "ScaleX": 1.1, + "ScaleY": 1.1, + "BladeStart": 0.6152902, + "BladeEnd": 1.14373052, + "MeleeWeaponType": 6, + "TrailTint": { + "r": 0.372, + "g": 0.811, + "b": 0.964, + "a": 0.571605 + } +} \ No newline at end of file diff --git a/WeaponTweakData/Gnm_NeoNodachi_gunmar.neosamurai.json b/WeaponTweakData/Gnm_NeoNodachi_gunmar.neosamurai.json new file mode 100644 index 00000000..43ce11ba --- /dev/null +++ b/WeaponTweakData/Gnm_NeoNodachi_gunmar.neosamurai.json @@ -0,0 +1,19 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_NeoNodachi", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.433843136, + "Rotation": 45.0, + "ScaleX": 1.1, + "ScaleY": 1.1, + "BladeStart": 0.129255652, + "BladeEnd": 1.13068247, + "MeleeWeaponType": 6, + "TrailTint": { + "r": 0.372, + "g": 0.811, + "b": 0.964, + "a": 0.571605 + } +} \ No newline at end of file diff --git a/WeaponTweakData/Gnm_NeoUchigatana_gunmar.neosamurai.json b/WeaponTweakData/Gnm_NeoUchigatana_gunmar.neosamurai.json new file mode 100644 index 00000000..f8ac18cf --- /dev/null +++ b/WeaponTweakData/Gnm_NeoUchigatana_gunmar.neosamurai.json @@ -0,0 +1,18 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_NeoUchigatana", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.300102144, + "ScaleX": 1.05, + "ScaleY": 1.05, + "BladeStart": 0.0933737, + "BladeEnd": 0.804485142, + "MeleeWeaponType": 6, + "TrailTint": { + "r": 0.372, + "g": 0.811, + "b": 0.964, + "a": 0.571605 + } +} \ No newline at end of file diff --git a/WeaponTweakData/Gnm_Nodachi_gunmar.neosamurai.json b/WeaponTweakData/Gnm_Nodachi_gunmar.neosamurai.json new file mode 100644 index 00000000..837e7545 --- /dev/null +++ b/WeaponTweakData/Gnm_Nodachi_gunmar.neosamurai.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_Nodachi", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.459938884, + "Rotation": 45.0, + "ScaleX": 1.1, + "ScaleY": 1.1, + "BladeStart": 0.155351371, + "BladeEnd": 1.15677869, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/Gnm_Uchigatana_gunmar.neosamurai.json b/WeaponTweakData/Gnm_Uchigatana_gunmar.neosamurai.json new file mode 100644 index 00000000..1a818b96 --- /dev/null +++ b/WeaponTweakData/Gnm_Uchigatana_gunmar.neosamurai.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "gunmar.neosamurai", + "ItemDefName": "Gnm_Uchigatana", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.3131497, + "ScaleX": 1.05, + "ScaleY": 1.05, + "BladeStart": 0.119469963, + "BladeEnd": 0.807747, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/Melee_RabbitKnife_Pale_amaoto.rabbitprotocol.json b/WeaponTweakData/Melee_RabbitKnife_Pale_amaoto.rabbitprotocol.json new file mode 100644 index 00000000..87976cca --- /dev/null +++ b/WeaponTweakData/Melee_RabbitKnife_Pale_amaoto.rabbitprotocol.json @@ -0,0 +1,11 @@ +{ + "TextureModID": "amaoto.rabbitprotocol", + "ItemDefName": "Melee_RabbitKnife_Pale", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.242777288, + "OffY": -0.0161852837, + "BladeStart": 0.123492293, + "BladeEnd": 0.6446544, + "MeleeWeaponType": 48 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaBlessedSerratedDagger_sgg1.raviaretexture.json b/WeaponTweakData/ReviaBlessedSerratedDagger_sgg1.raviaretexture.json new file mode 100644 index 00000000..d1d3806e --- /dev/null +++ b/WeaponTweakData/ReviaBlessedSerratedDagger_sgg1.raviaretexture.json @@ -0,0 +1,11 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaBlessedSerratedDagger", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.316706479, + "OffY": 0.009048533, + "BladeStart": 0.09026112, + "BladeEnd": 0.7508196, + "MeleeWeaponType": 54 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaBlessedSerratedScythe_sgg1.raviaretexture.json b/WeaponTweakData/ReviaBlessedSerratedScythe_sgg1.raviaretexture.json new file mode 100644 index 00000000..4d30ebed --- /dev/null +++ b/WeaponTweakData/ReviaBlessedSerratedScythe_sgg1.raviaretexture.json @@ -0,0 +1,13 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaBlessedSerratedScythe", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.5972173, + "Rotation": 45.0, + "ScaleX": 1.4, + "ScaleY": 1.4, + "BladeStart": 0.847339749, + "BladeEnd": 1.33295608, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaBlessedSerratedSword_sgg1.raviaretexture.json b/WeaponTweakData/ReviaBlessedSerratedSword_sgg1.raviaretexture.json new file mode 100644 index 00000000..ba4035a5 --- /dev/null +++ b/WeaponTweakData/ReviaBlessedSerratedSword_sgg1.raviaretexture.json @@ -0,0 +1,11 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaBlessedSerratedSword", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.4946649, + "Rotation": 45.0, + "BladeStart": 0.12344005, + "BladeEnd": 1.176111, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaChainSword_sgg1.raviaretexture.json b/WeaponTweakData/ReviaChainSword_sgg1.raviaretexture.json new file mode 100644 index 00000000..1032af98 --- /dev/null +++ b/WeaponTweakData/ReviaChainSword_sgg1.raviaretexture.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaChainSword", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.343852639, + "OffY": -0.0180975646, + "Rotation": 45.0, + "BladeStart": 0.2169435, + "BladeEnd": 0.87448585, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaSerratedDagger_sgg1.raviaretexture.json b/WeaponTweakData/ReviaSerratedDagger_sgg1.raviaretexture.json new file mode 100644 index 00000000..5a045cff --- /dev/null +++ b/WeaponTweakData/ReviaSerratedDagger_sgg1.raviaretexture.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaSerratedDagger", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.165893644, + "OffY": 0.0271460861, + "HandsMode": 1, + "BladeStart": 0.114391021, + "BladeEnd": 0.54873085, + "MeleeWeaponType": 48 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaSerratedScythe_sgg1.raviaretexture.json b/WeaponTweakData/ReviaSerratedScythe_sgg1.raviaretexture.json new file mode 100644 index 00000000..6fe86b92 --- /dev/null +++ b/WeaponTweakData/ReviaSerratedScythe_sgg1.raviaretexture.json @@ -0,0 +1,14 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaSerratedScythe", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.579119742, + "OffY": -0.033178933, + "Rotation": 45.0, + "ScaleX": 1.4, + "ScaleY": 1.4, + "BladeStart": 0.794102848, + "BladeEnd": 1.43656433, + "MeleeWeaponType": 3 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaSerratedSword_sgg1.raviaretexture.json b/WeaponTweakData/ReviaSerratedSword_sgg1.raviaretexture.json new file mode 100644 index 00000000..3e79e521 --- /dev/null +++ b/WeaponTweakData/ReviaSerratedSword_sgg1.raviaretexture.json @@ -0,0 +1,12 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaSerratedSword", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.259397626, + "OffY": 0.006032847, + "Rotation": 47.61271, + "BladeStart": 0.115446784, + "BladeEnd": 0.766956747, + "MeleeWeaponType": 6 +} \ No newline at end of file diff --git a/WeaponTweakData/ReviaWarPick_sgg1.raviaretexture.json b/WeaponTweakData/ReviaWarPick_sgg1.raviaretexture.json new file mode 100644 index 00000000..fd8b7f8c --- /dev/null +++ b/WeaponTweakData/ReviaWarPick_sgg1.raviaretexture.json @@ -0,0 +1,14 @@ +{ + "TextureModID": "sgg1.raviaretexture", + "ItemDefName": "ReviaWarPick", + "ItemType": "ThingDef", + "ItemTypeNamespace": "Verse", + "OffX": 0.268446147, + "OffY": -0.0452436358, + "Rotation": 90.0, + "ScaleX": 1.5, + "ScaleY": 1.5, + "BladeStart": 0.5889979, + "BladeEnd": 0.8061681, + "MeleeWeaponType": 2 +} \ No newline at end of file diff --git a/WeaponTweakData/amaoto.rabbitprotocol.txt b/WeaponTweakData/amaoto.rabbitprotocol.txt new file mode 100644 index 00000000..7252eb4b --- /dev/null +++ b/WeaponTweakData/amaoto.rabbitprotocol.txt @@ -0,0 +1 @@ +Rabbit Protocol \ No newline at end of file diff --git a/WeaponTweakData/gunmar.neosamurai.txt b/WeaponTweakData/gunmar.neosamurai.txt new file mode 100644 index 00000000..a00bb06b --- /dev/null +++ b/WeaponTweakData/gunmar.neosamurai.txt @@ -0,0 +1 @@ +Neo Samurai \ No newline at end of file diff --git a/WeaponTweakData/sgg1.raviaretexture.txt b/WeaponTweakData/sgg1.raviaretexture.txt new file mode 100644 index 00000000..8a14274b --- /dev/null +++ b/WeaponTweakData/sgg1.raviaretexture.txt @@ -0,0 +1 @@ +SGG1's Retexture : Revia Race \ No newline at end of file