marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added damage type solutions

Browse Source
This commit is contained in:
marcin
2025-02-13 14:40:31 +01:00
parent 8f195a479c
commit 5de8f8b104
7 changed files with 1297 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Assets/Prefabs/Items/Weapons/bSword_v2.prefab
View File

@@ -26,6 +26,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1106044980}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -34,7 +35,6 @@ Transform:
- {fileID: 1513362382}
- {fileID: 1818190417}
m_Father: {fileID: 7807205128953202358}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1106044984
MeshFilter:
@@ -61,6 +61,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -128,13 +131,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513362381}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 1.035}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1106044981}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1818190416
GameObject:
@@ -159,13 +162,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1818190416}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.179}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1106044981}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &736190272354171927
GameObject:
@@ -192,13 +195,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 736190272354171927}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.64}
m_LocalScale: {x: 0.23784637, y: 0.2239713, z: 1.2470744}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5944816071627397346}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &6513997907389150666
BoxCollider:
@@ -208,9 +211,17 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 736190272354171927}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4362350937380170130
@@ -262,7 +273,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6415981892535880953}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -342,7 +352,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6415981892535880953}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@@ -410,6 +419,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3714521783858510636}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -420,7 +430,6 @@ Transform:
- {fileID: 223197423704206157}
- {fileID: 265919203047603553}
m_Father: {fileID: 7807205128953202358}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3910230267192816940
GameObject:
@@ -449,6 +458,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3910230267192816940}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -18.506012, y: 40.661, z: -58.10202}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -458,7 +468,6 @@ Transform:
- {fileID: 8448822185444601100}
- {fileID: 1106044981}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7411346901944145439
MonoBehaviour:
@@ -509,7 +518,7 @@ MonoBehaviour:
hitReaction: 1
recoil_id: 0
reaction_id: 0
damageType:
damageType: Cut
force: {x: 0, y: 0, z: 0}
minDamage:
damageValue: 10
@@ -524,7 +533,7 @@ MonoBehaviour:
hitReaction: 1
recoil_id: 0
reaction_id: 0
damageType:
damageType: Cut
force: {x: 0, y: 0, z: 0}
maxDamage:
damageValue: 20
@@ -539,7 +548,7 @@ MonoBehaviour:
hitReaction: 1
recoil_id: 0
reaction_id: 0
damageType:
damageType: Cut
force: {x: 0, y: 0, z: 0}
overrideDamageSender: {fileID: 0}
hitBoxes:
@@ -629,6 +638,13 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
referenceItem: {fileID: 0}
damageTypeToSetOnPowered:
powerModifier: 15
power:
name: 0
value: 0
isOpen: 0
isBool: 0
--- !u!1 &5283036751109062890
GameObject:
m_ObjectHideFlags: 0
@@ -654,13 +670,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5283036751109062890}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5944816071627397346}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!198 &1428813791060217810
ParticleSystem:
@@ -880,6 +896,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -909,6 +926,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -1230,6 +1248,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 1000
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
@@ -1959,6 +1978,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -1988,6 +2008,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -4208,6 +4229,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4237,6 +4259,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -4614,6 +4637,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -4656,6 +4680,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4685,6 +4710,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -4772,6 +4798,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4801,6 +4828,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -4839,6 +4867,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -4868,6 +4897,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -5121,6 +5151,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -5150,6 +5181,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -5387,6 +5419,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -5425,13 +5460,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -5466,13 +5503,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5298437755251176138}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5944816071627397346}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!198 &4882748309525053159
ParticleSystem:
@@ -5692,6 +5729,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -5721,6 +5759,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
startSize:
@@ -6042,6 +6081,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
gravitySource: 0
maxNumParticles: 1000
customEmitterVelocity: {x: 0, y: 0, z: 0}
size3D: 0
@@ -6771,6 +6811,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -6800,6 +6841,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
UVModule:
@@ -9020,6 +9062,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9049,6 +9092,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
range: {x: 0, y: 1}
@@ -9426,6 +9470,7 @@ ParticleSystem:
m_RotationOrder: 4
minVertexDistance: 0.2
textureMode: 0
textureScale: {x: 1, y: 1}
ribbonCount: 1
shadowBias: 0.5
worldSpace: 0
@@ -9468,6 +9513,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9497,6 +9543,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
widthOverTrail:
@@ -9584,6 +9631,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9613,6 +9661,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
CustomDataModule:
@@ -9651,6 +9700,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9680,6 +9730,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel0: Color
@@ -9933,6 +9984,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
minGradient:
@@ -9962,6 +10014,7 @@ ParticleSystem:
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorLabel1: Color
@@ -10199,6 +10252,9 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -10237,13 +10293,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 1
m_ApplyActiveColorSpace: 1
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
@@ -10288,7 +10346,6 @@ RectTransform:
m_Children:
- {fileID: 6415981892535880953}
m_Father: {fileID: 7807205128953202358}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -10312,7 +10369,9 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
@@ -10427,7 +10486,6 @@ RectTransform:
- {fileID: 7194782941131794289}
- {fileID: 2870577976866012120}
m_Father: {fileID: 8448822185444601100}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -10566,13 +10624,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8131635012629191169}
serializedVersion: 2
m_LocalRotation: {x: -0.048490327, y: 0.9988122, z: -0.0019157269, w: -0.004387785}
m_LocalPosition: {x: 0.0011377335, y: -0.032727867, z: 0.32733482}
m_LocalScale: {x: 1.256736, y: 1.2567364, z: 1.2567369}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5944816071627397346}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -180.244, y: 0.4920044, z: -185.558}
--- !u!33 &2594363619741627684
MeshFilter:
@@ -10599,6 +10657,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -10655,7 +10716,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6415981892535880953}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}