feat: shader ripples depending on velocity, added wing collision
This commit is contained in:
parent
269f154cc3
commit
b2c0d47e53
@ -13,7 +13,6 @@ Material:
|
||||
m_ModifiedSerializedProperties: 24
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
- _CLEARCOAT
|
||||
- _OCCLUSIONMAP
|
||||
- _SPECULARHIGHLIGHTS_OFF
|
||||
- _SPECULAR_SETUP
|
||||
@ -45,7 +44,7 @@ Material:
|
||||
- _DstBlendAlpha: 10
|
||||
- _Emission: 0
|
||||
- _EnvironmentalReflections: 0
|
||||
- _Metallic: 1
|
||||
- _Metallic: 0.127
|
||||
- _MetallicSpecGlossMapToggle: 0
|
||||
- _MetallicSpecToggle: 1
|
||||
- _NormalMapToggle: 0
|
||||
@ -55,7 +54,7 @@ Material:
|
||||
- _Surface: 1
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0, g: 1, b: 0.029850721, a: 0.33333334}
|
||||
- _BaseColor: {r: 0, g: 1, b: 0.029850721, a: 1}
|
||||
- _EmissionColor: {r: 1, g: 0.9481132, b: 0.9481132, a: 0}
|
||||
- _SpecColor: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@ -26,7 +26,6 @@ Material:
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
- _ALPHAPREMULTIPLY_ON
|
||||
- _MANUAL_RIPPLE
|
||||
- _OCCLUSIONMAP
|
||||
- _SPECULARHIGHLIGHTS_OFF
|
||||
- _SURFACE_TYPE_TRANSPARENT
|
||||
@ -135,7 +134,7 @@ Material:
|
||||
- _Glossiness: 0
|
||||
- _GlossyReflections: 0
|
||||
- _ImpactSpeed: 4.22
|
||||
- _ManualRipple: 1
|
||||
- _ManualRipple: 0
|
||||
- _ManualRippleAmplitude: 0.1
|
||||
- _ManualRippleAnim: 0
|
||||
- _ManualRippleDensity: 15
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Jakob Feldmann,J4K0B/jakob,J4K0B,23.02.2024 15:25,file:///C:/Users/jakob/AppData/Roaming/OpenOffice/4;
|
||||
@ -26,7 +26,7 @@ Transform:
|
||||
m_GameObject: {fileID: 633462257752369959}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.719, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 1.7, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -51,8 +51,61 @@ SphereCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.8
|
||||
m_Center: {x: 0, y: -0.14999998, z: 0}
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0.05, z: 0}
|
||||
--- !u!1 &950156585708023501
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4720078012668975929}
|
||||
- component: {fileID: 4145727123877952672}
|
||||
m_Layer: 6
|
||||
m_Name: Wing Spike Left
|
||||
m_TagString: Bumper
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4720078012668975929
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 950156585708023501}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.3, y: 1.1, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5042970769659716555}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &4145727123877952672
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 950156585708023501}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.22474784
|
||||
m_Center: {x: 0.01105564, y: 0.31469262, z: 0}
|
||||
--- !u!1 &1349367779684097889
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -65,7 +118,7 @@ GameObject:
|
||||
- component: {fileID: 586779197816813664}
|
||||
- component: {fileID: 3162407706504821700}
|
||||
m_Layer: 7
|
||||
m_Name: BodyArea (2)
|
||||
m_Name: Body Area Vert
|
||||
m_TagString: Vulnerable
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -105,7 +158,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.7689667
|
||||
m_Radius: 0.5
|
||||
m_Height: 3.288871
|
||||
m_Direction: 1
|
||||
m_Center: {x: -0.009052277, y: 0.59207475, z: 0}
|
||||
@ -138,7 +191,7 @@ GameObject:
|
||||
- component: {fileID: 8355975041218818307}
|
||||
- component: {fileID: 5169936245223775701}
|
||||
- component: {fileID: 2704141135220834432}
|
||||
m_Layer: 0
|
||||
m_Layer: 8
|
||||
m_Name: Player Blue
|
||||
m_TagString: Player
|
||||
m_Icon: {fileID: 0}
|
||||
@ -158,12 +211,14 @@ Transform:
|
||||
m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 1483206452300237684}
|
||||
- {fileID: 8571208796381655806}
|
||||
- {fileID: 4720078012668975929}
|
||||
- {fileID: 2425795438557507562}
|
||||
- {fileID: 8593468838974035070}
|
||||
- {fileID: 5739110816181282754}
|
||||
- {fileID: 3489597143813469327}
|
||||
- {fileID: 8571208796381655806}
|
||||
- {fileID: 7642085096940465448}
|
||||
- {fileID: 1483206452300237684}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &4827981227876901225
|
||||
@ -206,16 +261,16 @@ CapsuleCollider:
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_Bits: 503
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 1.0012046
|
||||
m_Height: 3.6115875
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.3
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0.004881978, y: 0.18490696, z: 0}
|
||||
m_Center: {x: 0, y: 0.8, z: 0}
|
||||
--- !u!114 &5169936245223775701
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -359,7 +414,7 @@ GameObject:
|
||||
- component: {fileID: 2834900501353118452}
|
||||
- component: {fileID: 724450761244835194}
|
||||
m_Layer: 7
|
||||
m_Name: BodyArea (1)
|
||||
m_Name: Body Area Hori
|
||||
m_TagString: Vulnerable
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -399,7 +454,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.7689667
|
||||
m_Radius: 0.4
|
||||
m_Height: 3.3167114
|
||||
m_Direction: 0
|
||||
m_Center: {x: -0.0063209534, y: 1.1207175, z: 0}
|
||||
@ -430,7 +485,7 @@ GameObject:
|
||||
- component: {fileID: 3765618345300295002}
|
||||
- component: {fileID: 6859854437250772001}
|
||||
- component: {fileID: 523278837762333881}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: BoostHint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -566,7 +621,7 @@ GameObject:
|
||||
- component: {fileID: 1974500454823196561}
|
||||
- component: {fileID: 5413562806822230906}
|
||||
- component: {fileID: 2166157519591534879}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: BoostFill
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -642,7 +697,7 @@ GameObject:
|
||||
- component: {fileID: 7924921833216538409}
|
||||
- component: {fileID: 1348694421324845363}
|
||||
- component: {fileID: 3749783139903412011}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: BoostCapacityBar
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -734,7 +789,7 @@ GameObject:
|
||||
- component: {fileID: 8606206132848449603}
|
||||
- component: {fileID: 637555920663137379}
|
||||
m_Layer: 7
|
||||
m_Name: VulnerableArea
|
||||
m_Name: Vulnerable Area
|
||||
m_TagString: Vulnerable
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -794,6 +849,59 @@ MonoBehaviour:
|
||||
TackleResponse:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &7841776443744888956
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2425795438557507562}
|
||||
- component: {fileID: 2623718159774269050}
|
||||
m_Layer: 6
|
||||
m_Name: Wing Spike Right
|
||||
m_TagString: Bumper
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2425795438557507562
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7841776443744888956}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 1.3, y: 1.1, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5042970769659716555}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &2623718159774269050
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7841776443744888956}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.22474784
|
||||
m_Center: {x: 0.01105564, y: 0.31469262, z: 0}
|
||||
--- !u!1 &9019135020271586677
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -806,7 +914,7 @@ GameObject:
|
||||
- component: {fileID: 445814646347293908}
|
||||
- component: {fileID: 6979067854074977402}
|
||||
- component: {fileID: 2850991218644177149}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: PlayerHUDBlue
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -968,6 +1076,18 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Spaceship9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2081346997128030056, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6772629167761317917, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@ -26,7 +26,7 @@ Transform:
|
||||
m_GameObject: {fileID: 633462257752369959}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.719, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 1.7, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
@ -51,8 +51,8 @@ SphereCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.8
|
||||
m_Center: {x: 0, y: -0.14999998, z: 0}
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0.05, z: 0}
|
||||
--- !u!1 &1372816401649438144
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -66,7 +66,7 @@ GameObject:
|
||||
- component: {fileID: 8355975041218818307}
|
||||
- component: {fileID: 5169936245223775701}
|
||||
- component: {fileID: 2704141135220834432}
|
||||
m_Layer: 0
|
||||
m_Layer: 8
|
||||
m_Name: Player Red
|
||||
m_TagString: Player
|
||||
m_Icon: {fileID: 0}
|
||||
@ -88,6 +88,8 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1324887603253715774}
|
||||
- {fileID: 8571208796381655806}
|
||||
- {fileID: 1800557870803532748}
|
||||
- {fileID: 8330208635706005162}
|
||||
- {fileID: 3841992206182845443}
|
||||
- {fileID: 6616209870729500669}
|
||||
- {fileID: 4731773442997728510}
|
||||
@ -134,16 +136,16 @@ CapsuleCollider:
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_Bits: 503
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 1.0012046
|
||||
m_Height: 3.6115875
|
||||
m_Radius: 0.3
|
||||
m_Height: 0.3
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0.004881978, y: 0.18490696, z: 0}
|
||||
m_Center: {x: 0, y: 0.8, z: 0}
|
||||
--- !u!114 &5169936245223775701
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -251,7 +253,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
playerId: 1
|
||||
playerName: Gray
|
||||
playerName: Red
|
||||
cameraOperator: {fileID: 0}
|
||||
thrustAcceleration: 1500
|
||||
steerVelocity: 300
|
||||
@ -286,7 +288,7 @@ GameObject:
|
||||
- component: {fileID: 3765618345300295002}
|
||||
- component: {fileID: 6859854437250772001}
|
||||
- component: {fileID: 523278837762333881}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: BoostHint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -422,7 +424,7 @@ GameObject:
|
||||
- component: {fileID: 1974500454823196561}
|
||||
- component: {fileID: 5413562806822230906}
|
||||
- component: {fileID: 2166157519591534879}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: BoostFill
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -486,6 +488,59 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &5332524459205227969
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1800557870803532748}
|
||||
- component: {fileID: 3746801051712587895}
|
||||
m_Layer: 6
|
||||
m_Name: Wing Spike Left
|
||||
m_TagString: Bumper
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1800557870803532748
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5332524459205227969}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.3, y: 1.1, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5042970769659716555}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &3746801051712587895
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5332524459205227969}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.22474784
|
||||
m_Center: {x: 0.01105564, y: 0.31469262, z: 0}
|
||||
--- !u!1 &6725050089878600247
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -498,7 +553,7 @@ GameObject:
|
||||
- component: {fileID: 7924921833216538409}
|
||||
- component: {fileID: 1348694421324845363}
|
||||
- component: {fileID: 3749783139903412011}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: BoostCapacityBar
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -590,7 +645,7 @@ GameObject:
|
||||
- component: {fileID: 2002926257171607455}
|
||||
- component: {fileID: 4332820428347969134}
|
||||
m_Layer: 7
|
||||
m_Name: BodyArea
|
||||
m_Name: Body Area Vert
|
||||
m_TagString: Vulnerable
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -630,7 +685,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.7689667
|
||||
m_Radius: 0.5
|
||||
m_Height: 3.288871
|
||||
m_Direction: 1
|
||||
m_Center: {x: -0.009052277, y: 0.59207475, z: 0}
|
||||
@ -662,7 +717,7 @@ GameObject:
|
||||
- component: {fileID: 3382748034708925609}
|
||||
- component: {fileID: 246089974030300413}
|
||||
m_Layer: 7
|
||||
m_Name: BodyArea (1)
|
||||
m_Name: Body Area Hori
|
||||
m_TagString: Vulnerable
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -702,7 +757,7 @@ CapsuleCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.7689667
|
||||
m_Radius: 0.4
|
||||
m_Height: 3.3167114
|
||||
m_Direction: 0
|
||||
m_Center: {x: -0.0063209534, y: 1.1207175, z: 0}
|
||||
@ -733,8 +788,8 @@ GameObject:
|
||||
- component: {fileID: 4731773442997728510}
|
||||
- component: {fileID: 7344454840763247002}
|
||||
- component: {fileID: 2291540291918720668}
|
||||
m_Layer: 7
|
||||
m_Name: VulnerableArea
|
||||
m_Layer: 8
|
||||
m_Name: Vulnerable Area
|
||||
m_TagString: Vulnerable
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -806,7 +861,7 @@ GameObject:
|
||||
- component: {fileID: 445814646347293908}
|
||||
- component: {fileID: 6979067854074977402}
|
||||
- component: {fileID: 2850991218644177149}
|
||||
m_Layer: 5
|
||||
m_Layer: 8
|
||||
m_Name: PlayerHUDRed
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -896,6 +951,59 @@ MonoBehaviour:
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!1 &9047713688665039503
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8330208635706005162}
|
||||
- component: {fileID: 7986445783805664431}
|
||||
m_Layer: 6
|
||||
m_Name: Wing Spike Right
|
||||
m_TagString: Bumper
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8330208635706005162
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9047713688665039503}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 1.3, y: 1.1, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5042970769659716555}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &7986445783805664431
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9047713688665039503}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 1
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.22474784
|
||||
m_Center: {x: 0.01105564, y: 0.31469262, z: 0}
|
||||
--- !u!1001 &1578594390765257941
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -968,6 +1076,18 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Spaceship9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2081346997128030056, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6772629167761317917, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@ -61,7 +61,7 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 0b425997046656b499075b77834259af, type: 2}
|
||||
- {fileID: 2100000, guid: 78cb0d90576fe15439f3fd294d5eaaba, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
||||
@ -768,12 +768,13 @@ MonoBehaviour:
|
||||
renderedZoneObject: {fileID: 2129209322}
|
||||
outsideGravityFunction: 0
|
||||
zone: 0
|
||||
rippleFrequency: 18
|
||||
rippleDensity: 20
|
||||
rippleAmplitude: 0.08
|
||||
rippleBlend: 1
|
||||
rippleFrequency: 10
|
||||
rippleDensity: 12
|
||||
rippleAmplitude: 0.1
|
||||
rippleRadius: 1.62
|
||||
rippleDuration: 1.2
|
||||
rippleDuration: 1
|
||||
impactVelocityModifier: 1
|
||||
maxVelocity: 40
|
||||
--- !u!1001 &1361581063
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -786,6 +787,18 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Play Zone
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8098169881513260187, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Untagged
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -5424748951385635051, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -990798463411063789, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3}
|
||||
propertyPath: m_Materials.Array.size
|
||||
value: 1
|
||||
@ -846,6 +859,10 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3956523934073451991, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8385590999942887681, guid: 303177f7648454b4fb8179c1378dd1ec, type: 3}
|
||||
propertyPath: m_Materials.Array.size
|
||||
value: 1
|
||||
@ -1157,26 +1174,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Player Red
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: playerName
|
||||
value: Red
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2704141135220834432, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: cameraOperator
|
||||
value:
|
||||
objectReference: {fileID: 963194229}
|
||||
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 1.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 1.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 1.4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5042970769659716555, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -10
|
||||
@ -1217,34 +1218,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952757812254, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952760066782, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_CastShadows
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952760066782, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_MotionVectors
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952760066782, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_DynamicOccludee
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952760066782, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_LightProbeUsage
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952760066782, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_RenderingLayerMask
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6404588952760066782, guid: 46f84e56340e83e4ba7c6abbccd2ae3f, type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: -6478536213147159724, guid: 0314dc2e0a09e6b46809ba485ec101ed, type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -1258,22 +1231,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1152287105883655159, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Spaceship9 Hull
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1349367779684097889, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Body Area (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1372816401649438144, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Player Blue
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2236297877709258492, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Body Area (1)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2704141135220834432, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: cameraOperator
|
||||
value:
|
||||
@ -1318,22 +1279,6 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5411380178868568951, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 4874126678125670354, guid: 61dc60d6e44cd9f46bc21aa06f06f92b, type: 3}
|
||||
- target: {fileID: 5684360001092439170, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Spaceship9 Tail
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6980644068169889807, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Vulnerable Area
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9019135020271586677, guid: 65cd4fa5e050652409dd9b062365c7e8, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Player HUD Blue
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
using static AffectingForcesManager;
|
||||
|
||||
public class NimbleZoneDetection : MonoBehaviour
|
||||
@ -28,13 +30,18 @@ public class NimbleZoneDetection : MonoBehaviour
|
||||
[SerializeField]
|
||||
private float rippleDensity = 30f;
|
||||
[SerializeField]
|
||||
private float rippleAmplitude = 0.2f;
|
||||
private float rippleAmplitude = 0.1f;
|
||||
[SerializeField]
|
||||
private float rippleBlend = 1f;
|
||||
private float rippleRadius = 1f;
|
||||
[SerializeField]
|
||||
private float rippleRadius = 2f;
|
||||
private float rippleDuration = 1f;
|
||||
[SerializeField]
|
||||
private float rippleDuration = 2f;
|
||||
private float impactVelocityModifier = 1f;
|
||||
[SerializeField]
|
||||
[Range(0, 1)]
|
||||
private float minImpact = 0.2f;
|
||||
[SerializeField]
|
||||
private float maxVelocity = 45f;
|
||||
private int maxRippleAmount = 5;
|
||||
private int playerCount = 2;
|
||||
private int spawnedCount = 0;
|
||||
@ -72,18 +79,34 @@ public class NimbleZoneDetection : MonoBehaviour
|
||||
{
|
||||
int instanceID = collider.gameObject.GetInstanceID();
|
||||
if (spawnedCount < playerCount)
|
||||
{
|
||||
++spawnedCount;
|
||||
else SpawnRipple(collider, false);
|
||||
forcesManager.SetGravityForInstance(instanceID, NoGravity);
|
||||
forcesManager.SetZoneForInstance(instanceID, zone);
|
||||
}
|
||||
else if (collider.tag == "Spike")
|
||||
{
|
||||
SpawnRipple(collider, false);
|
||||
return;
|
||||
}
|
||||
if (collider.tag == "Character" || collider.tag == "Player")
|
||||
{
|
||||
forcesManager.SetGravityForInstance(instanceID, NoGravity);
|
||||
forcesManager.SetZoneForInstance(instanceID, zone);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider collider)
|
||||
{
|
||||
int instanceID = collider.gameObject.GetInstanceID();
|
||||
SpawnRipple(collider, true);
|
||||
forcesManager.SetGravityForInstance(instanceID, GetGravityFunction(outsideGravityFunction));
|
||||
forcesManager.SetZoneForInstance(instanceID, Zone.OutsideZone);
|
||||
if (collider.tag == "Spike")
|
||||
{
|
||||
SpawnRipple(collider, true);
|
||||
return;
|
||||
}
|
||||
if (collider.tag == "Character" || collider.tag == "Player")
|
||||
{
|
||||
forcesManager.SetGravityForInstance(instanceID, GetGravityFunction(outsideGravityFunction));
|
||||
forcesManager.SetZoneForInstance(instanceID, Zone.OutsideZone);
|
||||
}
|
||||
}
|
||||
|
||||
private void Update()
|
||||
@ -91,6 +114,12 @@ public class NimbleZoneDetection : MonoBehaviour
|
||||
material.SetFloat("_ShaderTime", Time.timeSinceLevelLoad);
|
||||
}
|
||||
|
||||
private float ImpactVelocityEffect(float x, float velocity)
|
||||
{
|
||||
return math.max(math.smoothstep(0, maxVelocity, velocity), minImpact)
|
||||
* impactVelocityModifier * x;
|
||||
}
|
||||
|
||||
private void SpawnRipple(Collider collider, bool isOutwardsRipple)
|
||||
{
|
||||
Rigidbody body = collider.attachedRigidbody;
|
||||
@ -119,11 +148,13 @@ public class NimbleZoneDetection : MonoBehaviour
|
||||
startedTimes[i] = currentTime;
|
||||
material.SetFloatArray("_RippleStartTimes", startedTimes);
|
||||
|
||||
rippleAmplitudes[i] = isOutwardsRipple ? rippleAmplitude : -rippleAmplitude;
|
||||
rippleFrequencies[i] = rippleFrequency;
|
||||
rippleDensities[i] = rippleDensity;
|
||||
startedRippleDurations[i] = rippleDuration;
|
||||
rippleRadii[i] = rippleRadius;
|
||||
float amplitude = isOutwardsRipple ? rippleAmplitude : -rippleAmplitude;
|
||||
|
||||
rippleAmplitudes[i] = ImpactVelocityEffect(amplitude, velocity);
|
||||
rippleFrequencies[i] = ImpactVelocityEffect(rippleFrequency, velocity);
|
||||
rippleDensities[i] = ImpactVelocityEffect(rippleDensity, velocity);
|
||||
startedRippleDurations[i] = ImpactVelocityEffect(rippleDuration, velocity);
|
||||
rippleRadii[i] = ImpactVelocityEffect(rippleRadius, velocity);
|
||||
material.SetFloatArray("_RippleAmplitudes", rippleAmplitudes);
|
||||
material.SetFloatArray("_RippleFrequencies", rippleFrequencies);
|
||||
material.SetFloatArray("_RippleDensities", rippleDensities);
|
||||
|
||||
@ -7,7 +7,7 @@ public class TackleDetection : MonoBehaviour
|
||||
public UnityEvent<TackleKind, Collider> TackleResponse;
|
||||
void OnTriggerEnter(Collider collider)
|
||||
{
|
||||
if (collider.tag != "Spike")
|
||||
if (collider.tag != "Spike" && collider.tag != "Bumper")
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ public class ZoneRules : MonoBehaviour
|
||||
public delegate void OnPlayZoneExited(GameObject go);
|
||||
private void OnTriggerExit(Collider collider)
|
||||
{
|
||||
if (onPlayZoneExited != null)
|
||||
if (onPlayZoneExited != null && collider.tag == "Player")
|
||||
{
|
||||
onPlayZoneExited.Invoke(collider.gameObject);
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@ PhysicsManager:
|
||||
m_ClothInterCollisionDistance: 0
|
||||
m_ClothInterCollisionStiffness: 0
|
||||
m_ContactsGeneration: 1
|
||||
m_LayerCollisionMatrix: ffffffffffffffffffffffff3ffffffffffffffffffffffff7fffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
m_LayerCollisionMatrix: ffffffffffffffffffffffff4fffffffd7ffffffe7fffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
m_SimulationMode: 0
|
||||
m_AutoSyncTransforms: 0
|
||||
m_ReuseCollisionCallbacks: 1
|
||||
|
||||
@ -8,6 +8,7 @@ TagManager:
|
||||
- Vulnerable
|
||||
- Spike
|
||||
- ForceManager
|
||||
- Bumper
|
||||
layers:
|
||||
- Default
|
||||
- TransparentFX
|
||||
@ -15,9 +16,9 @@ TagManager:
|
||||
- Zone
|
||||
- Water
|
||||
- UI
|
||||
- Spike
|
||||
- Vulnerable
|
||||
-
|
||||
- Collider
|
||||
- Detector
|
||||
- Character
|
||||
-
|
||||
-
|
||||
-
|
||||
|
||||
Loading…
Reference in New Issue
Block a user