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}

20
Assets/Prefabs/FXGate/FXGateRoots.prefab
View File

@@ -203,7 +203,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0.3901362, y: -0.39884356, z: 0.31246474, w: 0.7688195}
m_LocalPosition: {x: 13.93, y: 40.21, z: -39.36}
m_LocalScale: {x: 0.110949144, y: 0.0735072, z: 0.110949166}
m_LocalScale: {x: 0.11094914, y: 0.073507205, z: 0.11094917}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8504127528854653553}
@@ -236,7 +236,7 @@ MonoBehaviour:
- {fileID: 8606076445728158576}
m_effect: {fileID: 0}
m_burnoutTime: 3
m_destroyTime: 5
m_destroyTime: 3
m_delay: 1
m_lightToAnimate: {fileID: 0}
--- !u!65 &8635202493545848867
@@ -258,8 +258,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 17.875721, y: 32.058144, z: 14.945146}
m_Center: {x: 2.132795, y: -0.43375033, z: 0.4792527}
m_Size: {x: 21.09685, y: 30.436941, z: 19.004988}
m_Center: {x: 3.743364, y: -1.2443696, z: 2.5091968}
--- !u!114 &1419620463414589321
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -377,6 +377,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 8635202493545848867}
m_TargetAssemblyTypeName: UnityEngine.Collider, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
onChangeHealth:
m_PersistentCalls:
m_Calls: []

1652
Assets/Prefabs/Gameplay/PlantableTrees/Good_Soil_Tree.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/Gameplay/PlantableTrees/Good_Soil_Tree.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4fa3d057c4946554cb3c68331d5c7e06
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Prefabs/Items/Consumables/Purple coneflowers Variant.prefab
View File

@@ -5470,7 +5470,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &7019251980953234364
Transform:
m_ObjectHideFlags: 0

6
Assets/Prefabs/PlayerWithUI.prefab
View File

@@ -25134,7 +25134,7 @@ PrefabInstance:
- target: {fileID: 3053764927411709791, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3363011155242089996, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
@@ -26680,7 +26680,7 @@ PrefabInstance:
- target: {fileID: 6801932090984752054, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6873079659947345108, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
@@ -26956,7 +26956,7 @@ PrefabInstance:
- target: {fileID: 8701437937550647419, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8913891428701285121, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}