NeonTea/BloodAndGore
2
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix blood getting stuck in air bug

Browse Source
This commit is contained in:
Jens Pitkänen 2019-08-04 21:13:11 +03:00
parent 27937e0a24
commit 2435a0e136
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Prefabs/BloodParticle (Censored).prefab
View File

@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1882677610630750273} - component: {fileID: 1882677610630750273}
- component: {fileID: 1882677610630750274} - component: {fileID: 1882677610630750274}
m_Layer: 0 m_Layer: 10
m_Name: Flower m_Name: Flower
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -90,7 +90,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1882677610906969933} - component: {fileID: 1882677610906969933}
- component: {fileID: 1882677610906969934} - component: {fileID: 1882677610906969934}
m_Layer: 0 m_Layer: 10
m_Name: BloodParticle (Censored) m_Name: BloodParticle (Censored)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}

6
Assets/Prefabs/BloodParticle.prefab
View File

@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 5625006176639346185} - component: {fileID: 5625006176639346185}
- component: {fileID: 5625006176639346186} - component: {fileID: 5625006176639346186}
m_Layer: 0 m_Layer: 10
m_Name: Blood m_Name: Blood
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -67,7 +67,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1695068835 m_SortingLayerID: -1695068835
m_SortingLayer: 1 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ff1fce077e0aafb45be2c369b110d6e0, type: 3} m_Sprite: {fileID: 21300000, guid: ff1fce077e0aafb45be2c369b110d6e0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -90,7 +90,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 5625006176899801349} - component: {fileID: 5625006176899801349}
- component: {fileID: 5625006176899801350} - component: {fileID: 5625006176899801350}
m_Layer: 0 m_Layer: 10
m_Name: BloodParticle m_Name: BloodParticle
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}

8
Assets/Prefabs/Bodyparts/BigBodyPart-1.prefab
View File

@ -11,8 +11,8 @@ GameObject:
- component: {fileID: 2403023919827435617} - component: {fileID: 2403023919827435617}
- component: {fileID: 9009886668846231246} - component: {fileID: 9009886668846231246}
- component: {fileID: 3469277225519186156} - component: {fileID: 3469277225519186156}
m_Layer: 0 m_Layer: 8
m_Name: BigBodyPart m_Name: BigBodyPart-1
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -80,7 +80,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 5020727160165152633} - component: {fileID: 5020727160165152633}
- component: {fileID: 4557997538418576662} - component: {fileID: 4557997538418576662}
m_Layer: 0 m_Layer: 8
m_Name: Sprite m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -137,7 +137,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 4126751842953345123, guid: f68259633136b6c4bad937f60d3546bc, m_Sprite: {fileID: 4126751842953345123, guid: f68259633136b6c4bad937f60d3546bc,
type: 3} type: 3}

8
Assets/Prefabs/Bodyparts/BigBodyPart-2.prefab
View File

@ -11,8 +11,8 @@ GameObject:
- component: {fileID: 3994945276865905492} - component: {fileID: 3994945276865905492}
- component: {fileID: 7719213903103143419} - component: {fileID: 7719213903103143419}
- component: {fileID: 2741844813515047897} - component: {fileID: 2741844813515047897}
m_Layer: 0 m_Layer: 8
m_Name: BigBodyPart (1) m_Name: BigBodyPart-2
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -80,7 +80,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6018094249184064588} - component: {fileID: 6018094249184064588}
- component: {fileID: 2983888231099534883} - component: {fileID: 2983888231099534883}
m_Layer: 0 m_Layer: 8
m_Name: Sprite m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -137,7 +137,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 5731680368321206013, guid: f68259633136b6c4bad937f60d3546bc, m_Sprite: {fileID: 5731680368321206013, guid: f68259633136b6c4bad937f60d3546bc,
type: 3} type: 3}

8
Assets/Prefabs/Bodyparts/BigBodyPart-3.prefab
View File

@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 2264486952884678889} - component: {fileID: 2264486952884678889}
- component: {fileID: 7314238037611072134} - component: {fileID: 7314238037611072134}
m_Layer: 0 m_Layer: 8
m_Name: Sprite m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -67,7 +67,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: -5231856131614477843, guid: f68259633136b6c4bad937f60d3546bc, m_Sprite: {fileID: -5231856131614477843, guid: f68259633136b6c4bad937f60d3546bc,
type: 3} type: 3}
@ -92,8 +92,8 @@ GameObject:
- component: {fileID: 8906263707188381681} - component: {fileID: 8906263707188381681}
- component: {fileID: 2867009635806964062} - component: {fileID: 2867009635806964062}
- component: {fileID: 7702702804767508348} - component: {fileID: 7702702804767508348}
m_Layer: 0 m_Layer: 8
m_Name: BigBodyPart (2) m_Name: BigBodyPart-3
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0

6
Assets/Prefabs/Bodyparts/MediumBodyPart-1.prefab
View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 4117065251402618012} - component: {fileID: 4117065251402618012}
- component: {fileID: 7309919154586958387} - component: {fileID: 7309919154586958387}
- component: {fileID: 2909001883358942225} - component: {fileID: 2909001883358942225}
m_Layer: 0 m_Layer: 8
m_Name: MediumBodyPart-1 m_Name: MediumBodyPart-1
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -80,7 +80,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6761790136656946052} - component: {fileID: 6761790136656946052}
- component: {fileID: 2826785095177378283} - component: {fileID: 2826785095177378283}
m_Layer: 0 m_Layer: 8
m_Name: Sprite m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -137,7 +137,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: -8580675090303374382, guid: f68259633136b6c4bad937f60d3546bc, m_Sprite: {fileID: -8580675090303374382, guid: f68259633136b6c4bad937f60d3546bc,
type: 3} type: 3}

6
Assets/Prefabs/Bodyparts/MediumBodyPart-2.prefab
View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 3264248364569026240} - component: {fileID: 3264248364569026240}
- component: {fileID: 8150456643613028463} - component: {fileID: 8150456643613028463}
- component: {fileID: 4337221885725056589} - component: {fileID: 4337221885725056589}
m_Layer: 0 m_Layer: 8
m_Name: MediumBodyPart-2 m_Name: MediumBodyPart-2
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -80,7 +80,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 5312142899403631064} - component: {fileID: 5312142899403631064}
- component: {fileID: 3698848987744752567} - component: {fileID: 3698848987744752567}
m_Layer: 0 m_Layer: 8
m_Name: Sprite m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -137,7 +137,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 261822481497576611, guid: f68259633136b6c4bad937f60d3546bc, type: 3} m_Sprite: {fileID: 261822481497576611, guid: f68259633136b6c4bad937f60d3546bc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}

6
Assets/Prefabs/Bodyparts/MediumBodyPart-3.prefab
View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 1297044683168239623} - component: {fileID: 1297044683168239623}
- component: {fileID: 5643233472970686120} - component: {fileID: 5643233472970686120}
- component: {fileID: 251110318010601610} - component: {fileID: 251110318010601610}
m_Layer: 0 m_Layer: 8
m_Name: MediumBodyPart-3 m_Name: MediumBodyPart-3
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -80,7 +80,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 8571601343068055327} - component: {fileID: 8571601343068055327}
- component: {fileID: 871451326223146352} - component: {fileID: 871451326223146352}
m_Layer: 0 m_Layer: 8
m_Name: Sprite m_Name: Sprite
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -137,7 +137,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -947994997 m_SortingLayerID: -947994997
m_SortingLayer: 3 m_SortingLayer: 4
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: -6252851290386275527, guid: f68259633136b6c4bad937f60d3546bc, m_Sprite: {fileID: -6252851290386275527, guid: f68259633136b6c4bad937f60d3546bc,
type: 3} type: 3}

4
Assets/Prefabs/Player.prefab
View File

@ -100,7 +100,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 3236373932878825813} - component: {fileID: 3236373932878825813}
- component: {fileID: 6970513589971572751} - component: {fileID: 6970513589971572751}
m_Layer: 0 m_Layer: 11
m_Name: PlayerAtlas_8 m_Name: PlayerAtlas_8
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -213,7 +213,7 @@ GameObject:
- component: {fileID: 340836170559364036} - component: {fileID: 340836170559364036}
- component: {fileID: 3148879525607712928} - component: {fileID: 3148879525607712928}
- component: {fileID: 7903806047682221272} - component: {fileID: 7903806047682221272}
m_Layer: 0 m_Layer: 11
m_Name: SubHand m_Name: SubHand
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}

14
Assets/Prefabs/RevolverBullet.prefab
View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 12470849399218118} - component: {fileID: 12470849399218118}
- component: {fileID: 6411602551704027216} - component: {fileID: 6411602551704027216}
- component: {fileID: 1545250912626387459} - component: {fileID: 1545250912626387459}
m_Layer: 0 m_Layer: 9
m_Name: Explosion m_Name: Explosion
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -4728,7 +4728,7 @@ ParticleSystemRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1811527703 m_SortingLayerID: 1811527703
m_SortingLayer: 4 m_SortingLayer: 5
m_SortingOrder: 0 m_SortingOrder: 0
m_RenderMode: 0 m_RenderMode: 0
m_SortMode: 0 m_SortMode: 0
@ -4764,7 +4764,7 @@ GameObject:
- component: {fileID: 2438434796844793584} - component: {fileID: 2438434796844793584}
- component: {fileID: 4595570391660610945} - component: {fileID: 4595570391660610945}
- component: {fileID: 2776854920392372681} - component: {fileID: 2776854920392372681}
m_Layer: 0 m_Layer: 9
m_Name: Trail m_Name: Trail
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -9481,7 +9481,7 @@ ParticleSystemRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1811527703 m_SortingLayerID: 1811527703
m_SortingLayer: 4 m_SortingLayer: 5
m_SortingOrder: 0 m_SortingOrder: 0
m_RenderMode: 0 m_RenderMode: 0
m_SortMode: 0 m_SortMode: 0
@ -9519,7 +9519,7 @@ GameObject:
- component: {fileID: 30050365576565218} - component: {fileID: 30050365576565218}
- component: {fileID: 4482402865533696887} - component: {fileID: 4482402865533696887}
- component: {fileID: 894503829911440170} - component: {fileID: 894503829911440170}
m_Layer: 0 m_Layer: 9
m_Name: RevolverBullet m_Name: RevolverBullet
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -9620,7 +9620,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 8451997783836118231} - component: {fileID: 8451997783836118231}
- component: {fileID: 7482596571586124137} - component: {fileID: 7482596571586124137}
m_Layer: 0 m_Layer: 9
m_Name: RevolverBullet m_Name: RevolverBullet
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -9677,7 +9677,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1969288999 m_SortingLayerID: 1969288999
m_SortingLayer: 5 m_SortingLayer: 6
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: c52c475497269974b84c1ee730136ca6, type: 3} m_Sprite: {fileID: 21300000, guid: c52c475497269974b84c1ee730136ca6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}

4
Assets/Prefabs/StructuralDamageParticle.prefab
View File

@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6669388256411233038} - component: {fileID: 6669388256411233038}
- component: {fileID: 6669388256411233138} - component: {fileID: 6669388256411233138}
m_Layer: 0 m_Layer: 10
m_Name: Graphic m_Name: Graphic
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -90,7 +90,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6669388256411233039} - component: {fileID: 6669388256411233039}
- component: {fileID: 6669388256411233133} - component: {fileID: 6669388256411233133}
m_Layer: 0 m_Layer: 10
m_Name: StructuralDamageParticle m_Name: StructuralDamageParticle
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}

2
ProjectSettings/Physics2DSettings.asset
View File

@ -53,4 +53,4 @@ Physics2DSettings:
m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
m_LayerCollisionMatrix: fffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffefffffff7fffffffbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

8
ProjectSettings/TagManager.asset
View File

@ -14,10 +14,10 @@ TagManager:
- UI - UI
- -
- -
- - Bodypart
- - Bullet
- - Blood
- - Player Hand
- -
- -
- -