Add MobCat graphics, reorganize animations folder

This commit is contained in:
Sofia 2019-08-19 00:13:42 +03:00
parent 9f6e14435d
commit dd385f4898
29 changed files with 602 additions and 18 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0331e3fcb20079043b39f466d0bed985
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 94093211366fd59499062ef8c2b476a0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3ff0177346de661418f442cb59625c9c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,107 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-3907542575422527388
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Walk
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: 1
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: d1d276e7b05cbf140abc3c2d9062c722, type: 2}
m_Tag:
m_SpeedParameter: Speed
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-592618111010848886
AnimatorStateMachine:
serializedVersion: 5
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: -3907542575422527388}
m_Position: {x: 260, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 951317098599916901}
m_Position: {x: 260, y: 180, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 130, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -3907542575422527388}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MobCat
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -592618111010848886}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &951317098599916901
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Attack
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: 8fafacc082a6a1f4191b5b0639054e1d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0415ba58704350d49a33a7c1b517b2b4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,69 @@
%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: MobCatAttack
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: -5418259349915491348, guid: 50492b8a26d26ed44b94d0f1b87af118,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: -5418259349915491348, guid: 50492b8a26d26ed44b94d0f1b87af118, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.083333336
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8fafacc082a6a1f4191b5b0639054e1d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -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: MobCatWalk
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: 2161220840336121028, guid: 50492b8a26d26ed44b94d0f1b87af118,
type: 3}
- time: 0.25
value: {fileID: 1237803681243236179, guid: 50492b8a26d26ed44b94d0f1b87af118,
type: 3}
- time: 0.5
value: {fileID: 2161220840336121028, guid: 50492b8a26d26ed44b94d0f1b87af118,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 2161220840336121028, guid: 50492b8a26d26ed44b94d0f1b87af118, type: 3}
- {fileID: 1237803681243236179, guid: 50492b8a26d26ed44b94d0f1b87af118, type: 3}
- {fileID: 2161220840336121028, guid: 50492b8a26d26ed44b94d0f1b87af118, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5833333
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: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d1d276e7b05cbf140abc3c2d9062c722
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -0,0 +1,187 @@
fileFormatVersion: 2
guid: 50492b8a26d26ed44b94d0f1b87af118
TextureImporter:
internalIDToNameTable:
- first:
213: 2161220840336121028
second: MobCat_0
- first:
213: 1237803681243236179
second: MobCat_1
- first:
213: -5418259349915491348
second: MobCat_2
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
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: 32
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
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: 0
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: MobCat_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 32
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 96e475ea4faa41e4bb43d00896867248
internalID: 2161220840336121028
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MobCat_1
rect:
serializedVersion: 2
x: 32
y: 0
width: 32
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 0718afe0ceb44ad43a28113e685a0cfa
internalID: 1237803681243236179
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: MobCat_2
rect:
serializedVersion: 2
x: 64
y: 0
width: 32
height: 48
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 9107a02c062cff0479426f93e4401874
internalID: -5418259349915491348
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10,8 +10,9 @@ GameObject:
m_Component:
- component: {fileID: 8421448882146741787}
- component: {fileID: 4848125059538075066}
- component: {fileID: 5842195514978149329}
m_Layer: 0
m_Name: Placeholder Sprite
m_Name: Sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -26,7 +27,7 @@ Transform:
m_GameObject: {fileID: 738167044357067052}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.75, y: 1.75, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6460565228684706449}
m_RootOrder: 0
@ -69,7 +70,8 @@ SpriteRenderer:
m_SortingLayerID: -947994997
m_SortingLayer: 4
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 472874229c563e241bddc073ec2dbb90, type: 3}
m_Sprite: {fileID: 2161220840336121028, guid: 50492b8a26d26ed44b94d0f1b87af118,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -80,6 +82,25 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &5842195514978149329
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738167044357067052}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0415ba58704350d49a33a7c1b517b2b4, 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!1 &2543259950034594903
GameObject:
m_ObjectHideFlags: 0
@ -194,7 +215,7 @@ GameObject:
- component: {fileID: 7974156166935930478}
- component: {fileID: 8315503502695128381}
m_Layer: 0
m_Name: Enemy (Ranged - Name TBD)
m_Name: Enemy (MobCat)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -325,12 +346,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
BodypartPrefabs:
- {fileID: 90224928841595158, guid: ca8392322c2a18b48a39044f77780e06, type: 3}
- {fileID: 90224928841595158, guid: fdbfbe32f3b9e014e9a8da46701b8c40, type: 3}
- {fileID: 1818059612568235499, guid: 52039c34fdb255843ac78c6010c5ff83, type: 3}
- {fileID: 960737912245282743, guid: 2fb0a649165a8b7429b09809cd8e25c7, type: 3}
- {fileID: 3847767376140256459, guid: 876c3f18878bbd6498566af1f9234dcf, type: 3}
DebugExplode: 0
ParticlesPerBodypart: 20
BodypartMinCount: 5
BodypartMaxCount: 10
DebrisType: 1
BodypartMinCount: 2
BodypartMaxCount: 4
DebrisType: 0
--- !u!114 &4655711410523782340
MonoBehaviour:
m_ObjectHideFlags: 0
@ -422,7 +446,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a7ad92c263d7d594286b8fc50b5b8fa7, type: 3}
m_Name:
m_EditorClassIdentifier:
Anim: {fileID: 0}
Anim: {fileID: 5842195514978149329}
--- !u!1 &3991584792453052187
GameObject:
m_ObjectHideFlags: 0

View File

@ -111864,6 +111864,80 @@ Transform:
m_Father: {fileID: 1613151093}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1837079526
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2690120730931629369, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_Name
value: Enemy (MobCat)
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalPosition.x
value: -17.6
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalPosition.y
value: 5.7
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2690120730931629368, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4766673605832234110, guid: aae49ec2806ad9941a301b7928af198a,
type: 3}
propertyPath: m_Constraints
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: aae49ec2806ad9941a301b7928af198a, type: 3}
--- !u!1001 &1837150491
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -10,7 +10,7 @@ namespace Saltosion.OneWeapon.Enemies {
[RequireComponent(typeof(Wander))]
[RequireComponent(typeof(Follow))]
[RequireComponent(typeof(RangedAttackFollowed))]
public class RangedNameTBD : MonoBehaviour {
public class MobCat : MonoBehaviour {
public Animator Anim;
private Enemy Enemy;
@ -41,14 +41,12 @@ namespace Saltosion.OneWeapon.Enemies {
Enemy.CurrentBehaviour += "Wander:" + WanderBehaviour.CurrentStatus;
}
// TODO: Add animation
//if (RangedBehaviour.Attacking) {
// Anim.Play("Attack");
//} else {
// Anim.Play("Walk");
//}
//Anim.SetFloat("Speed", Enemy.Movement.SpeedPercentage);
if (RangedBehaviour.Attacking) {
Anim.Play("Attack");
} else {
Anim.Play("Walk");
}
Anim.SetFloat("Speed", Enemy.Movement.SpeedPercentage);
}
}
}

BIN
Raw Assets/MobCat.xcf Normal file

Binary file not shown.