Add more emotes to Fuki & Seiden heads

This commit is contained in:
MindfulMinun committed 2022-02-25 19:20:33 -06:00
1 parent ea2a88b5ea
commit 2a787789fa
29 files changed
+1366 -441

No files matched your search

+1 -1
View File
@@ -14,6 +14,6 @@ public class Expressions : MonoBehaviour {
// Update is called once per frame
void Update() {
counter++;
animator.SetInteger("Animation", (counter / 100) % 8);
animator.SetInteger("Animation", (counter / 100) % 12);
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

@@ -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:
File diff suppressed because it is too large. Load diff
@@ -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: fuki-emote-idle-laugh
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: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, 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: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.25
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: []
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cb6d9303f09d04bfda6bc97633cedecc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
@@ -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: fuki-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:
- curve:
- time: 0
value: {fileID: 2505844562292807002, guid: bb320d191f76f4228ad733eb9b5ce880, 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: 2505844562292807002, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.25
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: []
Binary file not shown.

Before

Width:  |  Height:  |  Size: 693 B

After

Width:  |  Height:  |  Size: 963 B

@@ -1,13 +1,19 @@
fileFormatVersion: 2
guid: d48fd9d9f47b5467cb424240c7f9f276
guid: bb320d191f76f4228ad733eb9b5ce880
TextureImporter:
internalIDToNameTable:
- first:
213: -1886119498855039967
second: Fuki_neutral_spritesheet_0
213: -1197645311261903289
second: fuki-emote-spritesheet_0
- first:
213: -7381896143297181974
second: Fuki_neutral_spritesheet_1
213: -4508786471188571043
second: fuki-emote-spritesheet_1
- first:
213: 2505844562292807002
second: fuki-emote-spritesheet_2
- first:
213: 4082602398422066911
second: fuki-emote-spritesheet_3
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -109,7 +115,49 @@ TextureImporter:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Fuki_neutral_spritesheet_0
name: fuki-emote-spritesheet_0
rect:
serializedVersion: 2
x: 0
y: 25
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: 746725f4feb116fe0800000000000000
internalID: -1197645311261903289
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fuki-emote-spritesheet_1
rect:
serializedVersion: 2
x: 25
y: 25
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: d5cd7b0d7929d61c0800000000000000
internalID: -4508786471188571043
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: fuki-emote-spritesheet_2
rect:
serializedVersion: 2
x: 0
@@ -123,14 +171,14 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 12cbec21f4823d5e0800000000000000
internalID: -1886119498855039967
spriteID: a559ec55a5c86c220800000000000000
internalID: 2505844562292807002
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: Fuki_neutral_spritesheet_1
name: fuki-emote-spritesheet_3
rect:
serializedVersion: 2
x: 25
@@ -144,8 +192,8 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ae602f1919c3e8990800000000000000
internalID: -7381896143297181974
spriteID: fd6ea15304158a830800000000000000
internalID: 4082602398422066911
vertices: []
indices:
edges: []
@@ -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: fuki-emote-talk-laugh
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: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
- time: 0.16666667
value: {fileID: -4508786471188571043, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 6
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: -1197645311261903289, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
- {fileID: -4508786471188571043, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
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: []
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 35021ec3a11fc44ccb3175d828537075
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fuki-emote-talk
m_Name: fuki-emote-talk-neutral
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@@ -20,9 +20,9 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
value: {fileID: 2505844562292807002, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
- time: 0.25
value: {fileID: -7381896143297181974, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
value: {fileID: 4082602398422066911, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
attribute: m_Sprite
path:
classID: 212
@@ -42,8 +42,8 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
- {fileID: -7381896143297181974, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
- {fileID: 2505844562292807002, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
- {fileID: 4082602398422066911, guid: bb320d191f76f4228ad733eb9b5ce880, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@@ -20,20 +20,11 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -1871821792033348118, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- time: 0.25
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
attribute: m_Sprite
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_SampleRate: 4
m_WrapMode: 0
m_Bounds:
@@ -48,23 +39,14 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 2015549526
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -1871821792033348118, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_StopTime: 0.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -20,20 +20,11 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -3403767949682752304, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- time: 0.25
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
attribute: m_Sprite
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_SampleRate: 4
m_WrapMode: 0
m_Bounds:
@@ -48,23 +39,14 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 2015549526
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -3403767949682752304, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_StopTime: 0.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fuki-emote-idle
m_Name: seiden-emote-idle-cry
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
@@ -20,7 +20,7 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
value: {fileID: 6254823859401255868, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
@@ -40,7 +40,7 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -1886119498855039967, guid: d48fd9d9f47b5467cb424240c7f9f276, type: 3}
- {fileID: 6254823859401255868, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8f2e5f2b940814dcaa6afec90416e303
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
@@ -20,32 +20,18 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
attribute: m_Sprite
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: 513348755380462125, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
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: 2015549526
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 0
@@ -54,14 +40,13 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: 513348755380462125, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
m_StopTime: 0.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

@@ -1,25 +1,31 @@
fileFormatVersion: 2
guid: f99a1e623eb554e4aa4314aba18b2531
guid: 988542481b0a24544b2dcef350a5461f
TextureImporter:
internalIDToNameTable:
- first:
213: -8109058881888065430
second: seiden-emotes_0
213: 6254823859401255868
second: seiden-emote-spritesheet_0
- first:
213: 5354992726988596434
second: seiden-emotes_1
213: -1597024810717329901
second: seiden-emote-spritesheet_1
- first:
213: 6776477941202382221
second: seiden-emotes_2
213: 513348755380462125
second: seiden-emote-spritesheet_2
- first:
213: -2826190552252792257
second: seiden-emotes_3
213: -4444019599912485171
second: seiden-emote-spritesheet_3
- first:
213: 1232664573060430783
second: seiden-emotes_4
213: -1871821792033348118
second: seiden-emote-spritesheet_4
- first:
213: 5625398474919881811
second: seiden-emotes_5
213: -2170293955171528748
second: seiden-emote-spritesheet_5
- first:
213: -3403767949682752304
second: seiden-emote-spritesheet_6
- first:
213: -7728925550398990426
second: seiden-emote-spritesheet_7
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -121,7 +127,49 @@ TextureImporter:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: seiden-emotes_0
name: seiden-emote-spritesheet_0
rect:
serializedVersion: 2
x: 0
y: 75
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: cbbef3029299dc650800000000000000
internalID: 6254823859401255868
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emote-spritesheet_1
rect:
serializedVersion: 2
x: 25
y: 75
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: 31645b3656a36d9e0800000000000000
internalID: -1597024810717329901
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emote-spritesheet_2
rect:
serializedVersion: 2
x: 0
@@ -135,14 +183,14 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: a68e55a19e5d67f80800000000000000
internalID: -8109058881888065430
spriteID: d22675229f7cf1700800000000000000
internalID: 513348755380462125
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emotes_1
name: seiden-emote-spritesheet_3
rect:
serializedVersion: 2
x: 25
@@ -156,14 +204,14 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2d4a4f26381c05a40800000000000000
internalID: 5354992726988596434
spriteID: dceb75428bba352c0800000000000000
internalID: -4444019599912485171
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emotes_2
name: seiden-emote-spritesheet_4
rect:
serializedVersion: 2
x: 0
@@ -177,14 +225,14 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d8d63a1c8c2ea0e50800000000000000
internalID: 6776477941202382221
spriteID: ae5640b5ff3f506e0800000000000000
internalID: -1871821792033348118
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emotes_3
name: seiden-emote-spritesheet_5
rect:
serializedVersion: 2
x: 25
@@ -198,14 +246,14 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: f324861aaaa57c8d0800000000000000
internalID: -2826190552252792257
spriteID: 4dfc2df752191e1e0800000000000000
internalID: -2170293955171528748
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emotes_4
name: seiden-emote-spritesheet_6
rect:
serializedVersion: 2
x: 0
@@ -219,14 +267,14 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: fbbb974f5ed4b1110800000000000000
internalID: 1232664573060430783
spriteID: 0d4cc4d651363c0d0800000000000000
internalID: -3403767949682752304
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: seiden-emotes_5
name: seiden-emote-spritesheet_7
rect:
serializedVersion: 2
x: 25
@@ -240,8 +288,8 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 35caf99bb1e611e40800000000000000
internalID: 5625398474919881811
spriteID: 6a7170959275db490800000000000000
internalID: -7728925550398990426
vertices: []
indices:
edges: []
@@ -20,9 +20,9 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -1871821792033348118, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- time: 0.25
value: {fileID: -2826190552252792257, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -2170293955171528748, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
@@ -42,8 +42,8 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 6776477941202382221, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -2826190552252792257, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -1871821792033348118, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- {fileID: -2170293955171528748, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@@ -20,22 +20,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -3403767949682752304, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- time: 0.25
value: {fileID: 5625398474919881811, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -7728925550398990426, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- time: 0.5
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
attribute: m_Sprite
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_SampleRate: 4
m_WrapMode: 0
m_Bounds:
@@ -50,24 +41,15 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 2015549526
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 1232664573060430783, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: 5625398474919881811, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -3403767949682752304, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- {fileID: -7728925550398990426, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.75
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -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-talk-cry
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: 6254823859401255868, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- time: 0.25
value: {fileID: -1597024810717329901, guid: 988542481b0a24544b2dcef350a5461f, 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: 6254823859401255868, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- {fileID: -1597024810717329901, guid: 988542481b0a24544b2dcef350a5461f, 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: []
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 70a80c4471222496f9734443d28fe3b9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
@@ -20,22 +20,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: 513348755380462125, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- time: 0.25
value: {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
value: {fileID: -4444019599912485171, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
- curve:
- time: 0
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- time: 0.25
value: {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
attribute: m_Sprite
path:
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_SampleRate: 4
m_WrapMode: 0
m_Bounds:
@@ -50,18 +41,9 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 2015549526
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: 5354992726988596434, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: -8109058881888065430, guid: f99a1e623eb554e4aa4314aba18b2531, type: 3}
- {fileID: 513348755380462125, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
- {fileID: -4444019599912485171, guid: 988542481b0a24544b2dcef350a5461f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
+4 -7
View File
@@ -17,9 +17,7 @@ public class PlayerMovement : MonoBehaviour {
void Awake() {
if (health == null) {
Debug.Log("Health not found! Please attach the Health script to the player so the player can take damage.");
}
Debug.Log(health);
if (health != null) {
} else {
health.OnHit.AddListener(OnHit);
health.OnDead.AddListener(OnDead);
}
@@ -28,10 +26,6 @@ public class PlayerMovement : MonoBehaviour {
// Update is called once per frame
void Update() {
horizontalMove = Input.GetAxisRaw("Horizontal") * runSpeed;
if (healthBarAnimator != null) {
healthBarAnimator.SetInteger("Health", health.currentHealth);
}
if (Input.GetButtonDown("Jump")) {
jump = true;
@@ -48,6 +42,9 @@ public class PlayerMovement : MonoBehaviour {
} else if (animator != null) {
animator.SetFloat("Horizontal", Input.GetAxis("Horizontal"));
animator.SetBool("Airborne", !controller.m_Grounded);
if (healthBarAnimator != null) {
healthBarAnimator.SetInteger("Health", health.currentHealth);
}
}
}
void FixedUpdate() {
+12 -8
View File
@@ -14,12 +14,16 @@
## Emote animations
```
0: Seiden neutral idle
1: Seiden neutral talking
2: Seiden annoyed idle
3: Seiden annoyed talking
4: Seiden blushing idle
5: Seiden blushing talking
6: Fuki idle
7: Fuki talking
0: Seiden idle neutral
1: Seiden talking neutral
2: Seiden idle annoyed
3: Seiden talking annoyed
4: Seiden idle blushing
5: Seiden talking blushing
6: Seiden idle crying
7: Seiden talking crying
8: Fuki idle neutral
9: Fuki talking neutral
10: Fuki idle laughing
11: Fuki talking laughing
```
+12 -12
View File
@@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650