From e2e8b36d0231c4182327f683b591d142195a28b9 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Sun, 20 Feb 2022 23:22:01 -0600 Subject: [PATCH 1/8] AAAA imma figure this out tomorrow --- .gitattributes | 106 ++-- .gitignore | 5 +- Assets/Animations.meta | 8 + Assets/Fuki + Seiden.meta | 8 + Assets/Fuki + Seiden/Char Art.controller | 12 + Assets/Fuki + Seiden/Char Art.controller.meta | 8 + Assets/Fuki + Seiden/fuki-idle.anim | 53 ++ Assets/Fuki + Seiden/fuki-idle.anim.meta | 8 + Assets/Fuki + Seiden/fuki-walk.anim | 77 +++ Assets/Fuki + Seiden/fuki-walk.anim.meta | 8 + Assets/Fuki + Seiden/fuki-walk.png | Bin 0 -> 954 bytes Assets/Fuki + Seiden/fuki-walk.png.meta | 216 ++++++++ Assets/Fuki + Seiden/seiden-walk.png | Bin 0 -> 990 bytes Assets/Fuki + Seiden/seiden-walk.png.meta | 120 ++++ .../Font/TextMesh Pro/Documentation.meta | 2 +- .../TextMesh Pro User Guide 2016.pdf.meta | 2 +- .../Font/TextMesh Pro/Fonts.meta | 2 +- .../Fonts/LiberationSans - OFL.txt.meta | 2 +- .../Fonts/LiberationSans.ttf.meta | 2 +- .../Font/TextMesh Pro/Resources.meta | 2 +- .../Resources/Fonts & Materials.meta | 2 +- .../LiberationSans SDF - Drop Shadow.mat.meta | 2 +- .../LiberationSans SDF - Fallback.asset.meta | 2 +- .../LiberationSans SDF - Outline.mat.meta | 2 +- .../LiberationSans SDF.asset.meta | 2 +- ...LineBreaking Following Characters.txt.meta | 2 +- .../LineBreaking Leading Characters.txt.meta | 2 +- .../TextMesh Pro/Resources/Sprite Assets.meta | 2 +- .../Sprite Assets/EmojiOne.asset.meta | 2 +- .../TextMesh Pro/Resources/Style Sheets.meta | 2 +- .../Default Style Sheet.asset.meta | 2 +- .../Resources/TMP Settings.asset.meta | 2 +- .../Font/TextMesh Pro/Shaders.meta | 2 +- .../TMP_Bitmap-Custom-Atlas.shader.meta | 2 +- .../Shaders/TMP_Bitmap-Mobile.shader.meta | 2 +- .../Shaders/TMP_Bitmap.shader.meta | 2 +- .../Shaders/TMP_SDF Overlay.shader.meta | 2 +- .../Shaders/TMP_SDF SSD.shader.meta | 2 +- .../TMP_SDF-Mobile Masking.shader.meta | 2 +- .../TMP_SDF-Mobile Overlay.shader.meta | 2 +- .../Shaders/TMP_SDF-Mobile SSD.shader.meta | 2 +- .../Shaders/TMP_SDF-Mobile.shader.meta | 2 +- .../TMP_SDF-Surface-Mobile.shader.meta | 2 +- .../Shaders/TMP_SDF-Surface.shader.meta | 2 +- .../TextMesh Pro/Shaders/TMP_SDF.shader.meta | 2 +- .../Shaders/TMP_Sprite.shader.meta | 2 +- .../TextMesh Pro/Shaders/TMPro.cginc.meta | 2 +- .../Shaders/TMPro_Mobile.cginc.meta | 2 +- .../Shaders/TMPro_Properties.cginc.meta | 2 +- .../Shaders/TMPro_Surface.cginc.meta | 2 +- .../Font/TextMesh Pro/Sprites.meta | 2 +- .../Sprites/EmojiOne Attribution.txt.meta | 2 +- .../TextMesh Pro/Sprites/EmojiOne.json.meta | 2 +- .../TextMesh Pro/Sprites/EmojiOne.png.meta | 2 +- Assets/Scene 1 Assets/PlayerMovement.cs | 9 +- Assets/Scenes/Benji's Scene.unity | 524 ++++++++++++++++++ Assets/Scenes/Benji's Scene.unity.meta | 7 + Assets/TextMesh Pro.meta | 8 + ProjectSettings/QualitySettings.asset | 472 ++++++++-------- ProjectSettings/SceneTemplateSettings.json | 167 ++++++ UserSettings/EditorUserSettings.asset | 7 +- 61 files changed, 1568 insertions(+), 335 deletions(-) create mode 100644 Assets/Animations.meta create mode 100644 Assets/Fuki + Seiden.meta create mode 100644 Assets/Fuki + Seiden/Char Art.controller create mode 100644 Assets/Fuki + Seiden/Char Art.controller.meta create mode 100644 Assets/Fuki + Seiden/fuki-idle.anim create mode 100644 Assets/Fuki + Seiden/fuki-idle.anim.meta create mode 100644 Assets/Fuki + Seiden/fuki-walk.anim create mode 100644 Assets/Fuki + Seiden/fuki-walk.anim.meta create mode 100644 Assets/Fuki + Seiden/fuki-walk.png create mode 100644 Assets/Fuki + Seiden/fuki-walk.png.meta create mode 100644 Assets/Fuki + Seiden/seiden-walk.png create mode 100644 Assets/Fuki + Seiden/seiden-walk.png.meta create mode 100644 Assets/Scenes/Benji's Scene.unity create mode 100644 Assets/Scenes/Benji's Scene.unity.meta create mode 100644 Assets/TextMesh Pro.meta create mode 100644 ProjectSettings/SceneTemplateSettings.json diff --git a/.gitattributes b/.gitattributes index 4d16b0f..8694d4b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,54 +1,54 @@ -# 3D models -*.3dm filter=lfs diff=lfs merge=lfs -text -*.3ds filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.c4d filter=lfs diff=lfs merge=lfs -text -*.collada filter=lfs diff=lfs merge=lfs -text -*.dae filter=lfs diff=lfs merge=lfs -text -*.dxf filter=lfs diff=lfs merge=lfs -text -*.fbx filter=lfs diff=lfs merge=lfs -text -*.jas filter=lfs diff=lfs merge=lfs -text -*.lws filter=lfs diff=lfs merge=lfs -text -*.lxo filter=lfs diff=lfs merge=lfs -text -*.ma filter=lfs diff=lfs merge=lfs -text -*.max filter=lfs diff=lfs merge=lfs -text -*.mb filter=lfs diff=lfs merge=lfs -text -*.obj filter=lfs diff=lfs merge=lfs -text -*.ply filter=lfs diff=lfs merge=lfs -text -*.skp filter=lfs diff=lfs merge=lfs -text -*.stl filter=lfs diff=lfs merge=lfs -text -*.ztl filter=lfs diff=lfs merge=lfs -text -# Audio -*.aif filter=lfs diff=lfs merge=lfs -text -*.aiff filter=lfs diff=lfs merge=lfs -text -*.it filter=lfs diff=lfs merge=lfs -text -*.mod filter=lfs diff=lfs merge=lfs -text -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.ogg filter=lfs diff=lfs merge=lfs -text -*.s3m filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.xm filter=lfs diff=lfs merge=lfs -text -# Fonts -*.otf filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text -# Images -*.bmp filter=lfs diff=lfs merge=lfs -text -*.exr filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.hdr filter=lfs diff=lfs merge=lfs -text -*.iff filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text -*.jpg filter=lfs diff=lfs merge=lfs -text -*.pict filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.tga filter=lfs diff=lfs merge=lfs -text -*.tif filter=lfs diff=lfs merge=lfs -text -*.tiff filter=lfs diff=lfs merge=lfs -text +# # 3D models +# *.3dm filter=lfs diff=lfs merge=lfs -text +# *.3ds filter=lfs diff=lfs merge=lfs -text +# *.blend filter=lfs diff=lfs merge=lfs -text +# *.c4d filter=lfs diff=lfs merge=lfs -text +# *.collada filter=lfs diff=lfs merge=lfs -text +# *.dae filter=lfs diff=lfs merge=lfs -text +# *.dxf filter=lfs diff=lfs merge=lfs -text +# *.fbx filter=lfs diff=lfs merge=lfs -text +# *.jas filter=lfs diff=lfs merge=lfs -text +# *.lws filter=lfs diff=lfs merge=lfs -text +# *.lxo filter=lfs diff=lfs merge=lfs -text +# *.ma filter=lfs diff=lfs merge=lfs -text +# *.max filter=lfs diff=lfs merge=lfs -text +# *.mb filter=lfs diff=lfs merge=lfs -text +# *.obj filter=lfs diff=lfs merge=lfs -text +# *.ply filter=lfs diff=lfs merge=lfs -text +# *.skp filter=lfs diff=lfs merge=lfs -text +# *.stl filter=lfs diff=lfs merge=lfs -text +# *.ztl filter=lfs diff=lfs merge=lfs -text +# # Audio +# *.aif filter=lfs diff=lfs merge=lfs -text +# *.aiff filter=lfs diff=lfs merge=lfs -text +# *.it filter=lfs diff=lfs merge=lfs -text +# *.mod filter=lfs diff=lfs merge=lfs -text +# *.mp3 filter=lfs diff=lfs merge=lfs -text +# *.ogg filter=lfs diff=lfs merge=lfs -text +# *.s3m filter=lfs diff=lfs merge=lfs -text +# *.wav filter=lfs diff=lfs merge=lfs -text +# *.xm filter=lfs diff=lfs merge=lfs -text +# # Fonts +# *.otf filter=lfs diff=lfs merge=lfs -text +# *.ttf filter=lfs diff=lfs merge=lfs -text +# # Images +# *.bmp filter=lfs diff=lfs merge=lfs -text +# *.exr filter=lfs diff=lfs merge=lfs -text +# *.gif filter=lfs diff=lfs merge=lfs -text +# *.hdr filter=lfs diff=lfs merge=lfs -text +# *.iff filter=lfs diff=lfs merge=lfs -text +# *.jpeg filter=lfs diff=lfs merge=lfs -text +# *.jpg filter=lfs diff=lfs merge=lfs -text +# *.pict filter=lfs diff=lfs merge=lfs -text +# *.png filter=lfs diff=lfs merge=lfs -text +# *.psd filter=lfs diff=lfs merge=lfs -text +# *.tga filter=lfs diff=lfs merge=lfs -text +# *.tif filter=lfs diff=lfs merge=lfs -text +# *.tiff filter=lfs diff=lfs merge=lfs -text -# Collapse Unity-generated files on GitHub -*.asset linguist-generated -*.mat linguist-generated -*.meta linguist-generated -*.prefab linguist-generated -*.unity linguist-generated +# # Collapse Unity-generated files on GitHub +# *.asset linguist-generated +# *.mat linguist-generated +# *.meta linguist-generated +# *.prefab linguist-generated +# *.unity linguist-generated diff --git a/.gitignore b/.gitignore index b848ed6..8d8fed4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# @MindfulMinun -- Ignore OSX Finder generated files +._** +*.DS_Store + # This .gitignore file should be placed at the root of your Unity project directory # # Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore @@ -60,4 +64,3 @@ sysinfo.txt # Crashlytics generated file crashlytics-build.properties - diff --git a/Assets/Animations.meta b/Assets/Animations.meta new file mode 100644 index 0000000..885a98d --- /dev/null +++ b/Assets/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 420518c97a8b04ce8a406ce8b7e40731 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden.meta b/Assets/Fuki + Seiden.meta new file mode 100644 index 0000000..f763e85 --- /dev/null +++ b/Assets/Fuki + Seiden.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7b4f9fee36ae740868552076ecd07db7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/Char Art.controller b/Assets/Fuki + Seiden/Char Art.controller new file mode 100644 index 0000000..e71aebe --- /dev/null +++ b/Assets/Fuki + Seiden/Char Art.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Char Art + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Fuki + Seiden/Char Art.controller.meta b/Assets/Fuki + Seiden/Char Art.controller.meta new file mode 100644 index 0000000..39da719 --- /dev/null +++ b/Assets/Fuki + Seiden/Char Art.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a1517e72696d4ad5af30e14bc8b9ed1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/fuki-idle.anim b/Assets/Fuki + Seiden/fuki-idle.anim new file mode 100644 index 0000000..458c7db --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-idle.anim @@ -0,0 +1,53 @@ +%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: fuki-idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/fuki-idle.anim.meta b/Assets/Fuki + Seiden/fuki-idle.anim.meta new file mode 100644 index 0000000..f7dcd5f --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eac7a070489114f85b5c57b2a9b5ca4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/fuki-walk.anim b/Assets/Fuki + Seiden/fuki-walk.anim new file mode 100644 index 0000000..b590c4c --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-walk.anim @@ -0,0 +1,77 @@ +%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: fuki-walk + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1750011889439919240, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + - time: 0.125 + value: {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + - time: 0.25 + value: {fileID: 6588642684426670693, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + - time: 0.375 + value: {fileID: 1273522087630776360, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1750011889439919240, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + - {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + - {fileID: 6588642684426670693, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + - {fileID: 1273522087630776360, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/fuki-walk.anim.meta b/Assets/Fuki + Seiden/fuki-walk.anim.meta new file mode 100644 index 0000000..35f6cce --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-walk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2aeae3519ec346d6ba5aa4eb1c912e1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/fuki-walk.png b/Assets/Fuki + Seiden/fuki-walk.png new file mode 100644 index 0000000000000000000000000000000000000000..36f34ef544045d35fd58e3321c97c0aa8a5b846c GIT binary patch literal 954 zcmV;r14aCaP)Px&bV)=(RA@u(nomd+Q5?sAdyohufJjZ|Ag8g4-$6RU>7QaKw_(j-`jq}+u1iWZ~nYt9yAxn zotgLM^ZmTvdpn~EkleZtjT-!^3r{8zl9$Hnw77G)hML;bZ;D8!hRksD%XirR@|%aQ zZO9r?8I~>_wqX(gFF_P6iU}%3Wmvj#2!-HC?V7j(&u=`I8r&$QuD%hxPGhRW(vd?b z1cOT7os$-_|6C7D4-R;$lqkZ|k)uioLGYzPm4dKe39;ySXhGakvU;%4XnR?^$U7wgzpd zrNBn!u7M&*_Q5cdftw1DD5P8a;90_|_AoeH zg;1FfZkmGQ+0CXH0t#c=a+0npES@LKKI{gsY#+8lT6VM=O()yn{^4F$8Amho6*5!_ zv5J=kv6~u^1CMRn+09PrAL?LL&U4}CVGk_796})o@vM0RjI_4E?5^DmRcH+e&!;uZZ&<{EZ5_=0G^Nz;{bF*Z#>)R25El-|3PC9^ z3MCjT{xNTwM%tOL9ADwMsk+585_KK@PfKesJ)NLHi1W!*OI&x$`$_ z9d$t=C>-hw1Hz34LKy8++oCEEF*;SV+p(Y=zNVV6A*@ounnK*dQ+1pl0A8m;UqV!Y c{BIZFFA_ybSKE%q2mk;807*qoM6N<$g6y!dtpET3 literal 0 HcmV?d00001 diff --git a/Assets/Fuki + Seiden/fuki-walk.png.meta b/Assets/Fuki + Seiden/fuki-walk.png.meta new file mode 100644 index 0000000..0f46a9b --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-walk.png.meta @@ -0,0 +1,216 @@ +fileFormatVersion: 2 +guid: 2ce0ce2028bc94666b29a170edb2427e +TextureImporter: + internalIDToNameTable: + - first: + 213: 1750011889439919240 + second: fuki-walk_0 + - first: + 213: -2307464743885467549 + second: fuki-walk_1 + - first: + 213: 6588642684426670693 + second: fuki-walk_2 + - first: + 213: 1273522087630776360 + second: fuki-walk_3 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 8 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: fuki-walk_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 88cc6ce9a8a494810800000000000000 + internalID: 1750011889439919240 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fuki-walk_1 + rect: + serializedVersion: 2 + x: 25 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 36018f87a0d3affd0800000000000000 + internalID: -2307464743885467549 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fuki-walk_2 + rect: + serializedVersion: 2 + x: 50 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5625a350d9f8f6b50800000000000000 + internalID: 6588642684426670693 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fuki-walk_3 + rect: + serializedVersion: 2 + x: 75 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 828a8de57957ca110800000000000000 + internalID: 1273522087630776360 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-walk.png b/Assets/Fuki + Seiden/seiden-walk.png new file mode 100644 index 0000000000000000000000000000000000000000..6b6707230f889089a8b7c027450758146b63f891 GIT binary patch literal 990 zcmV<410np0P)Px&mq|oHRA@u(m`!LCK@`VdF5*e5(37A=f>p4#1pGo2su;CJyeJ4#)PUBO+M@MT zJ>(#0!B)*73QB5Q#fk@!V%3N(sNhG7R6W#4kyH?sf`Xom)s;8)t&{EU&Lo*#GT>hF zvAZ+#`~T+6Y!U#;Be7|X!CxA=|0E!JYf)WR>>R>So6E~h5goA#Gu+nZ*X(^Pl@hig zYsAa2bm4FelK^-LcEO^ULZx^amTnxjLU5+mCAR@2Ur0@Elv1@|9^|@=c^#IH9JWF* zsE#*#{>pHZ5)PT?bFCCV!qSmrhL9`>st=OF3BXg6V;LxISiR(~zbiVM3OLiaOh4>McP8`lpS+NSX zQJ=Ze4p*Z?FqL@@TWU+q{laR8f|dDA!VB>#EF2&8qZ5blhan0v#?!1yPzW8gk)sGa zaA}i~LHBzd7T*uP*M-ATNKb8xu{&A~nc;ev-S7#1^_?@9E|S1kNv=X@274J6wyhh7 zP{{AghhXGzKdk(khVHg@wwK`JEnhA9$nYyH5~2%-qmZdBiyuPc08a`v_IY==(2BRxbO7^+CXou&_^^IHdkMU%w)3>@E4umZ`h9C*g6)G8j)! zz{BCB)ctPH%U*}Y_pJkmFwmd(b{O@S<}v}nvW4a=f+lWU6y7iV@iKjZmtkQS#6jaB zo?_z=1{&G9-@w5?I5CH@Y&`yriBSpShjiq?G25}Is&*9|LLoSFNdP~q2u{Va~~HMv5^y3C;!1BYXf1T*;bBTSs!Y7Uxa+MUWa_8p!p6eQl% zWE@x*(CLs+HIXH~LAA*w#lPk>yP^t^", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4cedf1c..0fe4c46 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650 From 6e9f89060438af5a5bce1f9278fb1b21cc5fc37f Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Sun, 20 Feb 2022 23:30:18 -0600 Subject: [PATCH 2/8] They can walk to the right!!!! --- Assets/Fuki + Seiden/Char Art.controller | 151 ++++++++++++- Assets/Fuki + Seiden/fuki-idle.anim | 25 ++- Assets/Fuki + Seiden/fuki-walk.png.meta | 2 +- Assets/Fuki + Seiden/seiden-walk.png.meta | 2 +- Assets/Scenes/Benji's Scene.unity | 252 +++++++++++++++++++++- 5 files changed, 420 insertions(+), 12 deletions(-) diff --git a/Assets/Fuki + Seiden/Char Art.controller b/Assets/Fuki + Seiden/Char Art.controller index e71aebe..58b0e3d 100644 --- a/Assets/Fuki + Seiden/Char Art.controller +++ b/Assets/Fuki + Seiden/Char Art.controller @@ -1,5 +1,83 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7022381379398953809 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2830404235263199779} + 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: b2aeae3519ec346d6ba5aa4eb1c912e1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2830404235263199779 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Horizontal + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1572041149606450433 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-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: eac7a070489114f85b5c57b2a9b5ca4f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,5 +86,74 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Char Art serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorParameters: + - m_Name: Horizontal + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5424421151655396797} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &3733315961170216532 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Horizontal + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7022381379398953809} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1107 &5424421151655396797 +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: -7022381379398953809} + m_Position: {x: 540, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1572041149606450433} + m_Position: {x: 310, y: 60, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 3733315961170216532} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 570, y: -30, z: 0} + m_EntryPosition: {x: 330, y: -30, z: 0} + m_ExitPosition: {x: 550, y: 130, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1572041149606450433} diff --git a/Assets/Fuki + Seiden/fuki-idle.anim b/Assets/Fuki + Seiden/fuki-idle.anim index 458c7db..18f4ae2 100644 --- a/Assets/Fuki + Seiden/fuki-idle.anim +++ b/Assets/Fuki + Seiden/fuki-idle.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.125 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/fuki-walk.png.meta b/Assets/Fuki + Seiden/fuki-walk.png.meta index 0f46a9b..3a0d3a7 100644 --- a/Assets/Fuki + Seiden/fuki-walk.png.meta +++ b/Assets/Fuki + Seiden/fuki-walk.png.meta @@ -58,7 +58,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 8 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Fuki + Seiden/seiden-walk.png.meta b/Assets/Fuki + Seiden/seiden-walk.png.meta index 7e81a15..9497c30 100644 --- a/Assets/Fuki + Seiden/seiden-walk.png.meta +++ b/Assets/Fuki + Seiden/seiden-walk.png.meta @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 8 + spritePixelsToUnits: 16 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 86d7485..ba3330c 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -123,6 +123,38 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &109554490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 109554491} + m_Layer: 0 + m_Name: Environment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &109554491 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 109554490} + 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_Children: + - {fileID: 1657878502} + - {fileID: 1009898143} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717061313 GameObject: m_ObjectHideFlags: 0 @@ -183,6 +215,90 @@ Transform: m_Father: {fileID: 1641807371} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1009898142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1009898143} + - component: {fileID: 1009898145} + - component: {fileID: 1009898144} + m_Layer: 0 + m_Name: Wall Boundaries + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1009898143 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009898142} + 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_Children: [] + m_Father: {fileID: 109554491} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1009898144 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009898142} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 9, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 12.5} + m_EdgeRadius: 0 +--- !u!61 &1009898145 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1009898142} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -9, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 12} + m_EdgeRadius: 0 --- !u!1 &1336567756 GameObject: m_ObjectHideFlags: 0 @@ -317,6 +433,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: controller: {fileID: 1641807376} + animator: {fileID: 2105389528} runSpeed: 40 --- !u!58 &1641807373 CircleCollider2D: @@ -409,6 +526,63 @@ MonoBehaviour: OnCrouchEvent: m_PersistentCalls: m_Calls: [] +--- !u!1 &1657878501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1657878502} + - component: {fileID: 1657878503} + m_Layer: 0 + m_Name: Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1657878502 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657878501} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.39, y: -4.64, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 109554491} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1657878503 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657878501} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 22.02, y: 1} + m_EdgeRadius: 0 --- !u!1 &2067235193 GameObject: m_ObjectHideFlags: 0 @@ -418,6 +592,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2067235194} + - component: {fileID: 2067235195} m_Layer: 3 m_Name: Char m_TagString: Untagged @@ -440,6 +615,57 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2067235195 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2067235193} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.125, y: 3.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2105389525 GameObject: m_ObjectHideFlags: 0 @@ -450,6 +676,7 @@ GameObject: m_Component: - component: {fileID: 2105389526} - component: {fileID: 2105389527} + - component: {fileID: 2105389528} m_Layer: 3 m_Name: Char Art m_TagString: Untagged @@ -511,14 +738,33 @@ SpriteRenderer: m_SortingLayerID: 1027733709 m_SortingLayer: 1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: f1a2cb3f7f820294b8bf45a3cf11e89a, type: 3} + m_Sprite: {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 + m_FlipX: 1 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 3.27, y: 3.85} + m_Size: {x: 3.125, y: 3.25} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &2105389528 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105389525} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8a1517e72696d4ad5af30e14bc8b9ed1, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 From f9c839fdf2a1c10ab202aa14a65d5a740971fd16 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Mon, 21 Feb 2022 14:27:59 -0600 Subject: [PATCH 3/8] bofa --- ...rt.controller => fuki-movement.controller} | 97 +++- ...ler.meta => fuki-movement.controller.meta} | 0 Assets/Fuki + Seiden/seiden-idle.anim | 68 +++ Assets/Fuki + Seiden/seiden-idle.anim.meta | 8 + .../Fuki + Seiden/seiden-movement.controller | 240 +++++++++ .../seiden-movement.controller.meta | 8 + Assets/Fuki + Seiden/seiden-walk.anim | 77 +++ Assets/Fuki + Seiden/seiden-walk.anim.meta | 8 + Assets/Fuki + Seiden/seiden-walk.png.meta | 102 +++- Assets/Scene 1 Assets/PlayerMovement.cs | 15 +- Assets/Scenes/Benji's Scene.unity | 495 +++++++++++++++++- 11 files changed, 1097 insertions(+), 21 deletions(-) rename Assets/Fuki + Seiden/{Char Art.controller => fuki-movement.controller} (63%) rename Assets/Fuki + Seiden/{Char Art.controller.meta => fuki-movement.controller.meta} (100%) create mode 100644 Assets/Fuki + Seiden/seiden-idle.anim create mode 100644 Assets/Fuki + Seiden/seiden-idle.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-movement.controller create mode 100644 Assets/Fuki + Seiden/seiden-movement.controller.meta create mode 100644 Assets/Fuki + Seiden/seiden-walk.anim create mode 100644 Assets/Fuki + Seiden/seiden-walk.anim.meta diff --git a/Assets/Fuki + Seiden/Char Art.controller b/Assets/Fuki + Seiden/fuki-movement.controller similarity index 63% rename from Assets/Fuki + Seiden/Char Art.controller rename to Assets/Fuki + Seiden/fuki-movement.controller index 58b0e3d..90a1655 100644 --- a/Assets/Fuki + Seiden/Char Art.controller +++ b/Assets/Fuki + Seiden/fuki-movement.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fuki-walk + m_Name: fuki-walk-right m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -37,7 +37,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Horizontal - m_EventTreshold: 0.01 + m_EventTreshold: 0.001 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 @@ -52,6 +52,58 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-2520759869683511573 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Horizontal + m_EventTreshold: -0.001 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1995400514068039803 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: fuki-walk-left + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2520759869683511573} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 1 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b2aeae3519ec346d6ba5aa4eb1c912e1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-1572041149606450433 AnimatorState: serializedVersion: 6 @@ -84,7 +136,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Char Art + m_Name: fuki-movement serializedVersion: 5 m_AnimatorParameters: - m_Name: Horizontal @@ -92,7 +144,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -116,7 +168,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Horizontal - m_EventTreshold: 0.01 + m_EventTreshold: 0.001 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7022381379398953809} m_Solo: 0 @@ -142,18 +194,47 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -7022381379398953809} - m_Position: {x: 540, y: 60, z: 0} + m_Position: {x: 770, y: 60, z: 0} - serializedVersion: 1 m_State: {fileID: -1572041149606450433} m_Position: {x: 310, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1995400514068039803} + m_Position: {x: 540, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 3733315961170216532} + - {fileID: 5542971985982201338} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 570, y: -30, z: 0} + m_AnyStatePosition: {x: 680, y: -30, z: 0} m_EntryPosition: {x: 330, y: -30, z: 0} - m_ExitPosition: {x: 550, y: 130, z: 0} + m_ExitPosition: {x: 670, y: 150, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -1572041149606450433} +--- !u!1101 &5542971985982201338 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Horizontal + m_EventTreshold: -0.001 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1995400514068039803} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Fuki + Seiden/Char Art.controller.meta b/Assets/Fuki + Seiden/fuki-movement.controller.meta similarity index 100% rename from Assets/Fuki + Seiden/Char Art.controller.meta rename to Assets/Fuki + Seiden/fuki-movement.controller.meta diff --git a/Assets/Fuki + Seiden/seiden-idle.anim b/Assets/Fuki + Seiden/seiden-idle.anim new file mode 100644 index 0000000..6ff771c --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-idle.anim @@ -0,0 +1,68 @@ +%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: seiden-idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.125 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-idle.anim.meta b/Assets/Fuki + Seiden/seiden-idle.anim.meta new file mode 100644 index 0000000..6b37ac2 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 026deafff492141f5ab1d2e649608be8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-movement.controller b/Assets/Fuki + Seiden/seiden-movement.controller new file mode 100644 index 0000000..6e54522 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-movement.controller @@ -0,0 +1,240 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8077888743940160789 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-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: 026deafff492141f5ab1d2e649608be8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-5639548798709285956 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Horizontal + m_EventTreshold: 0.001 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5184000313039322506 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-walk-right + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -725505904537309351} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 1 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7632640c845fa44ca9bca1bd1a072b54, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-1236971542150945798 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-walk-left + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5639548798709285956} + 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: 7632640c845fa44ca9bca1bd1a072b54, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-725505904537309351 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Horizontal + m_EventTreshold: -0.001 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-598186712762825722 +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: -1236971542150945798} + m_Position: {x: 390, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8077888743940160789} + m_Position: {x: 170, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5184000313039322506} + m_Position: {x: 610, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 8467386414634264506} + - {fileID: 1435758169152787585} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 510, y: -80, z: 0} + m_EntryPosition: {x: 190, y: -70, z: 0} + m_ExitPosition: {x: 510, y: 80, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8077888743940160789} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-movement + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Horizontal + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -598186712762825722} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1435758169152787585 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Horizontal + m_EventTreshold: -0.001 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5184000313039322506} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &8467386414634264506 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Horizontal + m_EventTreshold: 0.001 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1236971542150945798} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 diff --git a/Assets/Fuki + Seiden/seiden-movement.controller.meta b/Assets/Fuki + Seiden/seiden-movement.controller.meta new file mode 100644 index 0000000..d142b57 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-movement.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 168be8ef52398431fabf32c9fd1e8742 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-walk.anim b/Assets/Fuki + Seiden/seiden-walk.anim new file mode 100644 index 0000000..2e6beb0 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-walk.anim @@ -0,0 +1,77 @@ +%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: seiden-walk + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1747070116146791987, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + - time: 0.125 + value: {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + - time: 0.25 + value: {fileID: 961563961446613311, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + - time: 0.375 + value: {fileID: -7872002227644819647, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1747070116146791987, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + - {fileID: 4887068915747301843, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + - {fileID: 961563961446613311, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + - {fileID: -7872002227644819647, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-walk.anim.meta b/Assets/Fuki + Seiden/seiden-walk.anim.meta new file mode 100644 index 0000000..26e0ded --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-walk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7632640c845fa44ca9bca1bd1a072b54 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-walk.png.meta b/Assets/Fuki + Seiden/seiden-walk.png.meta index 9497c30..2cb2a4a 100644 --- a/Assets/Fuki + Seiden/seiden-walk.png.meta +++ b/Assets/Fuki + Seiden/seiden-walk.png.meta @@ -1,7 +1,19 @@ fileFormatVersion: 2 guid: 73ae3db8a07b2424caf7884baa7964f8 TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: 1747070116146791987 + second: seiden-walk_0 + - first: + 213: 4887068915747301843 + second: seiden-walk_1 + - first: + 213: 961563961446613311 + second: seiden-walk_2 + - first: + 213: -7872002227644819647 + second: seiden-walk_3 externalObjects: {} serializedVersion: 11 mipmaps: @@ -41,7 +53,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -101,7 +113,91 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: seiden-walk_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 33641a6a307de3810800000000000000 + internalID: 1747070116146791987 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: seiden-walk_1 + rect: + serializedVersion: 2 + x: 25 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3d9a8fb394b52d340800000000000000 + internalID: 4887068915747301843 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: seiden-walk_2 + rect: + serializedVersion: 2 + x: 50 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f31c7de0459285d00800000000000000 + internalID: 961563961446613311 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: seiden-walk_3 + rect: + serializedVersion: 2 + x: 75 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 147952e7ea701c290800000000000000 + internalID: -7872002227644819647 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Scene 1 Assets/PlayerMovement.cs b/Assets/Scene 1 Assets/PlayerMovement.cs index d9f6782..c4a900f 100644 --- a/Assets/Scene 1 Assets/PlayerMovement.cs +++ b/Assets/Scene 1 Assets/PlayerMovement.cs @@ -13,26 +13,25 @@ public class PlayerMovement : MonoBehaviour // Update is called once per frame void Update() { - + // Horizontal value is for the animation state machine. No code required, wow! animator.SetFloat("Horizontal", Input.GetAxis("Horizontal")); horizontalMove = Input.GetAxisRaw("Horizontal") * runSpeed; - if (Input.GetButtonDown("Jump")) - { + + if (Input.GetButtonDown("Jump")) { jump = true; } - if (Input.GetKeyDown(KeyCode.LeftShift)) - { + + if (Input.GetKeyDown(KeyCode.LeftShift)) { crouch = true; - } else if (Input.GetKeyUp(KeyCode.LeftShift)) - { + } else if (Input.GetKeyUp(KeyCode.LeftShift)) { crouch = false; } } void FixedUpdate() { - controller.Move(horizontalMove *Time.fixedDeltaTime, crouch, jump); + controller.Move(horizontalMove * Time.fixedDeltaTime, crouch, jump); jump = false; } } diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index ba3330c..6c9fea0 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -123,6 +123,180 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &15059982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 15059983} + m_Layer: 3 + m_Name: Ground Check + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &15059983 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 15059982} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1.86, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 101316509} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &101316508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 101316509} + - component: {fileID: 101316514} + - component: {fileID: 101316513} + - component: {fileID: 101316512} + - component: {fileID: 101316511} + - component: {fileID: 101316510} + m_Layer: 3 + m_Name: Char Movement + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &101316509 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101316508} + 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_Children: + - {fileID: 1494078892} + - {fileID: 838052152} + - {fileID: 15059983} + m_Father: {fileID: 179847748} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &101316510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101316508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84aafa4f9de096e4abfe9d463bffd26d, type: 3} + m_Name: + m_EditorClassIdentifier: + controller: {fileID: 101316514} + animator: {fileID: 1494078893} + runSpeed: 40 +--- !u!58 &101316511 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101316508} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.41, y: -0.83} + serializedVersion: 2 + m_Radius: 1.04 +--- !u!61 &101316512 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101316508} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 2b77ac6a45b826146a861b65c591e1d2, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.43, y: 0.39} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.13, y: 2.45} + m_EdgeRadius: 0 +--- !u!50 &101316513 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101316508} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 3 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!114 &101316514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 101316508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90da90214d3bb324a8ed8f5b046ba4b9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_JumpForce: 800 + m_CrouchSpeed: 0.4 + m_MovementSmoothing: 0.05 + m_AirControl: 1 + m_WhatIsGround: + serializedVersion: 2 + m_Bits: 55 + m_GroundCheck: {fileID: 15059983} + m_CeilingCheck: {fileID: 838052152} + m_CrouchDisableCollider: {fileID: 101316512} + OnLandEvent: + m_PersistentCalls: + m_Calls: [] + OnCrouchEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &109554490 GameObject: m_ObjectHideFlags: 0 @@ -155,6 +329,89 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &179847746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 179847748} + - component: {fileID: 179847747} + m_Layer: 3 + m_Name: Seiden + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &179847747 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 179847746} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.125, y: 3.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &179847748 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 179847746} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2, y: 2.08, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 101316509} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717061313 GameObject: m_ObjectHideFlags: 0 @@ -215,6 +472,36 @@ Transform: m_Father: {fileID: 1641807371} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &838052151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838052152} + m_Layer: 3 + m_Name: Ceiling Check + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &838052152 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838052151} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.86, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 101316509} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1009898142 GameObject: m_ObjectHideFlags: 0 @@ -382,6 +669,108 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1494078891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1494078892} + - component: {fileID: 1494078894} + - component: {fileID: 1494078893} + m_Layer: 3 + m_Name: Char Art + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1494078892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494078891} + 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_Children: [] + m_Father: {fileID: 101316509} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1494078893 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494078891} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 168be8ef52398431fabf32c9fd1e8742, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &1494078894 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1494078891} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1027733709 + m_SortingLayer: 1 + m_SortingOrder: 0 + m_Sprite: {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.125, y: 3.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1641807370 GameObject: m_ObjectHideFlags: 0 @@ -594,7 +983,7 @@ GameObject: - component: {fileID: 2067235194} - component: {fileID: 2067235195} m_Layer: 3 - m_Name: Char + m_Name: Fuki m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -608,7 +997,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2067235193} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.08, z: 0} + m_LocalPosition: {x: -1, y: 2.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1641807371} @@ -768,3 +1157,105 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2133264990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2133264993} + - component: {fileID: 2133264992} + - component: {fileID: 2133264991} + m_Layer: 0 + m_Name: seiden-walk_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &2133264991 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133264990} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 168be8ef52398431fabf32c9fd1e8742, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &2133264992 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133264990} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1747070116146791987, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.5625, y: 1.625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &2133264993 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2133264990} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10.208769, y: -7.1150165, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} From 20ecf26165cbf3be8869cfb914114e32704da624 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Mon, 21 Feb 2022 16:33:36 -0600 Subject: [PATCH 4/8] ~~Slide~~ Walk to the left --- Assets/Fuki + Seiden/fuki-movement.controller | 2 +- Assets/Scenes/Benji's Scene.unity | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Fuki + Seiden/fuki-movement.controller b/Assets/Fuki + Seiden/fuki-movement.controller index 90a1655..db97927 100644 --- a/Assets/Fuki + Seiden/fuki-movement.controller +++ b/Assets/Fuki + Seiden/fuki-movement.controller @@ -237,4 +237,4 @@ AnimatorStateTransition: m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 6c9fea0..5e2f293 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -760,7 +760,7 @@ SpriteRenderer: m_SortingLayerID: 1027733709 m_SortingLayer: 1 m_SortingOrder: 0 - m_Sprite: {fileID: -2307464743885467549, guid: 2ce0ce2028bc94666b29a170edb2427e, type: 3} + m_Sprite: {fileID: 1747070116146791987, guid: 73ae3db8a07b2424caf7884baa7964f8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 1 m_FlipY: 0 From ba3b00fa8c865a7863c798c2f78a64b16b187b4e Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Mon, 21 Feb 2022 17:45:32 -0600 Subject: [PATCH 5/8] Seiden's expressions --- Assets/Expressions.cs | 19 ++ Assets/Expressions.cs.meta | 11 + .../Fuki + Seiden/fuki-emote-spritesheet.png | Bin 0 -> 693 bytes .../fuki-emote-spritesheet.png.meta | 168 +++++++++++ .../{fuki-idle.anim => fuki-move-idle.anim} | 2 +- ...dle.anim.meta => fuki-move-idle.anim.meta} | 0 ...uki-walk.png => fuki-move-spritesheet.png} | Bin ...ng.meta => fuki-move-spritesheet.png.meta} | 0 .../{fuki-walk.anim => fuki-move-walk.anim} | 2 +- ...alk.anim.meta => fuki-move-walk.anim.meta} | 0 ...vement.controller => fuki-move.controller} | 2 +- ...troller.meta => fuki-move.controller.meta} | 0 .../Fuki + Seiden/seiden-emote-annoyed.anim | 71 +++++ .../seiden-emote-annoyed.anim.meta | 8 + Assets/Fuki + Seiden/seiden-emote-blush.anim | 71 +++++ .../seiden-emote-blush.anim.meta | 8 + .../Fuki + Seiden/seiden-emote-neutral.anim | 71 +++++ .../seiden-emote-neutral.anim.meta | 8 + .../seiden-emote-spritesheet.png | Bin 0 -> 1050 bytes .../seiden-emote-spritesheet.png.meta | 264 ++++++++++++++++++ Assets/Fuki + Seiden/seiden-emote.controller | 240 ++++++++++++++++ .../seiden-emote.controller.meta | 8 + ...seiden-idle.anim => seiden-move-idle.anim} | 2 +- ...e.anim.meta => seiden-move-idle.anim.meta} | 0 ...seiden-walk.anim => seiden-move-walk.anim} | 2 +- ...k.anim.meta => seiden-move-walk.anim.meta} | 0 ...ment.controller => seiden-move.controller} | 2 +- ...oller.meta => seiden-move.controller.meta} | 0 Assets/Scenes/Benji's Scene.unity | 257 ++++++++++------- 29 files changed, 1104 insertions(+), 112 deletions(-) create mode 100644 Assets/Expressions.cs create mode 100644 Assets/Expressions.cs.meta create mode 100644 Assets/Fuki + Seiden/fuki-emote-spritesheet.png create mode 100644 Assets/Fuki + Seiden/fuki-emote-spritesheet.png.meta rename Assets/Fuki + Seiden/{fuki-idle.anim => fuki-move-idle.anim} (98%) rename Assets/Fuki + Seiden/{fuki-idle.anim.meta => fuki-move-idle.anim.meta} (100%) rename Assets/Fuki + Seiden/{fuki-walk.png => fuki-move-spritesheet.png} (100%) rename Assets/Fuki + Seiden/{fuki-walk.png.meta => fuki-move-spritesheet.png.meta} (100%) rename Assets/Fuki + Seiden/{fuki-walk.anim => fuki-move-walk.anim} (98%) rename Assets/Fuki + Seiden/{fuki-walk.anim.meta => fuki-move-walk.anim.meta} (100%) rename Assets/Fuki + Seiden/{fuki-movement.controller => fuki-move.controller} (99%) rename Assets/Fuki + Seiden/{fuki-movement.controller.meta => fuki-move.controller.meta} (100%) create mode 100644 Assets/Fuki + Seiden/seiden-emote-annoyed.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote-blush.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-blush.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote-neutral.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote-spritesheet.png create mode 100644 Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote.controller create mode 100644 Assets/Fuki + Seiden/seiden-emote.controller.meta rename Assets/Fuki + Seiden/{seiden-idle.anim => seiden-move-idle.anim} (98%) rename Assets/Fuki + Seiden/{seiden-idle.anim.meta => seiden-move-idle.anim.meta} (100%) rename Assets/Fuki + Seiden/{seiden-walk.anim => seiden-move-walk.anim} (98%) rename Assets/Fuki + Seiden/{seiden-walk.anim.meta => seiden-move-walk.anim.meta} (100%) rename Assets/Fuki + Seiden/{seiden-movement.controller => seiden-move.controller} (99%) rename Assets/Fuki + Seiden/{seiden-movement.controller.meta => seiden-move.controller.meta} (100%) diff --git a/Assets/Expressions.cs b/Assets/Expressions.cs new file mode 100644 index 0000000..1f8b8e4 --- /dev/null +++ b/Assets/Expressions.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Expressions : MonoBehaviour { + public Animator animator; + private int counter; + + // Start is called before the first frame update + void Start() { + counter = 0; + } + + // Update is called once per frame + void Update() { + counter++; + animator.SetInteger("Emotion", (counter / 200) % 3); + } +} diff --git a/Assets/Expressions.cs.meta b/Assets/Expressions.cs.meta new file mode 100644 index 0000000..32b5eeb --- /dev/null +++ b/Assets/Expressions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94816f70614b7460bb8fda6a86257bdd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/fuki-emote-spritesheet.png b/Assets/Fuki + Seiden/fuki-emote-spritesheet.png new file mode 100644 index 0000000000000000000000000000000000000000..69606cafa9b04a97b5559edbc58a27fe96fa3bf5 GIT binary patch literal 693 zcmV;m0!safP)X1^@s6b5wmq00001b5ch_0Itp) z=>Px%Z%IT!R9Hvdm`^A~K^(_tlO%W4I#3*?R=LQ51EO54gFgp~3nd5TCOJ_KQd}qp z{|>k)3dKQtQIs4h4pz8JlIT12o1HiFX5M@2&BeRu?Tq*NedhO@`R&^T3vsn~O#R5y z-d^v;?e*1uBE%yCr~H*+4T2tCm~1izlD%H%WBCfj#qbqL)pzp@BvV6yD~Sm$6KGV`oc;p(JP$WN<+!C_63~9uWc{AXNl`%Ae6a3CPwq8CMLWh#Xkd z>|o!RvLcJb$q*v8m6Cy9*$Zad{5023#wEie5+*wy#o!`XDH#xU)k#Y3 zD|FJmy{@pYY_TXY*94Ac=uB-BdSQ;3{8XpeFIe@riO*wo=}?$2}coe!4R9BR;=gwl*igX)6D<=+&>x{ z1K>)cIySh~fG6>sP}; zCzlE^m6dIu#KF*BtmrsKqr)XPMj1#wgt|YC1-(>Zo(qQcojpB0EPiz8x+)PK2lemT zBJRzu<@F;(Tnr-|fVSE$9`Nz)ffhK8(E#Q|m5Gz#E207rGy-kxS!J2s5k~iak%^n} bZ$y3psN1gZVTs5a00000NkvXXu0mjf{M0iE literal 0 HcmV?d00001 diff --git a/Assets/Fuki + Seiden/fuki-emote-spritesheet.png.meta b/Assets/Fuki + Seiden/fuki-emote-spritesheet.png.meta new file mode 100644 index 0000000..f63cd09 --- /dev/null +++ b/Assets/Fuki + Seiden/fuki-emote-spritesheet.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: d48fd9d9f47b5467cb424240c7f9f276 +TextureImporter: + internalIDToNameTable: + - first: + 213: -1886119498855039967 + second: Fuki_neutral_spritesheet_0 + - first: + 213: -7381896143297181974 + second: Fuki_neutral_spritesheet_1 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 8 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Fuki_neutral_spritesheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 25 + height: 25 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 12cbec21f4823d5e0800000000000000 + internalID: -1886119498855039967 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fuki_neutral_spritesheet_1 + rect: + serializedVersion: 2 + x: 25 + y: 0 + width: 25 + height: 25 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ae602f1919c3e8990800000000000000 + internalID: -7381896143297181974 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/fuki-idle.anim b/Assets/Fuki + Seiden/fuki-move-idle.anim similarity index 98% rename from Assets/Fuki + Seiden/fuki-idle.anim rename to Assets/Fuki + Seiden/fuki-move-idle.anim index 18f4ae2..0eb4865 100644 --- a/Assets/Fuki + Seiden/fuki-idle.anim +++ b/Assets/Fuki + Seiden/fuki-move-idle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fuki-idle + m_Name: fuki-move-idle serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/fuki-idle.anim.meta b/Assets/Fuki + Seiden/fuki-move-idle.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-idle.anim.meta rename to Assets/Fuki + Seiden/fuki-move-idle.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-walk.png b/Assets/Fuki + Seiden/fuki-move-spritesheet.png similarity index 100% rename from Assets/Fuki + Seiden/fuki-walk.png rename to Assets/Fuki + Seiden/fuki-move-spritesheet.png diff --git a/Assets/Fuki + Seiden/fuki-walk.png.meta b/Assets/Fuki + Seiden/fuki-move-spritesheet.png.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-walk.png.meta rename to Assets/Fuki + Seiden/fuki-move-spritesheet.png.meta diff --git a/Assets/Fuki + Seiden/fuki-walk.anim b/Assets/Fuki + Seiden/fuki-move-walk.anim similarity index 98% rename from Assets/Fuki + Seiden/fuki-walk.anim rename to Assets/Fuki + Seiden/fuki-move-walk.anim index b590c4c..9acc4a1 100644 --- a/Assets/Fuki + Seiden/fuki-walk.anim +++ b/Assets/Fuki + Seiden/fuki-move-walk.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fuki-walk + m_Name: fuki-move-walk serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/fuki-walk.anim.meta b/Assets/Fuki + Seiden/fuki-move-walk.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-walk.anim.meta rename to Assets/Fuki + Seiden/fuki-move-walk.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-movement.controller b/Assets/Fuki + Seiden/fuki-move.controller similarity index 99% rename from Assets/Fuki + Seiden/fuki-movement.controller rename to Assets/Fuki + Seiden/fuki-move.controller index db97927..b8825ee 100644 --- a/Assets/Fuki + Seiden/fuki-movement.controller +++ b/Assets/Fuki + Seiden/fuki-move.controller @@ -136,7 +136,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fuki-movement + m_Name: fuki-move serializedVersion: 5 m_AnimatorParameters: - m_Name: Horizontal diff --git a/Assets/Fuki + Seiden/fuki-movement.controller.meta b/Assets/Fuki + Seiden/fuki-move.controller.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-movement.controller.meta rename to Assets/Fuki + Seiden/fuki-move.controller.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-annoyed.anim new file mode 100644 index 0000000..d758037 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-annoyed.anim @@ -0,0 +1,71 @@ +%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: seiden-emote-annoyed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - time: 0.25 + value: {fileID: -2826190552252792257, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - {fileID: -2826190552252792257, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta b/Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta new file mode 100644 index 0000000..9dfb41c --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 967751f8a30cf409faadb0899fe76cc9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-blush.anim b/Assets/Fuki + Seiden/seiden-emote-blush.anim new file mode 100644 index 0000000..ef69496 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-blush.anim @@ -0,0 +1,71 @@ +%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: seiden-emote-blush + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - time: 0.25 + value: {fileID: 5625398474919881811, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - {fileID: 5625398474919881811, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-blush.anim.meta b/Assets/Fuki + Seiden/seiden-emote-blush.anim.meta new file mode 100644 index 0000000..9daf36e --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-blush.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecc9063178eb74dd6a44b0d14b198ff1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-neutral.anim new file mode 100644 index 0000000..48076e5 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-neutral.anim @@ -0,0 +1,71 @@ +%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: seiden-emote-neutral + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - time: 0.25 + value: {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + 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: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + - {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta b/Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta new file mode 100644 index 0000000..3e94e76 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5cd477663c46e4006a64a795d04f6532 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-spritesheet.png b/Assets/Fuki + Seiden/seiden-emote-spritesheet.png new file mode 100644 index 0000000000000000000000000000000000000000..f03d33d7aa43803c868c7f20eb51dfcfa6111e12 GIT binary patch literal 1050 zcmV+#1m*jQP)Px&)Ja4^RA@u(n!jrlK@`X58m$$y5j4WVkwOiJwgEv8@gET4F9-oilR_;lue30N zX@Zb0>OUY#I6=WiK?#UOJUB>FSePpWvC-z_JK49qotxR2xt&G9w@vPLXZQO)^XA9i zH?N@rj-^&>#GB0=Kb(J^fAy{r@Ca{{sv4z1(8HHkPB{a)v-DYCTj}>F0!pP}6)!xz z(^jgt>Fv>2pwt>;AP`voa&tfUPFoEhy;n!34|qXzgHBtmcb+TXaH~V30FnzJsNSX; zZv762AXE=bT^eo>3XFzT$PhytrAo6>07yY`hp2mS39eCP*p`CkT4; z#{8861fov~l2W6vA<~LO!@>sQ8(x@0d*5CwGb6Z<-gxN^!UZykh7$x65owQ^AG8>R zf~3?KdugQJ;wwrF3}pm!!S-W|zoz&!e!cvplXLL$nL?6m8cq=0=@T-C08Mn94*^N3 zVf|sn-+~FowlNY2_6{6tds}Me$FAP_X$kjbg~L?Q7z3F-*BK!g^Z0psRtw9?T22e5dn~p=RwFCZHH})(I>I zowD1r5hkD*bmq_!gD!J2tD1mf(3QP*h(TAu1pGe@I{YTb!3{d|TvdZ^QjI8s&S%a6 zG6uxvYfY*l2Aylwig6mnpv!Do?wyH2$A^{}bjC!hVgiamXIr&meXW!xpcr(N5noAD zh&hKgV$fwhWgS|ntJ`c@Nv&c1M~_s{q3flBZod<}g`f@-(CcfVlcj>rC~lStx@_4i zGXbT7j_(ar2PqYF399s@g3k3aC>3;>T}s|qY?WS=K{u%gy{4nshL-~Vl?pnlF16Ke z@oO=@mI+ctLn`QePGd;nnXj--D(Lv6 Date: Mon, 21 Feb 2022 20:14:49 -0600 Subject: [PATCH 6/8] blebebeb --- Assets/Scenes/Benji's Scene.unity | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index cbd5f7b..3aab62b 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -147,7 +147,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15059982} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.86, z: 0} + m_LocalPosition: {x: 0, y: -0.73, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 101316509} @@ -182,7 +182,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101316508} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1494078892} @@ -219,9 +219,9 @@ CircleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.41, y: -0.83} + m_Offset: {x: 0.05, y: -0.41} serializedVersion: 2 - m_Radius: 1.04 + m_Radius: 0.28 --- !u!61 &101316512 BoxCollider2D: m_ObjectHideFlags: 0 @@ -235,7 +235,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.43, y: 0.39} + m_Offset: {x: 0.06, y: 0.19} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -246,7 +246,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2.13, y: 2.45} + m_Size: {x: 0.76, y: 0.63} m_EdgeRadius: 0 --- !u!50 &101316513 Rigidbody2D: @@ -355,7 +355,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 171733763} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -7.31, y: 3.43, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 967738953} @@ -538,7 +538,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 717061313} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.86, z: 0} + m_LocalPosition: {x: 0, y: -0.73, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1641807371} @@ -568,7 +568,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804516415} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.86, z: 0} + m_LocalPosition: {x: 0, y: 0.64, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1641807371} @@ -598,7 +598,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838052151} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.86, z: 0} + m_LocalPosition: {x: 0, y: 0.79, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 101316509} @@ -694,7 +694,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 9, y: 0} + m_Offset: {x: 9.8, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -720,7 +720,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -9, y: 0} + m_Offset: {x: -9.8, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -769,7 +769,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.33333334, g: 0.6666667, b: 0.8666667, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -947,7 +947,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1641807370} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.017, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2105389526} @@ -984,9 +984,9 @@ CircleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.41, y: -0.83} + m_Offset: {x: 0.05, y: -0.4} serializedVersion: 2 - m_Radius: 1.04 + m_Radius: 0.28 --- !u!61 &1641807374 BoxCollider2D: m_ObjectHideFlags: 0 @@ -1000,7 +1000,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.43, y: 0.39} + m_Offset: {x: 0.06, y: 0.19} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -1011,7 +1011,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2.13, y: 2.45} + m_Size: {x: 0.76, y: 0.63} m_EdgeRadius: 0 --- !u!50 &1641807375 Rigidbody2D: @@ -1087,7 +1087,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1657878501} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.39, y: -4.64, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 109554491} @@ -1106,7 +1106,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: -4} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -1228,7 +1228,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105389525} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.033, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1641807371} From 455d1c5008cb63efe370427b5fbdad00b8d4bf59 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Mon, 21 Feb 2022 21:49:35 -0600 Subject: [PATCH 7/8] Control emotes via an Animator, yay! --- Assets/Expressions.cs | 2 +- .../seiden-emote-idle-annoyed.anim | 53 +++++++++++++++++++ .../seiden-emote-idle-annoyed.anim.meta | 8 +++ .../seiden-emote-idle-blush.anim | 53 +++++++++++++++++++ .../seiden-emote-idle-blush.anim.meta | 8 +++ .../seiden-emote-idle-neutral.anim | 53 +++++++++++++++++++ .../seiden-emote-idle-neutral.anim.meta | 8 +++ ...ed.anim => seiden-emote-talk-annoyed.anim} | 2 +- ...ta => seiden-emote-talk-annoyed.anim.meta} | 0 ...lush.anim => seiden-emote-talk-blush.anim} | 2 +- ...meta => seiden-emote-talk-blush.anim.meta} | 0 ...al.anim => seiden-emote-talk-neutral.anim} | 2 +- ...ta => seiden-emote-talk-neutral.anim.meta} | 0 13 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-blush.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim create mode 100644 Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta rename Assets/Fuki + Seiden/{seiden-emote-annoyed.anim => seiden-emote-talk-annoyed.anim} (98%) rename Assets/Fuki + Seiden/{seiden-emote-annoyed.anim.meta => seiden-emote-talk-annoyed.anim.meta} (100%) rename Assets/Fuki + Seiden/{seiden-emote-blush.anim => seiden-emote-talk-blush.anim} (98%) rename Assets/Fuki + Seiden/{seiden-emote-blush.anim.meta => seiden-emote-talk-blush.anim.meta} (100%) rename Assets/Fuki + Seiden/{seiden-emote-neutral.anim => seiden-emote-talk-neutral.anim} (98%) rename Assets/Fuki + Seiden/{seiden-emote-neutral.anim.meta => seiden-emote-talk-neutral.anim.meta} (100%) diff --git a/Assets/Expressions.cs b/Assets/Expressions.cs index 1f8b8e4..8c01d9d 100644 --- a/Assets/Expressions.cs +++ b/Assets/Expressions.cs @@ -14,6 +14,6 @@ public class Expressions : MonoBehaviour { // Update is called once per frame void Update() { counter++; - animator.SetInteger("Emotion", (counter / 200) % 3); + animator.SetInteger("Animation", (counter / 400) % 6); } } diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim new file mode 100644 index 0000000..81b0ce8 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim @@ -0,0 +1,53 @@ +%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: seiden-emote-idle-annoyed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta new file mode 100644 index 0000000..0362278 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5f48dd41f17f4abe914952ab3297525 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim new file mode 100644 index 0000000..01811f7 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim @@ -0,0 +1,53 @@ +%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: seiden-emote-idle-blush + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta new file mode 100644 index 0000000..922cbc9 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a072a3589d3d044d18323a6a7cab1c5e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim new file mode 100644 index 0000000..b99714c --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim @@ -0,0 +1,53 @@ +%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: seiden-emote-idle-neutral + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta new file mode 100644 index 0000000..8dfee12 --- /dev/null +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd2321cae068d4595922187bab1501f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim similarity index 98% rename from Assets/Fuki + Seiden/seiden-emote-annoyed.anim rename to Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim index d758037..555fe13 100644 --- a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-annoyed + m_Name: seiden-emote-talk-annoyed serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-annoyed.anim.meta rename to Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-blush.anim b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim similarity index 98% rename from Assets/Fuki + Seiden/seiden-emote-blush.anim rename to Assets/Fuki + Seiden/seiden-emote-talk-blush.anim index ef69496..5ac73cc 100644 --- a/Assets/Fuki + Seiden/seiden-emote-blush.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-blush + m_Name: seiden-emote-talk-blush serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-blush.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-blush.anim.meta rename to Assets/Fuki + Seiden/seiden-emote-talk-blush.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim similarity index 98% rename from Assets/Fuki + Seiden/seiden-emote-neutral.anim rename to Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim index 48076e5..e7251ed 100644 --- a/Assets/Fuki + Seiden/seiden-emote-neutral.anim +++ b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-neutral + m_Name: seiden-emote-talk-neutral serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta b/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-neutral.anim.meta rename to Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta From efe08d5f83371ba7ad43482e28771b7695295c79 Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Mon, 21 Feb 2022 21:50:06 -0600 Subject: [PATCH 8/8] I forgot to save the scene lol --- .../seiden-emote-idle-annoyed.anim | 25 +- .../seiden-emote-idle-blush.anim | 25 +- .../seiden-emote-idle-neutral.anim | 25 +- Assets/Fuki + Seiden/seiden-emote.controller | 430 +++++++++++++++--- Assets/Fuki + Seiden/seiden-move.controller | 28 +- Assets/Scenes/Benji's Scene.unity | 26 +- README.md | 13 + 7 files changed, 452 insertions(+), 120 deletions(-) diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim index 81b0ce8..9b93d8a 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim index 01811f7..03d2789 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim index b99714c..98027a2 100644 --- a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim +++ b/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Fuki + Seiden/seiden-emote.controller b/Assets/Fuki + Seiden/seiden-emote.controller index 4b28e9f..df2cf55 100644 --- a/Assets/Fuki + Seiden/seiden-emote.controller +++ b/Assets/Fuki + Seiden/seiden-emote.controller @@ -1,5 +1,56 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9186142541091539981 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-neutral + 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: cd2321cae068d4595922187bab1501f3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-7166047756952805489 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-6822513122673356238 AnimatorStateMachine: serializedVersion: 6 @@ -10,37 +61,50 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -2740153168469901383} - m_Position: {x: -80, y: 160, z: 0} + m_State: {fileID: 6164691065869988772} + m_Position: {x: 210, y: -250, z: 0} - serializedVersion: 1 - m_State: {fileID: -569036141754617882} - m_Position: {x: 80, y: 20, z: 0} + m_State: {fileID: 2974820294111061558} + m_Position: {x: 430, y: -240, z: 0} - serializedVersion: 1 - m_State: {fileID: -888380644526969811} - m_Position: {x: 300, y: 20, z: 0} + m_State: {fileID: -9186142541091539981} + m_Position: {x: -90, y: -270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7840173655885811835} + m_Position: {x: 230, y: -190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -500612317329436769} + m_Position: {x: 460, y: -190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6145718434369378720} + m_Position: {x: 0, y: -190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - - {fileID: -2196437746789456446} - - {fileID: 5409088207089677733} + - {fileID: 3658525340161196703} + - {fileID: 6736497761875868407} + - {fileID: -2269429987076585761} + - {fileID: 1711183836402485999} + - {fileID: 2485851883079793739} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 210, y: -60, z: 0} - m_EntryPosition: {x: -60, y: -100, z: 0} - m_ExitPosition: {x: 200, y: 100, z: 0} + m_AnyStatePosition: {x: 230, y: -370, z: 0} + m_EntryPosition: {x: -50, y: -370, z: 0} + m_ExitPosition: {x: 250, y: -50, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -2740153168469901383} ---- !u!1102 &-2740153168469901383 + m_DefaultState: {fileID: -9186142541091539981} +--- !u!1102 &-6145718434369378720 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-neutral + m_Name: seiden-emote-talk-neutral m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -7166047756952805489} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -56,7 +120,35 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-2196437746789456446 +--- !u!1109 &-4200133955589818273 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 1 +--- !u!1109 &-3725529132504020838 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 1 +--- !u!1101 &-2269429987076585761 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -65,34 +157,59 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 6 - m_ConditionEvent: Emotion - m_EventTreshold: 1 + m_ConditionEvent: Animation + m_EventTreshold: 2 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -569036141754617882} + m_DstState: {fileID: 6164691065869988772} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0 + m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1102 &-888380644526969811 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1520562656543533555 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-500612317329436769 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-blush + m_Name: seiden-emote-talk-blush m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8161675390358475728} + - {fileID: 2540998140701847090} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -108,33 +225,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-569036141754617882 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: seiden-emote-annoyed - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 5244133421129395689} - 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: 967751f8a30cf409faadb0899fe76cc9, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -144,10 +234,10 @@ AnimatorController: m_Name: seiden-emote serializedVersion: 5 m_AnimatorParameters: - - m_Name: Emotion + - m_Name: Animation m_Type: 3 m_DefaultFloat: 0 - m_DefaultInt: 0 + m_DefaultInt: 1 m_DefaultBool: 0 m_Controller: {fileID: 0} m_AnimatorLayers: @@ -163,7 +253,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &5244133421129395689 +--- !u!1101 &804085019347685859 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -172,23 +262,23 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Emotion - m_EventTreshold: 1 + m_ConditionEvent: Animation + m_EventTreshold: 2 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 0 + m_ExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &5409088207089677733 +--- !u!1101 &1711183836402485999 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -197,23 +287,48 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 6 - m_ConditionEvent: Emotion - m_EventTreshold: 2 + m_ConditionEvent: Animation + m_EventTreshold: 4 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -888380644526969811} + m_DstState: {fileID: 2974820294111061558} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 0 ---- !u!1101 &8161675390358475728 + m_CanTransitionToSelf: 1 +--- !u!1101 &2485851883079793739 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Animation + m_EventTreshold: 5 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -500612317329436769} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2540998140701847090 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -222,19 +337,194 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 7 - m_ConditionEvent: Emotion - m_EventTreshold: 2 + m_ConditionEvent: Animation + m_EventTreshold: 5 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2974820294111061558 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-blush + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1520562656543533555} + 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: a072a3589d3d044d18323a6a7cab1c5e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3658525340161196703 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Animation + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6145718434369378720} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &4044890664384744729 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 7 + m_ConditionEvent: Animation + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &5407602098090957073 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New StateMachine + m_ChildStates: [] + 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: 0} +--- !u!1102 &6164691065869988772 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-idle-annoyed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 804085019347685859} + 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: a5f48dd41f17f4abe914952ab3297525, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6736497761875868407 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Animation + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7840173655885811835} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &7840173655885811835 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: seiden-emote-talk-annoyed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4044890664384744729} + 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: 967751f8a30cf409faadb0899fe76cc9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Fuki + Seiden/seiden-move.controller b/Assets/Fuki + Seiden/seiden-move.controller index 2bc8bcd..4bfa771 100644 --- a/Assets/Fuki + Seiden/seiden-move.controller +++ b/Assets/Fuki + Seiden/seiden-move.controller @@ -36,7 +36,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Horizontal - m_EventTreshold: 0.001 + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 @@ -46,7 +46,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -115,7 +115,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Horizontal - m_EventTreshold: -0.001 + m_EventTreshold: -0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 @@ -124,8 +124,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.5 - m_HasExitTime: 0 + m_ExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -174,7 +174,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -198,7 +198,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Horizontal - m_EventTreshold: -0.001 + m_EventTreshold: -0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5184000313039322506} m_Solo: 0 @@ -207,9 +207,9 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 @@ -223,7 +223,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Horizontal - m_EventTreshold: 0.001 + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -1236971542150945798} m_Solo: 0 @@ -232,9 +232,9 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 3aab62b..1a088e4 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -455,7 +455,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179847746} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -506,13 +506,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179847746} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: 2.08, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 101316509} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717061313 GameObject: @@ -931,7 +931,6 @@ GameObject: - component: {fileID: 1641807375} - component: {fileID: 1641807374} - component: {fileID: 1641807373} - - component: {fileID: 1641807372} m_Layer: 3 m_Name: Char Movement m_TagString: Untagged @@ -956,21 +955,6 @@ Transform: m_Father: {fileID: 2067235194} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1641807372 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641807370} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 84aafa4f9de096e4abfe9d463bffd26d, type: 3} - m_Name: - m_EditorClassIdentifier: - controller: {fileID: 1641807376} - animator: {fileID: 2105389528} - runSpeed: 40 --- !u!58 &1641807373 CircleCollider2D: m_ObjectHideFlags: 0 @@ -1149,7 +1133,7 @@ Transform: m_Children: - {fileID: 1641807371} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2067235195 SpriteRenderer: diff --git a/README.md b/README.md index 48d25de..2a3011a 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,16 @@ 1. Go to *Projects* > *Add project from disk* 1. Navigate to the cloned project folder from GitKraken 1. Open the project + +--- + +## Seiden emote animations + +``` +0: Neutral idle +1: Neutral talking +2: Annoyed idle +3: Annoyed talking +4: Blushing idle +5: Blushing talking +```