Smoothed animation for taking a swig.

This commit is contained in:
shakurass 2014-04-27 11:55:25 -06:00
commit d0a546ffac
16 changed files with 1306 additions and 481 deletions

186
Assets/Prefabs/Demon.prefab Normal file
View file

@ -0,0 +1,186 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &100000
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 400000}
- 195: {fileID: 19500000}
- 114: {fileID: 11400002}
- 54: {fileID: 5400000}
- 136: {fileID: 13600000}
- 114: {fileID: 11400000}
m_Layer: 0
m_Name: Demon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 400002}
- 212: {fileID: 21200000}
- 95: {fileID: 9500000}
m_Layer: 0
m_Name: poser2_0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400000
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.77135754, y: 9.69999981, z: 4.92175865}
m_LocalScale: {x: 2, y: 3, z: 2}
m_Children:
- {fileID: 400002}
m_Father: {fileID: 0}
--- !u!4 &400002
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 6, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 400000}
--- !u!54 &5400000
Rigidbody:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: .0500000007
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!95 &9500000
Animator:
serializedVersion: 2
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0e6e6ed32792d450e95d8cc18b204166, type: 2}
m_CullingMode: 0
m_ApplyRootMotion: 1
m_AnimatePhysics: 0
m_HasTransformHierarchy: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 40684efec06376d45b9c87a038a40253, type: 3}
m_Name:
m_EditorClassIdentifier:
characterSprite: {fileID: 21200000}
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc3037736f75b53479f5da8bd507b6eb, type: 3}
m_Name:
m_EditorClassIdentifier:
destinations:
- {fileID: 0}
- {fileID: 0}
currentDestIndex: 1
--- !u!136 &13600000
CapsuleCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: .610000014
m_Height: 1.27999997
m_Direction: 1
m_Center: {x: 0, y: -.0700000003, z: 0}
--- !u!195 &19500000
NavMeshAgent:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_Radius: .5
m_Speed: 5
m_Acceleration: 10000
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
m_Height: 1.00000012
m_BaseOffset: .50000006
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: 0
m_Sprite: {fileID: 21300000, guid: 47c59ffe452059a43afe37861e97dcd6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100000}
m_IsPrefabParent: 1
m_IsExploded: 1

View file

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 41b19f6c96ad15e4dace633fe1d0a962
NativeFormatImporter:
userData:

View file

@ -0,0 +1,185 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &100000
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 400000}
- 212: {fileID: 21200000}
- 95: {fileID: 9500000}
m_Layer: 0
m_Name: poser2_0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 400002}
- 195: {fileID: 19500000}
- 114: {fileID: 11400000}
- 54: {fileID: 5400000}
- 136: {fileID: 13600000}
- 114: {fileID: 11400002}
m_Layer: 0
m_Name: Patron
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400000
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 6, y: 5, z: 1}
m_Children: []
m_Father: {fileID: 400002}
--- !u!4 &400002
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.77135754, y: 9.70000076, z: 4.92175865}
m_LocalScale: {x: 2, y: 3, z: 2}
m_Children:
- {fileID: 400000}
m_Father: {fileID: 0}
--- !u!54 &5400000
Rigidbody:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: .0500000007
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!95 &9500000
Animator:
serializedVersion: 2
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 0e6e6ed32792d450e95d8cc18b204166, type: 2}
m_CullingMode: 0
m_ApplyRootMotion: 1
m_AnimatePhysics: 0
m_HasTransformHierarchy: 1
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc3037736f75b53479f5da8bd507b6eb, type: 3}
m_Name:
m_EditorClassIdentifier:
destinations:
- {fileID: 0}
- {fileID: 0}
currentDestIndex: 1
--- !u!114 &11400002
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b933d79988a624405b43ff0fb8c3d527, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!136 &13600000
CapsuleCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: .610000014
m_Height: 1.27999997
m_Direction: 1
m_Center: {x: 0, y: -.0700000003, z: 0}
--- !u!195 &19500000
NavMeshAgent:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
m_Radius: .5
m_Speed: 5
m_Acceleration: 10000
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1
m_Height: 1.00000012
m_BaseOffset: .50000006
m_WalkableMask: 4294967295
m_ObstacleAvoidanceType: 4
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: 0
m_Sprite: {fileID: 21300000, guid: 47c59ffe452059a43afe37861e97dcd6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100002}
m_IsPrefabParent: 1
m_IsExploded: 1

View file

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: e5c4c39c0dd99f94dbc695a71276c6eb
NativeFormatImporter:
userData:

View file

@ -37,7 +37,7 @@ Renderer:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_Enabled: 1 m_Enabled: 0
m_CastShadows: 1 m_CastShadows: 1
m_ReceiveShadows: 1 m_ReceiveShadows: 1
m_LightmapIndex: 255 m_LightmapIndex: 255
@ -140,7 +140,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 025a712113e797c408ae9865e9ac79c6, type: 3} m_Script: {fileID: 11500000, guid: 025a712113e797c408ae9865e9ac79c6, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
length: .300000012 length: .00999999978
--- !u!1001 &100100000 --- !u!1001 &100100000
Prefab: Prefab:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

File diff suppressed because it is too large Load diff

View file

@ -3,6 +3,8 @@ using System.Collections;
public class Demon : MonoBehaviour { public class Demon : MonoBehaviour {
public Renderer characterSprite;
void OnTriggerEnter(Collider other) { void OnTriggerEnter(Collider other) {
//Instantiate(explosion, transform.position, transform.rotation); //Instantiate(explosion, transform.position, transform.rotation);
@ -13,7 +15,7 @@ public class Demon : MonoBehaviour {
} }
if (other.tag == "VVAura") { if (other.tag == "VVAura") {
renderer.material.color = Color.red; characterSprite.renderer.material.color = Color.red;
} }
} }
} }

View file

@ -69,10 +69,11 @@ public class PlayerController : MonoBehaviour {
if (moveVertical > 0) if (moveVertical > 0)
playerAngle.eulerAngles = new Vector3(0f, -90f, 0f); playerAngle.eulerAngles = new Vector3(0f, -90f, 0f);
Vector3 movement = new Vector3 (moveHorizontal, 0.0f, moveVertical); // rigidbody.MovePosition (rigidbody.position + movement * speed * Time.deltaTime);
// rigidbody.position.Normalize ();
rigidbody.MovePosition (rigidbody.position + movement * speed * Time.deltaTime); Vector3 movement = new Vector3 (moveHorizontal, 0.0f, moveVertical);
rigidbody.position.Normalize (); rigidbody.velocity = movement * speed;
rigidbody.freezeRotation = true; rigidbody.freezeRotation = true;
} }

View file

@ -5,8 +5,6 @@ public class WalkAI : MonoBehaviour {
public GameObject[] destinations; public GameObject[] destinations;
public int currentDestIndex = 0; public int currentDestIndex = 0;
public Material evilMat;
public Material neutralMat;
private NavMeshAgent nva; private NavMeshAgent nva;

View file

@ -19,11 +19,13 @@ AnimationClip:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300000, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3} value: {fileID: 21300000, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3}
- time: .0833333358
value: {fileID: 21300002, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3}
- time: .166666672 - time: .166666672
value: {fileID: 21300002, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3}
- time: .333333343
value: {fileID: 21300004, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3} value: {fileID: 21300004, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3}
- time: .25 - time: .5
value: {fileID: 21300006, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3}
- time: .583333313
value: {fileID: 21300006, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3} value: {fileID: 21300006, guid: fe6d80532fd41334a8fb780b9851a64a, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
@ -37,7 +39,7 @@ AnimationClip:
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_StartTime: 0 m_StartTime: 0
m_StopTime: .333333343 m_StopTime: .666666627
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0

View file

@ -19,7 +19,7 @@ Material:
second: second:
m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3} m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3}
m_Scale: {x: 1, y: .5} m_Scale: {x: 1, y: .5}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: .5}
m_Floats: {} m_Floats: {}
m_Colors: m_Colors:
data: data:

View file

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 3c5af45c53283e44bab37d845b2bb1fa
DefaultImporter:
userData:

View file

@ -0,0 +1,45 @@
fileFormatVersion: 2
guid: 8c3b17ba25bd3c342bcc3f8f68d00593
TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

View file

@ -0,0 +1,45 @@
fileFormatVersion: 2
guid: 4e31eb4eaadf3314e8da10b79a0d43fa
TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:

View file

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 290fab135c9bfe5419c4648569d7ed65
DefaultImporter:
userData:

View file

@ -0,0 +1,45 @@
fileFormatVersion: 2
guid: d40467344d238024891b4685f00a717b
TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: -1
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData: