Merge branch 'master' of https://github.com/jyapayne/DemonShanker2
Conflicts: Assets/Audio/beneath-surface-4.ogg.meta Assets/Scripts/PlayerController.cs
This commit is contained in:
Wilson Leong
commit
65e43434b9
20 changed files with 561 additions and 284 deletions
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c87ec6c441a524fd28ce35c45551396a
|
||||
guid: 36ecdbbae90239a4ea972d8b1517f5d3
|
||||
AudioImporter:
|
||||
serializedVersion: 4
|
||||
format: 0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 06d87cfe44b7845b89755c1bb89091fc
|
||||
guid: 7f70abf26ead3304fa0fd0aa1e57992e
|
||||
AudioImporter:
|
||||
serializedVersion: 4
|
||||
format: 0
|
||||
|
|
|
|||
BIN
Assets/Audio/shank.mp3
Normal file
BIN
Assets/Audio/shank.mp3
Normal file
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b189fb0007b0fc148a287b20274b0b51
|
||||
guid: d7b1c5faa669f6146a725ae85236bae9
|
||||
AudioImporter:
|
||||
serializedVersion: 4
|
||||
format: -1
|
||||
format: 0
|
||||
quality: -1
|
||||
stream: 1
|
||||
3D: 1
|
||||
Binary file not shown.
|
|
@ -18,8 +18,8 @@ Material:
|
|||
name: _MainTex
|
||||
second:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Scale: {x: .5, y: .5}
|
||||
m_Offset: {x: .5, y: .5}
|
||||
m_Floats: {}
|
||||
m_Colors:
|
||||
data:
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ AudioSource:
|
|||
m_GameObject: {fileID: 100000}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_audioClip: {fileID: 8300000, guid: b189fb0007b0fc148a287b20274b0b51, type: 3}
|
||||
m_audioClip: {fileID: 8300000, guid: d7b1c5faa669f6146a725ae85236bae9, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
|
|
|
|||
|
|
@ -152,7 +152,6 @@ GameObject:
|
|||
m_Component:
|
||||
- 4: {fileID: 57666823}
|
||||
- 65: {fileID: 57666826}
|
||||
- 82: {fileID: 57666824}
|
||||
m_Layer: 0
|
||||
m_Name: Shank Spawn
|
||||
m_TagString: Untagged
|
||||
|
|
@ -171,65 +170,6 @@ 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
|
||||
|
|
@ -258,7 +198,7 @@ GameObject:
|
|||
- 195: {fileID: 134611203}
|
||||
- 114: {fileID: 134611202}
|
||||
m_Layer: 0
|
||||
m_Name: Cube
|
||||
m_Name: Patron
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -270,7 +210,7 @@ Renderer:
|
|||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 134611195}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_LightmapIndex: 255
|
||||
|
|
@ -311,10 +251,11 @@ Transform:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 134611195}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -5.53722095, y: 10.147995, z: 7.53864098}
|
||||
m_LocalScale: {x: 2.19080043, y: 3.67920685, z: 2.19080043}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalPosition: {x: -5.0881815, y: 8.99458694, z: 4.92175865}
|
||||
m_LocalScale: {x: 2, y: 3, z: 2}
|
||||
m_Children:
|
||||
- {fileID: 437867469}
|
||||
m_Father: {fileID: 704683992}
|
||||
--- !u!54 &134611201
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -344,7 +285,7 @@ MonoBehaviour:
|
|||
destinations:
|
||||
- {fileID: 582022781}
|
||||
- {fileID: 973833183}
|
||||
currentDestIndex: 0
|
||||
currentDestIndex: 1
|
||||
evilMat: {fileID: 2100000, guid: f259c2b0e77aaec4da868f7cc2a94f99, type: 2}
|
||||
neutralMat: {fileID: 2100000, guid: cf27db5b36385ff4eb67c47fd9d428f9, type: 2}
|
||||
--- !u!195 &134611203
|
||||
|
|
@ -377,7 +318,6 @@ GameObject:
|
|||
- 4: {fileID: 146718572}
|
||||
- 114: {fileID: 146718573}
|
||||
- 54: {fileID: 146718574}
|
||||
- 82: {fileID: 146718575}
|
||||
m_Layer: 0
|
||||
m_Name: Player
|
||||
m_TagString: Untagged
|
||||
|
|
@ -432,64 +372,6 @@ 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
|
||||
|
|
@ -553,6 +435,7 @@ Prefab:
|
|||
- {fileID: 11400000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2}
|
||||
- {fileID: 2300000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2}
|
||||
- {fileID: 3300000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2}
|
||||
- {fileID: 8200000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2}
|
||||
m_ParentPrefab: {fileID: 100100000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2}
|
||||
m_RootGameObject: {fileID: 57666822}
|
||||
m_IsPrefabParent: 0
|
||||
|
|
@ -626,6 +509,191 @@ Transform:
|
|||
m_LocalScale: {x: .5, y: 5, z: 30}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1731015427}
|
||||
--- !u!1 &410197318
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 410197319}
|
||||
- 33: {fileID: 410197322}
|
||||
- 65: {fileID: 410197321}
|
||||
- 23: {fileID: 410197320}
|
||||
m_Layer: 0
|
||||
m_Name: Bar
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &410197319
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 410197318}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 4.27702761, y: .706716537, z: 11.9884834}
|
||||
m_LocalScale: {x: 1.5, y: 2, z: 6}
|
||||
m_Children:
|
||||
- {fileID: 926922139}
|
||||
m_Father: {fileID: 1731015427}
|
||||
--- !u!23 &410197320
|
||||
Renderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 410197318}
|
||||
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: 2100000, guid: 5fd4928e569cf5b4780a5e82c44af0b0, type: 2}
|
||||
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!65 &410197321
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 410197318}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &410197322
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 410197318}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &437867467
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 437867469}
|
||||
- 212: {fileID: 437867468}
|
||||
- 114: {fileID: 437867470}
|
||||
m_Layer: 0
|
||||
m_Name: Sprite
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!212 &437867468
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 437867467}
|
||||
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: 2100000, guid: cf27db5b36385ff4eb67c47fd9d428f9, type: 2}
|
||||
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: 0d3c405841214de46abddb0ee8bffb88, type: 3}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
--- !u!4 &437867469
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 437867467}
|
||||
m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 134611200}
|
||||
--- !u!114 &437867470
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 437867467}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 704d6d277dc28fa4c8a6a28688efd5a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
columns: 2
|
||||
rows: 2
|
||||
framesPerSecond: 10
|
||||
--- !u!1 &493161365
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 493161366}
|
||||
- 132: {fileID: 493161367}
|
||||
m_Layer: 0
|
||||
m_Name: Swig Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &493161366
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 493161365}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -3.27643204, y: -5.14518356, z: -6.35511398}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1592614700}
|
||||
--- !u!132 &493161367
|
||||
GUIText:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 493161365}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Text: Swig Text
|
||||
m_Anchor: 0
|
||||
m_Alignment: 0
|
||||
m_PixelOffset: {x: 10, y: -10}
|
||||
m_LineSpacing: 1
|
||||
m_TabSize: 4
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Material: {fileID: 0}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_Color:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_PixelCorrect: 1
|
||||
m_RichText: 1
|
||||
--- !u!1 &523078141
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -734,7 +802,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 680206382}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -816,7 +884,7 @@ GameObject:
|
|||
m_Component:
|
||||
- 4: {fileID: 704683992}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject
|
||||
m_Name: Patrons
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -840,7 +908,7 @@ Transform:
|
|||
- {fileID: 1603241070}
|
||||
- {fileID: 1951656536}
|
||||
- {fileID: 2017533897}
|
||||
- {fileID: 1236459784}
|
||||
- {fileID: 134611200}
|
||||
m_Father: {fileID: 0}
|
||||
--- !u!1 &710538756
|
||||
GameObject:
|
||||
|
|
@ -986,7 +1054,7 @@ GameObject:
|
|||
- 33: {fileID: 768198794}
|
||||
- 65: {fileID: 768198793}
|
||||
- 23: {fileID: 768198792}
|
||||
- 95: {fileID: 768198795}
|
||||
- 114: {fileID: 768198796}
|
||||
m_Layer: 0
|
||||
m_Name: North Wall
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1045,20 +1113,20 @@ MeshFilter:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 768198790}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!95 &768198795
|
||||
Animator:
|
||||
serializedVersion: 2
|
||||
--- !u!114 &768198796
|
||||
MonoBehaviour:
|
||||
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
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 704d6d277dc28fa4c8a6a28688efd5a3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
columns: 1
|
||||
rows: 2
|
||||
framesPerSecond: 10
|
||||
--- !u!1 &787766216
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1086,7 +1154,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 787766216}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -1186,7 +1254,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 792733533}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -1310,6 +1378,76 @@ SphereCollider:
|
|||
serializedVersion: 2
|
||||
m_Radius: .5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &926922135
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 926922139}
|
||||
- 33: {fileID: 926922138}
|
||||
- 64: {fileID: 926922137}
|
||||
- 23: {fileID: 926922136}
|
||||
m_Layer: 0
|
||||
m_Name: Bar Top
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &926922136
|
||||
Renderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 926922135}
|
||||
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: 2100000, guid: 0f351915bc38bc54aaeaf2224391fa42, type: 2}
|
||||
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!64 &926922137
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 926922135}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_SmoothSphereCollisions: 0
|
||||
m_Convex: 0
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!33 &926922138
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 926922135}
|
||||
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &926922139
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 926922135}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: .507453442, z: 0}
|
||||
m_LocalScale: {x: .13333334, y: 1, z: .100000009}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 410197319}
|
||||
--- !u!1 &964066619
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1532,7 +1670,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1152010653}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -1605,6 +1743,46 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 704683992}
|
||||
--- !u!1 &1164596948
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 1164596950}
|
||||
- 114: {fileID: 1164596949}
|
||||
m_Layer: 0
|
||||
m_Name: GameController
|
||||
m_TagString: GameController
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1164596949
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1164596948}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cc84b14a55660b643805ae0f1878c40b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
swigs: 2
|
||||
swigText: {fileID: 493161367}
|
||||
--- !u!4 &1164596950
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1164596948}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 3.27643204, y: 6.14518356, z: 6.35511398}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
--- !u!1 &1208774875
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1632,7 +1810,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1208774875}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -1705,106 +1883,6 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 704683992}
|
||||
--- !u!1 &1236459783
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 1236459784}
|
||||
- 33: {fileID: 1236459789}
|
||||
- 65: {fileID: 1236459788}
|
||||
- 23: {fileID: 1236459787}
|
||||
- 114: {fileID: 1236459786}
|
||||
- 54: {fileID: 1236459785}
|
||||
m_Layer: 0
|
||||
m_Name: Cube
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1236459784
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1236459783}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: .117685467, y: 7.95759201, z: -.655423284}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 704683992}
|
||||
--- !u!54 &1236459785
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1236459783}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 112
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &1236459786
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1236459783}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4fe625f347cd04ec0b5f461f77005c35, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
speed: 10
|
||||
dir: {x: 0, y: 0, z: 0}
|
||||
randomMove: 1
|
||||
--- !u!23 &1236459787
|
||||
Renderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1236459783}
|
||||
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!65 &1236459788
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1236459783}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &1236459789
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1236459783}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &1280434885
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1850,7 +1928,7 @@ BoxCollider:
|
|||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1280434885}
|
||||
m_Material: {fileID: 0}
|
||||
m_Material: {fileID: 13400000, guid: 012328ad8a154434cba351198ab57633, type: 2}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
|
|
@ -1943,6 +2021,33 @@ MeshFilter:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1517894751}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &1592614699
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 1592614700}
|
||||
m_Layer: 0
|
||||
m_Name: DisplayText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1592614700
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1592614699}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 3.27643204, y: 6.14518356, z: 6.35511398}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 493161366}
|
||||
m_Father: {fileID: 0}
|
||||
--- !u!1 &1603241064
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1970,7 +2075,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1603241064}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -2083,7 +2188,7 @@ SpriteRenderer:
|
|||
m_LightmapIndex: 255
|
||||
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
|
||||
m_Materials:
|
||||
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
|
||||
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_SubsetIndices:
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_UseLightProbes: 0
|
||||
|
|
@ -2133,6 +2238,7 @@ Transform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 410197319}
|
||||
- {fileID: 56874334}
|
||||
- {fileID: 1280434889}
|
||||
- {fileID: 768198791}
|
||||
|
|
@ -2298,7 +2404,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1951656530}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
@ -2491,7 +2597,7 @@ Rigidbody:
|
|||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 2017533891}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Mass: .100000001
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
|
|
|
|||
40
Assets/Scripts/AnimateSprite.cs
Normal file
40
Assets/Scripts/AnimateSprite.cs
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
using UnityEngine;
|
||||
using System.Collections;
|
||||
|
||||
public class AnimateSprite : MonoBehaviour {
|
||||
|
||||
public int columns = 2;
|
||||
public int rows = 2;
|
||||
public float framesPerSecond = 10f;
|
||||
|
||||
//the current frame to display
|
||||
private int index = 0;
|
||||
|
||||
void Start()
|
||||
{
|
||||
StartCoroutine(updateTiling());
|
||||
|
||||
//set the tile size of the texture (in UV units), based on the rows and columns
|
||||
Vector2 size = new Vector2(1f / columns, 1f / rows);
|
||||
renderer.sharedMaterial.SetTextureScale("_MainTex", size);
|
||||
}
|
||||
|
||||
private IEnumerator updateTiling()
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
//move to the next index
|
||||
index++;
|
||||
if (index >= rows * columns)
|
||||
index = 0;
|
||||
|
||||
//split into x and y indexes
|
||||
Vector2 offset = new Vector2((float)index / columns - (index / columns), //x index
|
||||
(index / columns) / (float)rows); //y index
|
||||
|
||||
renderer.sharedMaterial.SetTextureOffset("_MainTex", offset);
|
||||
|
||||
yield return new WaitForSeconds(1f / framesPerSecond);
|
||||
}
|
||||
}
|
||||
}
|
||||
8
Assets/Scripts/AnimateSprite.cs.meta
Normal file
8
Assets/Scripts/AnimateSprite.cs.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 019afbbcd27acf941b76ed7fd6a4eeb2
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
41
Assets/Scripts/AnimateTexture.cs
Normal file
41
Assets/Scripts/AnimateTexture.cs
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
using UnityEngine;
|
||||
using System.Collections;
|
||||
|
||||
public class AnimateTexture : MonoBehaviour {
|
||||
|
||||
public int columns = 2;
|
||||
public int rows = 2;
|
||||
public float framesPerSecond = 10f;
|
||||
|
||||
//the current frame to display
|
||||
private int index = 0;
|
||||
|
||||
void Start()
|
||||
{
|
||||
StartCoroutine(updateTiling());
|
||||
|
||||
//set the tile size of the texture (in UV units), based on the rows and columns
|
||||
Vector2 size = new Vector2(1f / columns, 1f / rows);
|
||||
renderer.sharedMaterial.SetTextureScale("_MainTex", size);
|
||||
}
|
||||
|
||||
private IEnumerator updateTiling()
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
//move to the next index
|
||||
index++;
|
||||
if (index >= rows * columns)
|
||||
index = 0;
|
||||
|
||||
//split into x and y indexes
|
||||
Vector2 offset = new Vector2((float)index / columns - (index / columns), //x index
|
||||
(index / columns) / (float)rows); //y index
|
||||
|
||||
renderer.sharedMaterial.SetTextureOffset("_MainTex", offset);
|
||||
|
||||
yield return new WaitForSeconds(1f / framesPerSecond);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
8
Assets/Scripts/AnimateTexture.cs.meta
Normal file
8
Assets/Scripts/AnimateTexture.cs.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 704d6d277dc28fa4c8a6a28688efd5a3
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
27
Assets/Scripts/GameController.cs
Normal file
27
Assets/Scripts/GameController.cs
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
using UnityEngine;
|
||||
using System.Collections;
|
||||
|
||||
public class GameController : MonoBehaviour {
|
||||
|
||||
public int swigs;
|
||||
public GUIText swigText;
|
||||
|
||||
// Use this for initialization
|
||||
void Start () {
|
||||
UpdateSwigText ();
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update () {
|
||||
|
||||
}
|
||||
|
||||
public void TakeSwig() {
|
||||
swigs -= 1;
|
||||
UpdateSwigText();
|
||||
}
|
||||
|
||||
void UpdateSwigText() {
|
||||
swigText.text = "Swigs Left: " + swigs;
|
||||
}
|
||||
}
|
||||
8
Assets/Scripts/GameController.cs.meta
Normal file
8
Assets/Scripts/GameController.cs.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cc84b14a55660b643805ae0f1878c40b
|
||||
MonoImporter:
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
|
|
@ -11,7 +11,16 @@ public class PlayerController : MonoBehaviour {
|
|||
public Transform shankSpawn;
|
||||
public GameObject vvAura;
|
||||
public int swigCounter;
|
||||
private int swigs = 0;
|
||||
private GameController gameController;
|
||||
|
||||
void Start() {
|
||||
GameObject gameControllerObject = GameObject.FindWithTag("GameController");
|
||||
|
||||
if (gameControllerObject != null)
|
||||
gameController = gameControllerObject.GetComponent <GameController> ();
|
||||
else
|
||||
Debug.Log("Cannot find GameController script.");
|
||||
}
|
||||
|
||||
private Animator animator;
|
||||
|
||||
|
|
@ -24,19 +33,17 @@ public class PlayerController : MonoBehaviour {
|
|||
{
|
||||
if (Input.GetButton("Fire1") && Time.time > nextFire)
|
||||
{
|
||||
//audio.Play ();
|
||||
nextFire = Time.time + delay;
|
||||
Instantiate(shank, shankSpawn.position, playerAngle.rotation);
|
||||
//animator.SetInteger("state", 3);
|
||||
animator.Play("player_shank");
|
||||
}
|
||||
|
||||
if (Input.GetButton("ActivateVV") && swigs < swigCounter && Time.time > nextFire)
|
||||
if (Input.GetButton("ActivateVV") && gameController.swigs > 0 && Time.time > nextFire)
|
||||
{
|
||||
nextFire = Time.time + delay * 2;
|
||||
Instantiate (vvAura, rigidbody.position, rigidbody.rotation);
|
||||
swigs++;
|
||||
//animator.SetInteger("state", 1);
|
||||
gameController.TakeSwig();
|
||||
animator.Play("player_swig");
|
||||
}
|
||||
}
|
||||
|
|
@ -56,11 +63,11 @@ public class PlayerController : MonoBehaviour {
|
|||
|
||||
if (moveHorizontal < 0)
|
||||
playerAngle.eulerAngles = new Vector3(0f, -180f, 0f);
|
||||
else if (moveHorizontal > 0)
|
||||
if (moveHorizontal > 0)
|
||||
playerAngle.eulerAngles = new Vector3(0f, 0f, 0f);
|
||||
else if (moveVertical < 0)
|
||||
if (moveVertical < 0)
|
||||
playerAngle.eulerAngles = new Vector3(0f, -270f, 0f);
|
||||
else if (moveVertical > 0)
|
||||
if (moveVertical > 0)
|
||||
playerAngle.eulerAngles = new Vector3(0f, -90f, 0f);
|
||||
|
||||
Vector3 movement = new Vector3 (moveHorizontal, 0.0f, moveVertical);
|
||||
|
|
|
|||
28
Assets/Sprites/Materials/bartable.mat
Normal file
28
Assets/Sprites/Materials/bartable.mat
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_Name: bartable
|
||||
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ShaderKeywords: []
|
||||
m_CustomRenderQueue: -1
|
||||
m_SavedProperties:
|
||||
serializedVersion: 2
|
||||
m_TexEnvs:
|
||||
data:
|
||||
first:
|
||||
name: _MainTex
|
||||
second:
|
||||
m_Texture: {fileID: 2800000, guid: b4e4fc967fc663b40a468866f9eb935d, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats: {}
|
||||
m_Colors:
|
||||
data:
|
||||
first:
|
||||
name: _Color
|
||||
second: {r: 1, g: 1, b: 1, a: 1}
|
||||
4
Assets/Sprites/Materials/bartable.mat.meta
Normal file
4
Assets/Sprites/Materials/bartable.mat.meta
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0f351915bc38bc54aaeaf2224391fa42
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
|
|
@ -17,9 +17,9 @@ Material:
|
|||
first:
|
||||
name: _MainTex
|
||||
second:
|
||||
m_Texture: {fileID: 2800000, guid: f24a3f9e912f9b14b98097a9d998cfbc, type: 3}
|
||||
m_Scale: {x: 2, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3}
|
||||
m_Scale: {x: 1, y: .5}
|
||||
m_Offset: {x: 0, y: .5}
|
||||
m_Floats: {}
|
||||
m_Colors:
|
||||
data:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ TextureImporter:
|
|||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
enableMipMap: 0
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
|
|
@ -20,24 +20,24 @@ TextureImporter:
|
|||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
textureFormat: -3
|
||||
maxTextureSize: 1024
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
filterMode: 0
|
||||
aniso: 1
|
||||
mipBias: -1
|
||||
wrapMode: -1
|
||||
nPOTScale: 1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: .5, y: .5}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 0
|
||||
textureType: -1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 8
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ TextureImporter:
|
|||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
enableMipMap: 0
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
|
|
@ -20,24 +20,24 @@ TextureImporter:
|
|||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
textureFormat: -3
|
||||
maxTextureSize: 1024
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
filterMode: 0
|
||||
aniso: 1
|
||||
mipBias: -1
|
||||
wrapMode: -1
|
||||
nPOTScale: 1
|
||||
wrapMode: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: .5, y: .5}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 0
|
||||
textureType: -1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 8
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue