From 6010d3916fe0ce9b07a13bb5d9819677cc00cc2c Mon Sep 17 00:00:00 2001 From: shakurass Date: Sat, 26 Apr 2014 16:04:09 -0600 Subject: [PATCH] Removed old player object. --- Assets/Scenes/Main.unity | 222 ----------------------- Assets/Scripts/PlayerController.cs | 4 - Assets/Sprites/demon-hero-shank.png.meta | 45 +++++ Assets/Sprites/demon-hero-swig.png.meta | 45 +++++ Assets/Sprites/demon-hero-walk.png.meta | 45 +++++ Assets/Sprites/poser2.ase.meta | 4 + Assets/Sprites/poser2.png.meta | 45 +++++ Assets/Sprites/poser3.ase.meta | 4 + Assets/Sprites/poser3.png.meta | 45 +++++ ProjectSettings/TagManager.asset | 1 + 10 files changed, 234 insertions(+), 226 deletions(-) create mode 100644 Assets/Sprites/demon-hero-shank.png.meta create mode 100644 Assets/Sprites/demon-hero-swig.png.meta create mode 100644 Assets/Sprites/demon-hero-walk.png.meta create mode 100644 Assets/Sprites/poser2.ase.meta create mode 100644 Assets/Sprites/poser2.png.meta create mode 100644 Assets/Sprites/poser3.ase.meta create mode 100644 Assets/Sprites/poser3.png.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 1fdd0c2..10da81f 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -74,32 +74,6 @@ NavMeshSettings: widthInaccuracy: 16.666666 heightInaccuracy: 10 m_NavMesh: {fileID: 19400000, guid: 4c43726ae1b6e40bd92356b53e3cceff, type: 2} ---- !u!1 &47264522 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 47264523} - m_Layer: 0 - m_Name: shankSpawn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &47264523 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 47264522} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.9355793, y: .199999809, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 972571124} --- !u!1 &56874333 GameObject: m_ObjectHideFlags: 0 @@ -1249,83 +1223,6 @@ Transform: m_LocalScale: {x: 1.93007195, y: 1.93007195, z: 1.93007195} m_Children: [] m_Father: {fileID: 523078142} ---- !u!1 &972571120 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 972571124} - - 114: {fileID: 972571126} - - 54: {fileID: 972571125} - - 136: {fileID: 972571122} - m_Layer: 0 - m_Name: Player - old - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!136 &972571122 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 972571120} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 1 - m_Height: 26 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &972571124 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 972571120} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5, y: 1.76162744, z: 5} - m_LocalScale: {x: .100000001, y: .100000001, z: 1} - m_Children: - - {fileID: 1739411432} - - {fileID: 47264523} - - {fileID: 1521045955} - m_Father: {fileID: 0} ---- !u!54 &972571125 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 972571120} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: .0500000007 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &972571126 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 972571120} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03d06e7abe7e0453ab6f0366aebcdec2, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 10 - nextFire: 1 - fireRate: 1 - shank: {fileID: 100000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2} - playerAngle: {fileID: 0} - shankSpawn: {fileID: 47264523} --- !u!1 &973833183 GameObject: m_ObjectHideFlags: 0 @@ -1843,75 +1740,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1517894751} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1521045951 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1521045955} - - 33: {fileID: 1521045954} - - 135: {fileID: 1521045953} - - 23: {fileID: 1521045952} - m_Layer: 0 - m_Name: Player Collider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1521045952 -Renderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1521045951} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} - m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, 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 ---- !u!135 &1521045953 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1521045951} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: .5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1521045954 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1521045951} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1521045955 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1521045951} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} - m_Children: [] - m_Father: {fileID: 972571124} --- !u!1 &1603241064 GameObject: m_ObjectHideFlags: 0 @@ -2094,56 +1922,6 @@ Transform: - {fileID: 1517894752} - {fileID: 330466715} m_Father: {fileID: 0} ---- !u!1 &1739411431 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1739411432} - - 212: {fileID: 1739411433} - m_Layer: 0 - m_Name: PlayerSprite - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1739411432 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1739411431} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 1} - m_Children: [] - m_Father: {fileID: 972571124} ---- !u!212 &1739411433 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1739411431} - 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: e57f0e5297e49478bba13bb85b3d8d84, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &1779026302 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index e625c91..e99b88c 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -39,8 +39,4 @@ public class PlayerController : MonoBehaviour { rigidbody.freezeRotation = true; rigidbody.position.Normalize (); } - - void Shank(){ - - } } diff --git a/Assets/Sprites/demon-hero-shank.png.meta b/Assets/Sprites/demon-hero-shank.png.meta new file mode 100644 index 0000000..9862248 --- /dev/null +++ b/Assets/Sprites/demon-hero-shank.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 8a7d20d19b593974894a1d833a048e02 +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: diff --git a/Assets/Sprites/demon-hero-swig.png.meta b/Assets/Sprites/demon-hero-swig.png.meta new file mode 100644 index 0000000..1ba4075 --- /dev/null +++ b/Assets/Sprites/demon-hero-swig.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: fe6d80532fd41334a8fb780b9851a64a +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: diff --git a/Assets/Sprites/demon-hero-walk.png.meta b/Assets/Sprites/demon-hero-walk.png.meta new file mode 100644 index 0000000..07d020b --- /dev/null +++ b/Assets/Sprites/demon-hero-walk.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 6565e061d62cf29409fb2f7ebe0c3c15 +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: diff --git a/Assets/Sprites/poser2.ase.meta b/Assets/Sprites/poser2.ase.meta new file mode 100644 index 0000000..8de5c84 --- /dev/null +++ b/Assets/Sprites/poser2.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 6c357014b1fdea74d9c7077de5027a62 +DefaultImporter: + userData: diff --git a/Assets/Sprites/poser2.png.meta b/Assets/Sprites/poser2.png.meta new file mode 100644 index 0000000..dd4f2c6 --- /dev/null +++ b/Assets/Sprites/poser2.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 47c59ffe452059a43afe37861e97dcd6 +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: diff --git a/Assets/Sprites/poser3.ase.meta b/Assets/Sprites/poser3.ase.meta new file mode 100644 index 0000000..1896341 --- /dev/null +++ b/Assets/Sprites/poser3.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 07885dd28dbbe2949b18214d36202e88 +DefaultImporter: + userData: diff --git a/Assets/Sprites/poser3.png.meta b/Assets/Sprites/poser3.png.meta new file mode 100644 index 0000000..fbf8cff --- /dev/null +++ b/Assets/Sprites/poser3.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: fc1cfe7347e5e0047b1653c6826e55e2 +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: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 3b52c8f..446ec34 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -4,6 +4,7 @@ TagManager: tags: - Shank + - Demon - Builtin Layer 0: Default Builtin Layer 1: TransparentFX