Add BloodSplatter effect when getting hit
This commit is contained in:
parent
a60b7707b6
commit
4b6bd0c66d
@ -171,7 +171,7 @@ Camera:
|
|||||||
m_Depth: 0
|
m_Depth: 0
|
||||||
m_CullingMask:
|
m_CullingMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 823
|
m_Bits: 4919
|
||||||
m_RenderingPath: -1
|
m_RenderingPath: -1
|
||||||
m_TargetTexture: {fileID: 0}
|
m_TargetTexture: {fileID: 0}
|
||||||
m_TargetDisplay: 0
|
m_TargetDisplay: 0
|
||||||
@ -235,7 +235,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: f6e08271c272323469510daa22c35599, type: 3}
|
m_Script: {fileID: 11500000, guid: f6e08271c272323469510daa22c35599, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
Camera: {fileID: 3742571491028069048}
|
|
||||||
DisableInput: 0
|
DisableInput: 0
|
||||||
FullSyncFrequency: 2
|
FullSyncFrequency: 2
|
||||||
--- !u!114 &3508289943927587728
|
--- !u!114 &3508289943927587728
|
||||||
@ -287,6 +286,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Layer
|
propertyPath: m_Layer
|
||||||
value: 10
|
value: 10
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912167870012, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
- target: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: LocalPlayer
|
value: LocalPlayer
|
||||||
@ -334,13 +337,13 @@ GameObject:
|
|||||||
m_CorrespondingSourceObject: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
m_CorrespondingSourceObject: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
m_PrefabInstance: {fileID: 8134536652936637724}
|
m_PrefabInstance: {fileID: 8134536652936637724}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &7808238467771803924 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 2071588178488902664, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 8134536652936637724}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!4 &3742571491028069048 stripped
|
--- !u!4 &3742571491028069048 stripped
|
||||||
Transform:
|
Transform:
|
||||||
m_CorrespondingSourceObject: {fileID: 4833458671639168932, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
m_CorrespondingSourceObject: {fileID: 4833458671639168932, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
m_PrefabInstance: {fileID: 8134536652936637724}
|
m_PrefabInstance: {fileID: 8134536652936637724}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &7808238467771803924 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2071588178488902664, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 8134536652936637724}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -476,7 +476,7 @@ Transform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7391558912382528812}
|
- {fileID: 7391558912382528812}
|
||||||
m_Father: {fileID: 7391558912774766616}
|
m_Father: {fileID: 7391558912774766616}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &7391558912382528811
|
--- !u!1 &7391558912382528811
|
||||||
GameObject:
|
GameObject:
|
||||||
@ -587,6 +587,7 @@ Transform:
|
|||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 7391558912582364399}
|
- {fileID: 7391558912582364399}
|
||||||
- {fileID: 7391558913662534769}
|
- {fileID: 7391558913662534769}
|
||||||
|
- {fileID: 835288951058457063}
|
||||||
- {fileID: 7391558912167870012}
|
- {fileID: 7391558912167870012}
|
||||||
- {fileID: 4833458671639168932}
|
- {fileID: 4833458671639168932}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
@ -657,6 +658,8 @@ MonoBehaviour:
|
|||||||
- {fileID: 2566772175078312154}
|
- {fileID: 2566772175078312154}
|
||||||
- {fileID: 1798037817325599949}
|
- {fileID: 1798037817325599949}
|
||||||
- {fileID: 4000144568201082722}
|
- {fileID: 4000144568201082722}
|
||||||
|
Lean: 0
|
||||||
|
Splatter: {fileID: 5204970423912589616}
|
||||||
Pitch: 0
|
Pitch: 0
|
||||||
Yaw: 0
|
Yaw: 0
|
||||||
BodyYaw: 0
|
BodyYaw: 0
|
||||||
@ -666,6 +669,7 @@ MonoBehaviour:
|
|||||||
GroundVelocity: {x: 0, y: 0, z: 0}
|
GroundVelocity: {x: 0, y: 0, z: 0}
|
||||||
GravitationalVelocity: {x: 0, y: 0, z: 0}
|
GravitationalVelocity: {x: 0, y: 0, z: 0}
|
||||||
GroundedTime: 0
|
GroundedTime: 0
|
||||||
|
NetId: 0
|
||||||
LatestGroundedY: 0
|
LatestGroundedY: 0
|
||||||
GroundCastLength: 0.2
|
GroundCastLength: 0.2
|
||||||
GroundLayer:
|
GroundLayer:
|
||||||
@ -935,7 +939,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7391558912774766616}
|
m_Father: {fileID: 7391558912774766616}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &8952758565847848432
|
--- !u!1 &8952758565847848432
|
||||||
GameObject:
|
GameObject:
|
||||||
@ -1127,3 +1131,70 @@ BoxCollider:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Size: {x: 1, y: 1, z: 1}
|
m_Size: {x: 1, y: 1, z: 1}
|
||||||
m_Center: {x: 0, y: 0, z: 0}
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1001 &892884152691873703
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 7391558912774766616}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6206501519553965397, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Splatter
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
--- !u!198 &5204970423912589616 stripped
|
||||||
|
ParticleSystem:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4926916423109787287, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 892884152691873703}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!4 &835288951058457063 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 572981381687391808, guid: 6181022b324cabb40a9af0a5be0adb31, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 892884152691873703}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
4904
Assets/GameObjects/Prefabs/Splatter.prefab
Normal file
4904
Assets/GameObjects/Prefabs/Splatter.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/GameObjects/Prefabs/Splatter.prefab.meta
Normal file
7
Assets/GameObjects/Prefabs/Splatter.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6181022b324cabb40a9af0a5be0adb31
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -270,6 +270,63 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1001 &860469586
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 0}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 7391558912774766599, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Player
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: -3.71
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0.02
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 3.89
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0.8569558
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.5153899
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 117.953
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7391558912774766616, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 0bffd92c46c257840806f5e957954800, type: 3}
|
||||||
--- !u!850595691 &957361945
|
--- !u!850595691 &957361945
|
||||||
LightingSettings:
|
LightingSettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -484,7 +541,7 @@ GameObject:
|
|||||||
- component: {fileID: 2026237565}
|
- component: {fileID: 2026237565}
|
||||||
- component: {fileID: 2026237564}
|
- component: {fileID: 2026237564}
|
||||||
- component: {fileID: 2026237563}
|
- component: {fileID: 2026237563}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: Cube
|
m_Name: Cube
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -789,7 +846,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh-21954
|
m_Name: pb_Mesh81014
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
|
@ -136,7 +136,7 @@ GameObject:
|
|||||||
- component: {fileID: 1107580}
|
- component: {fileID: 1107580}
|
||||||
- component: {fileID: 1107579}
|
- component: {fileID: 1107579}
|
||||||
- component: {fileID: 1107578}
|
- component: {fileID: 1107578}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: OrangeRampBlock
|
m_Name: OrangeRampBlock
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -880,7 +880,7 @@ GameObject:
|
|||||||
- component: {fileID: 45244047}
|
- component: {fileID: 45244047}
|
||||||
- component: {fileID: 45244046}
|
- component: {fileID: 45244046}
|
||||||
- component: {fileID: 45244045}
|
- component: {fileID: 45244045}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: OrangePlayerStart
|
m_Name: OrangePlayerStart
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -1365,7 +1365,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16554
|
m_Name: pb_Mesh79038
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -1536,7 +1536,7 @@ GameObject:
|
|||||||
- component: {fileID: 83012524}
|
- component: {fileID: 83012524}
|
||||||
- component: {fileID: 83012523}
|
- component: {fileID: 83012523}
|
||||||
- component: {fileID: 83012522}
|
- component: {fileID: 83012522}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: OranglePlayerRamp
|
m_Name: OranglePlayerRamp
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -3089,7 +3089,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16484
|
m_Name: pb_Mesh78918
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -3260,7 +3260,7 @@ GameObject:
|
|||||||
- component: {fileID: 129354768}
|
- component: {fileID: 129354768}
|
||||||
- component: {fileID: 129354767}
|
- component: {fileID: 129354767}
|
||||||
- component: {fileID: 129354766}
|
- component: {fileID: 129354766}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: Floor
|
m_Name: Floor
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -3789,7 +3789,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16634
|
m_Name: pb_Mesh79150
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -4458,7 +4458,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16326
|
m_Name: pb_Mesh78710
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -4937,7 +4937,7 @@ GameObject:
|
|||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 524351210}
|
- component: {fileID: 524351210}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: Map
|
m_Name: Map
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -5059,7 +5059,7 @@ GameObject:
|
|||||||
- component: {fileID: 560908282}
|
- component: {fileID: 560908282}
|
||||||
- component: {fileID: 560908281}
|
- component: {fileID: 560908281}
|
||||||
- component: {fileID: 560908280}
|
- component: {fileID: 560908280}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: BallSpawn
|
m_Name: BallSpawn
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -5867,7 +5867,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16604
|
m_Name: pb_Mesh79120
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -6102,7 +6102,7 @@ GameObject:
|
|||||||
- component: {fileID: 721747196}
|
- component: {fileID: 721747196}
|
||||||
- component: {fileID: 721747195}
|
- component: {fileID: 721747195}
|
||||||
- component: {fileID: 721747194}
|
- component: {fileID: 721747194}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: BluePlayerRamp
|
m_Name: BluePlayerRamp
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -7811,7 +7811,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16700
|
m_Name: pb_Mesh79242
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -8153,7 +8153,7 @@ GameObject:
|
|||||||
- component: {fileID: 946104692}
|
- component: {fileID: 946104692}
|
||||||
- component: {fileID: 946104691}
|
- component: {fileID: 946104691}
|
||||||
- component: {fileID: 946104690}
|
- component: {fileID: 946104690}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: BluePlayerStart
|
m_Name: BluePlayerStart
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -8685,7 +8685,7 @@ GameObject:
|
|||||||
- component: {fileID: 1022355509}
|
- component: {fileID: 1022355509}
|
||||||
- component: {fileID: 1022355508}
|
- component: {fileID: 1022355508}
|
||||||
- component: {fileID: 1022355507}
|
- component: {fileID: 1022355507}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: NeutralUnderpass
|
m_Name: NeutralUnderpass
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -10012,7 +10012,7 @@ GameObject:
|
|||||||
- component: {fileID: 1137616508}
|
- component: {fileID: 1137616508}
|
||||||
- component: {fileID: 1137616507}
|
- component: {fileID: 1137616507}
|
||||||
- component: {fileID: 1137616506}
|
- component: {fileID: 1137616506}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: BluePlayerUnderpass
|
m_Name: BluePlayerUnderpass
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -10444,7 +10444,7 @@ GameObject:
|
|||||||
- component: {fileID: 1210745937}
|
- component: {fileID: 1210745937}
|
||||||
- component: {fileID: 1210745936}
|
- component: {fileID: 1210745936}
|
||||||
- component: {fileID: 1210745935}
|
- component: {fileID: 1210745935}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: BlueRampBlock
|
m_Name: BlueRampBlock
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -11312,7 +11312,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16286
|
m_Name: pb_Mesh78650
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -11526,7 +11526,7 @@ GameObject:
|
|||||||
- component: {fileID: 1349294157}
|
- component: {fileID: 1349294157}
|
||||||
- component: {fileID: 1349294156}
|
- component: {fileID: 1349294156}
|
||||||
- component: {fileID: 1349294155}
|
- component: {fileID: 1349294155}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: BlueUnderpassBlock
|
m_Name: BlueUnderpassBlock
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -11990,7 +11990,7 @@ GameObject:
|
|||||||
- component: {fileID: 1446760011}
|
- component: {fileID: 1446760011}
|
||||||
- component: {fileID: 1446760010}
|
- component: {fileID: 1446760010}
|
||||||
- component: {fileID: 1446760009}
|
- component: {fileID: 1446760009}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: OrangeUnderpassBlock
|
m_Name: OrangeUnderpassBlock
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -12326,7 +12326,7 @@ GameObject:
|
|||||||
- component: {fileID: 1470235299}
|
- component: {fileID: 1470235299}
|
||||||
- component: {fileID: 1470235298}
|
- component: {fileID: 1470235298}
|
||||||
- component: {fileID: 1470235297}
|
- component: {fileID: 1470235297}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: OrangePlayerUnderpass
|
m_Name: OrangePlayerUnderpass
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -12818,7 +12818,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16528
|
m_Name: pb_Mesh79012
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -12989,7 +12989,7 @@ GameObject:
|
|||||||
- component: {fileID: 1533302257}
|
- component: {fileID: 1533302257}
|
||||||
- component: {fileID: 1533302256}
|
- component: {fileID: 1533302256}
|
||||||
- component: {fileID: 1533302255}
|
- component: {fileID: 1533302255}
|
||||||
m_Layer: 0
|
m_Layer: 8
|
||||||
m_Name: OuterWall
|
m_Name: OuterWall
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
@ -16582,7 +16582,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16312
|
m_Name: pb_Mesh78686
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -16902,7 +16902,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16582
|
m_Name: pb_Mesh79070
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -17370,7 +17370,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16658
|
m_Name: pb_Mesh79178
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -17626,7 +17626,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16670
|
m_Name: pb_Mesh79190
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -17964,7 +17964,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16274
|
m_Name: pb_Mesh78628
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
@ -18128,7 +18128,7 @@ Mesh:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: pb_Mesh16426
|
m_Name: pb_Mesh78844
|
||||||
serializedVersion: 10
|
serializedVersion: 10
|
||||||
m_SubMeshes:
|
m_SubMeshes:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
|
92
Assets/Graphics/Materials/BloodMaterial.mat
Normal file
92
Assets/Graphics/Materials/BloodMaterial.mat
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-6117569353147677688
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 2
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: BloodMaterial
|
||||||
|
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 2000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Floats:
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _SampleGI: 0
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.7924528, g: 0, b: 0, a: 1}
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
8
Assets/Graphics/Materials/BloodMaterial.mat.meta
Normal file
8
Assets/Graphics/Materials/BloodMaterial.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3f152a6ae777d324bbbb1f02a79e1bd3
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -26,6 +26,7 @@ namespace NeonTea.Quakeball.Networking {
|
|||||||
RegisterPacket(typeof(PlayerSyncPacket));
|
RegisterPacket(typeof(PlayerSyncPacket));
|
||||||
RegisterPacket(typeof(MultiplePlayerUpdatesPckt));
|
RegisterPacket(typeof(MultiplePlayerUpdatesPckt));
|
||||||
RegisterPacket(typeof(MultipleSyncsPckt));
|
RegisterPacket(typeof(MultipleSyncsPckt));
|
||||||
|
RegisterPacket(typeof(HitPckt));
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void ConnectionStatusChanged(ConnectionStatus oldStatus, ConnectionStatus newStatus, Connection conn) {
|
public override void ConnectionStatusChanged(ConnectionStatus oldStatus, ConnectionStatus newStatus, Connection conn) {
|
||||||
|
@ -79,6 +79,7 @@ namespace NeonTea.Quakeball.Networking.Instances {
|
|||||||
if (packet is SelfIdentPckt) {
|
if (packet is SelfIdentPckt) {
|
||||||
SelfIdentPckt ident = (SelfIdentPckt)packet;
|
SelfIdentPckt ident = (SelfIdentPckt)packet;
|
||||||
LocalPlayer.Id = ident.PlayerId;
|
LocalPlayer.Id = ident.PlayerId;
|
||||||
|
LocalPlayer.Controlled.NetId = LocalPlayer.Id;
|
||||||
Players.Add(LocalPlayer.Id, LocalPlayer);
|
Players.Add(LocalPlayer.Id, LocalPlayer);
|
||||||
SelfIdentified = true;
|
SelfIdentified = true;
|
||||||
|
|
||||||
|
@ -3,20 +3,25 @@ using NeonTea.Quakeball.Players;
|
|||||||
|
|
||||||
namespace NeonTea.Quakeball.Networking {
|
namespace NeonTea.Quakeball.Networking {
|
||||||
public class NetPlayer {
|
public class NetPlayer {
|
||||||
|
private Player _Controlled;
|
||||||
|
private ulong _Id;
|
||||||
|
|
||||||
public ulong Id {
|
public ulong Id {
|
||||||
get { return Id; }
|
get { return _Id; }
|
||||||
set {
|
set {
|
||||||
Id = value;
|
_Id = value;
|
||||||
if (Controlled != null) {
|
if (_Controlled != null) {
|
||||||
Controlled.NetId = Id;
|
_Controlled.NetId = _Id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public Player Controlled {
|
public Player Controlled {
|
||||||
get { return Controlled; }
|
get { return _Controlled; }
|
||||||
set {
|
set {
|
||||||
Controlled = value;
|
_Controlled = value;
|
||||||
Controlled.NetId = Id;
|
if (_Controlled != null) {
|
||||||
|
_Controlled.NetId = _Id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public bool Unsynced = false;
|
public bool Unsynced = false;
|
||||||
|
11
Assets/Scripts/Networking/Packets/HitPckt.cs.meta
Normal file
11
Assets/Scripts/Networking/Packets/HitPckt.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d097e3d59565e534e983192eafbe4d27
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -60,6 +60,11 @@ namespace NeonTea.Quakeball.Players {
|
|||||||
transform.position = new Vector3(float.Parse(args[0]), float.Parse(args[1]), float.Parse(args[2]));
|
transform.position = new Vector3(float.Parse(args[0]), float.Parse(args[1]), float.Parse(args[2]));
|
||||||
return true;
|
return true;
|
||||||
}, "tp x y z - Teleports the local player to the specified coordinates.");
|
}, "tp x y z - Teleports the local player to the specified coordinates.");
|
||||||
|
|
||||||
|
Terminal.Singleton.RegisterCommand("hit", args => {
|
||||||
|
Player.Hit();
|
||||||
|
return true;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Update() {
|
private void Update() {
|
||||||
|
@ -33,6 +33,8 @@ namespace NeonTea.Quakeball.Players {
|
|||||||
public DesyncLerper[] Lerpables;
|
public DesyncLerper[] Lerpables;
|
||||||
public float Lean;
|
public float Lean;
|
||||||
|
|
||||||
|
public ParticleSystem Splatter;
|
||||||
|
|
||||||
[Header("Player rotation status")]
|
[Header("Player rotation status")]
|
||||||
/// <summary>The pitch of the player's head.</summary>
|
/// <summary>The pitch of the player's head.</summary>
|
||||||
public float Pitch;
|
public float Pitch;
|
||||||
@ -159,8 +161,8 @@ namespace NeonTea.Quakeball.Players {
|
|||||||
Debug.DrawLine(GunPoint, To, Color.red, 5f);
|
Debug.DrawLine(GunPoint, To, Color.red, 5f);
|
||||||
if (Net.Singleton.Instance is Server) {
|
if (Net.Singleton.Instance is Server) {
|
||||||
((Server)Net.Singleton.Instance).SendHit(Player.NetId);
|
((Server)Net.Singleton.Instance).SendHit(Player.NetId);
|
||||||
Player.Hit();
|
|
||||||
}
|
}
|
||||||
|
Player.Hit();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Debug.DrawLine(GunPoint, To, Color.yellow, 5f);
|
Debug.DrawLine(GunPoint, To, Color.yellow, 5f);
|
||||||
@ -170,6 +172,7 @@ namespace NeonTea.Quakeball.Players {
|
|||||||
|
|
||||||
public void Hit() {
|
public void Hit() {
|
||||||
Debug.Log("I was hit! Aaagh!");
|
Debug.Log("I was hit! Aaagh!");
|
||||||
|
Splatter.Play();
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsGrounded() {
|
public bool IsGrounded() {
|
||||||
|
@ -18,7 +18,7 @@ PhysicsManager:
|
|||||||
m_ClothInterCollisionDistance: 0
|
m_ClothInterCollisionDistance: 0
|
||||||
m_ClothInterCollisionStiffness: 0
|
m_ClothInterCollisionStiffness: 0
|
||||||
m_ContactsGeneration: 1
|
m_ContactsGeneration: 1
|
||||||
m_LayerCollisionMatrix: fffcfffffffcfffffffcfffffffffffffffcfffffffcffffffffffffffffffffc8f9ffffc8fafffffffcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
m_LayerCollisionMatrix: ffedffffffecffffffecffffffffffffffecffffffecffffffffffffffffffffc9f9ffffc8eaffffffecffffffefffffc8e1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
m_AutoSimulation: 1
|
m_AutoSimulation: 1
|
||||||
m_AutoSyncTransforms: 0
|
m_AutoSyncTransforms: 0
|
||||||
m_ReuseCollisionCallbacks: 1
|
m_ReuseCollisionCallbacks: 1
|
||||||
|
@ -20,7 +20,7 @@ TagManager:
|
|||||||
- BulletHitLayer
|
- BulletHitLayer
|
||||||
- InvisibleToPlayerCamera
|
- InvisibleToPlayerCamera
|
||||||
- Gun
|
- Gun
|
||||||
-
|
- BloodLayer
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
-
|
-
|
||||||
|
Loading…
Reference in New Issue
Block a user