Added textures and drinking mechanics.

This commit is contained in:
shakurass 2014-04-26 18:16:21 -06:00
commit 78e42c158c
39 changed files with 779 additions and 15 deletions

View file

@ -99,8 +99,8 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 56874333}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: .145692825, y: 2.5, z: 10.5844784}
m_LocalScale: {x: .5, y: 5, z: 30}
m_LocalPosition: {x: .145692825, y: 2.5, z: 9.06554031}
m_LocalScale: {x: .5, y: 5, z: 12.1118956}
m_Children: []
m_Father: {fileID: 1731015427}
--- !u!23 &56874335
@ -115,7 +115,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
@ -152,6 +152,7 @@ GameObject:
m_Component:
- 4: {fileID: 57666823}
- 65: {fileID: 57666826}
- 82: {fileID: 57666824}
m_Layer: 0
m_Name: Shank Spawn
m_TagString: Untagged
@ -170,6 +171,65 @@ Transform:
m_LocalScale: {x: 1, y: .0909090862, z: .0500000007}
m_Children: []
m_Father: {fileID: 745975992}
--- !u!82 &57666824
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 8200000, guid: 0dd5d3e41887306468e6f9dd9d58b975,
type: 2}
m_PrefabInternal: {fileID: 296847678}
m_GameObject: {fileID: 57666822}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 8300000, guid: b189fb0007b0fc148a287b20274b0b51, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!65 &57666826
BoxCollider:
m_ObjectHideFlags: 0
@ -317,6 +377,7 @@ GameObject:
- 4: {fileID: 146718572}
- 114: {fileID: 146718573}
- 54: {fileID: 146718574}
- 82: {fileID: 146718575}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@ -349,7 +410,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 10
nextFire: 1
nextFire: .5
delay: 1
shank: {fileID: 100000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2}
playerAngle: {fileID: 745975992}
@ -371,6 +432,64 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!82 &146718575
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 146718571}
m_Enabled: 1
serializedVersion: 3
m_audioClip: {fileID: 8300000, guid: b189fb0007b0fc148a287b20274b0b51, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
--- !u!1001 &296847678
Prefab:
m_ObjectHideFlags: 0
@ -468,7 +587,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
@ -867,6 +986,7 @@ GameObject:
- 33: {fileID: 768198794}
- 65: {fileID: 768198793}
- 23: {fileID: 768198792}
- 95: {fileID: 768198795}
m_Layer: 0
m_Name: North Wall
m_TagString: Untagged
@ -880,7 +1000,7 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 768198790}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 1, w: -4.37113883e-08}
m_LocalPosition: {x: 0, y: 2.5, z: 15}
m_LocalScale: {x: 30, y: 5, z: .5}
m_Children: []
@ -897,7 +1017,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
@ -925,6 +1045,20 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 768198790}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!95 &768198795
Animator:
serializedVersion: 2
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 768198790}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 9bba86561c279bd49a939ba6c2758a91, type: 2}
m_CullingMode: 0
m_ApplyRootMotion: 1
m_AnimatePhysics: 0
m_HasTransformHierarchy: 1
--- !u!1 &787766216
GameObject:
m_ObjectHideFlags: 0
@ -1636,7 +1770,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 5fd4928e569cf5b4780a5e82c44af0b0, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
@ -1716,7 +1850,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
@ -2018,7 +2152,7 @@ Renderer:
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_Materials:
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0