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

Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

Browse Source
This commit is contained in:
marcin
2025-06-06 12:26:02 +02:00
parent 27d5c63751 da253f8e6f
commit 168339d7ab
42 changed files with 16540 additions and 3582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Prefabs/Characters/Beasiculus/Bascileus_BaseModel.prefab
View File

@@ -81998,6 +81998,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -82013,6 +82014,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -82028,6 +82030,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 9202663234700498133}
@@ -104885,6 +104888,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -104900,6 +104904,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -104915,6 +104920,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 3157817243778252271}
@@ -105773,6 +105779,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
hitProperties:
hitDamageTags:
- Enemy
@@ -118356,6 +118363,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -118371,6 +118379,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -118386,6 +118395,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 3157817242016584094}
@@ -135311,6 +135321,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -135326,6 +135337,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -135341,6 +135353,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 3157817244105814045}
@@ -135487,6 +135500,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
layerToCollide:
serializedVersion: 2

12
Assets/Prefabs/Characters/Beasiculus/Bascileus_set1_BaseModel_CutScene.prefab
View File

@@ -854,6 +854,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -869,6 +870,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -884,6 +886,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 4367795707781829252}
@@ -3615,6 +3618,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -3630,6 +3634,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -3645,6 +3650,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 4367795705692615431}
@@ -6820,6 +6826,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -6835,6 +6842,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -6850,6 +6858,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 4367795706479253541}
@@ -8693,6 +8702,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
minDamage:
damageValue: 15
staminaBlockCost: 5
@@ -8708,6 +8718,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
maxDamage:
damageValue: 15
staminaBlockCost: 5
@@ -8723,6 +8734,7 @@ MonoBehaviour:
reaction_id: 0
damageType:
force: {x: 0, y: 0, z: 0}
ignoreAllHitEffects: 0
overrideDamageSender: {fileID: 0}
hitBoxes:
- {fileID: 4367795706020118261}