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

Fixes

Browse Source
This commit is contained in:
Szymon Miś
2025-09-15 06:21:17 +02:00
parent 7dab87f5ea
commit b29294fc82
5 changed files with 1714 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/AI/Demon/Turret.prefab
View File

@@ -269,6 +269,37 @@ Transform:
m_Children: []
m_Father: {fileID: 7477031357845589619}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2959703547699563350
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4811884742789439147}
m_Layer: 30
m_Name: muzzle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4811884742789439147
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2959703547699563350}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.12, y: 2.189, z: -0.042}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7477031357845589619}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3055178718369943354
GameObject:
m_ObjectHideFlags: 0
@@ -704,6 +735,7 @@ Transform:
- {fileID: 930674647713283208}
- {fileID: 5932380182666656162}
- {fileID: 5036138525147919325}
- {fileID: 4811884742789439147}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1257534352646044711
@@ -1011,7 +1043,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 906d915677721914dbe9708f218f574a, type: 3}
m_Name:
m_EditorClassIdentifier:
muzzle: {fileID: 0}
muzzle: {fileID: 4811884742789439147}
fireballPrefab: {fileID: 1947871717301538, guid: 10813082aa17ea94f9eb5edcc37ac632,
type: 3}
fireRate: 6

1453
Assets/AI/Demon/Waypoints.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/AI/Demon/Waypoints.prefab.meta Normal file
View File

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

267
Assets/AI/FSM/FSM_Demon.asset
View File

@@ -112,7 +112,7 @@ MonoBehaviour:
selectedTrue: 0
selectedFalse: 0
cooldownKey: Turret
cooldownTime: 75
cooldownTime: 60
availableAtStart: 1
enableDebug: 1
--- !u!114 &-7880340678925941764
@@ -164,11 +164,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -335
y: 125
x: -555
y: 150
width: 150
height: 62
positionRect: {x: -335, y: 125}
positionRect: {x: -555, y: 150}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 1, a: 1}
@@ -195,14 +195,14 @@ MonoBehaviour:
parentState: {fileID: -6568372008305276654}
trueRect:
serializedVersion: 2
x: -185
y: 155
x: -405
y: 180
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -185
y: 165
x: -405
y: 190
width: 10
height: 10
selectedTrue: 0
@@ -297,11 +297,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -300
y: 270
x: -520
y: 290
width: 150
height: 106
positionRect: {x: -300, y: 270}
positionRect: {x: -520, y: 290}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -328,14 +328,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: -150
y: 300
x: -370
y: 320
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -150
y: 310
x: -370
y: 330
width: 10
height: 10
selectedTrue: 0
@@ -356,14 +356,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: -150
y: 322
x: -370
y: 342
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -150
y: 332
x: -370
y: 352
width: 10
height: 10
selectedTrue: 0
@@ -392,14 +392,14 @@ MonoBehaviour:
parentState: {fileID: -6144582714324757854}
trueRect:
serializedVersion: 2
x: -150
y: 344
x: -370
y: 364
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -150
y: 354
x: -370
y: 374
width: 10
height: 10
selectedTrue: 0
@@ -550,11 +550,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -40
y: 130
x: -265
y: 155
width: 150
height: 62
positionRect: {x: -40, y: 130}
positionRect: {x: -265, y: 155}
rectWidth: 150
editingName: 1
nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1}
@@ -573,14 +573,14 @@ MonoBehaviour:
parentState: {fileID: -3177478727897100882}
trueRect:
serializedVersion: 2
x: 110
y: 160
x: -115
y: 185
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 110
y: 170
x: -115
y: 195
width: 10
height: 10
selectedTrue: 0
@@ -619,11 +619,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 230
y: 90
x: 0
y: 115
width: 150
height: 62
positionRect: {x: 230, y: 90}
positionRect: {x: 0, y: 115}
rectWidth: 150
editingName: 1
nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1}
@@ -646,14 +646,14 @@ MonoBehaviour:
parentState: {fileID: -2904979146780567904}
trueRect:
serializedVersion: 2
x: 220
y: 120
x: -10
y: 145
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 380
y: 130
x: 150
y: 155
width: 10
height: 10
selectedTrue: 0
@@ -742,7 +742,8 @@ MonoBehaviour:
parentFSM: {fileID: 11400000}
executionType: -1
editingName: 0
crystalPrefab: {fileID: 115880, guid: b5eabfbed738a224284015c33b62e54b, type: 3}
crystalPrefab: {fileID: 4665557765384928022, guid: 0d20e89d7557c3b41b7ef0e6be87e319,
type: 3}
minSpawnDistance: 10
maxSpawnDistance: 20
obstacleCheckRadius: 1
@@ -790,11 +791,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -40
y: 80
x: -265
y: 105
width: 150
height: 30
positionRect: {x: -40, y: 80}
positionRect: {x: -265, y: 105}
rectWidth: 150
editingName: 0
nodeColor: {r: 0, g: 1, b: 0, a: 1}
@@ -840,7 +841,7 @@ MonoBehaviour:
executionType: 1
editingName: 0
debugMode: 0
patrolSpeed: 1
patrolSpeed: 2
patrolInStrafe: 0
updateRotationInStrafe: 1
--- !u!114 &-312774025800194259
@@ -866,11 +867,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: -225
y: 530
x: -445
y: 550
width: 150
height: 150
positionRect: {x: -225, y: 530}
positionRect: {x: -445, y: 550}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1}
@@ -897,14 +898,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: -75
y: 560
x: -295
y: 580
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -75
y: 570
x: -295
y: 590
width: 10
height: 10
selectedTrue: 0
@@ -929,14 +930,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: -75
y: 582
x: -295
y: 602
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -75
y: 592
x: -295
y: 612
width: 10
height: 10
selectedTrue: 0
@@ -969,14 +970,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: -235
y: 604
x: -455
y: 624
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -75
y: 614
x: -295
y: 634
width: 10
height: 10
selectedTrue: 0
@@ -1005,14 +1006,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: -75
y: 626
x: -295
y: 646
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -75
y: 636
x: -295
y: 656
width: 10
height: 10
selectedTrue: 0
@@ -1037,14 +1038,14 @@ MonoBehaviour:
parentState: {fileID: -312774025800194259}
trueRect:
serializedVersion: 2
x: -75
y: 648
x: -295
y: 668
width: 10
height: 10
falseRect:
serializedVersion: 2
x: -75
y: 658
x: -295
y: 678
width: 10
height: 10
selectedTrue: 0
@@ -1091,7 +1092,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3}
m_Name: FSM_Demon
m_EditorClassIdentifier:
selectedNode: {fileID: 2986668563461644515}
selectedNode: {fileID: 4162026404432437805}
wantConnection: 0
connectionNode: {fileID: 0}
showProperties: 1
@@ -1108,7 +1109,7 @@ MonoBehaviour:
- {fileID: 9112689765763526057}
- {fileID: 766956384951898899}
- {fileID: 4162026404432437805}
panOffset: {x: -600, y: -5}
panOffset: {x: -975, y: 90}
overNode: 0
actions:
- {fileID: 0}
@@ -1193,11 +1194,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 745
y: 760
x: 515
y: 780
width: 150
height: 62
positionRect: {x: 745, y: 760}
positionRect: {x: 515, y: 780}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1216,14 +1217,14 @@ MonoBehaviour:
parentState: {fileID: 762670965814380212}
trueRect:
serializedVersion: 2
x: 735
y: 790
x: 505
y: 810
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 895
y: 800
x: 665
y: 820
width: 10
height: 10
selectedTrue: 0
@@ -1263,11 +1264,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 810
y: 220
x: 580
y: 230
width: 150
height: 62
positionRect: {x: 810, y: 220}
positionRect: {x: 580, y: 230}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1282,18 +1283,18 @@ MonoBehaviour:
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 1
transitionDelay: 0.5
parentState: {fileID: 766956384951898899}
trueRect:
serializedVersion: 2
x: 800
y: 250
x: 570
y: 260
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 960
y: 260
x: 730
y: 270
width: 10
height: 10
selectedTrue: 0
@@ -1412,11 +1413,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 535
y: 760
x: 305
y: 780
width: 150
height: 62
positionRect: {x: 535, y: 760}
positionRect: {x: 305, y: 780}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1435,14 +1436,14 @@ MonoBehaviour:
parentState: {fileID: 2691300596403639167}
trueRect:
serializedVersion: 2
x: 525
y: 790
x: 295
y: 810
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 685
y: 800
x: 455
y: 820
width: 10
height: 10
selectedTrue: 0
@@ -1482,11 +1483,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 280
y: 480
x: 50
y: 500
width: 150
height: 150
positionRect: {x: 280, y: 480}
positionRect: {x: 50, y: 500}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 0, b: 0, a: 1}
@@ -1509,14 +1510,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 270
y: 510
x: 40
y: 530
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 430
y: 520
x: 200
y: 540
width: 10
height: 10
selectedTrue: 0
@@ -1541,14 +1542,14 @@ MonoBehaviour:
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 270
y: 532
x: 40
y: 552
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 430
y: 542
x: 200
y: 562
width: 10
height: 10
selectedTrue: 0
@@ -1573,18 +1574,18 @@ MonoBehaviour:
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 0
transitionDelay: 0.5
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 430
y: 554
x: 200
y: 574
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 430
y: 564
x: 200
y: 584
width: 10
height: 10
selectedTrue: 0
@@ -1609,18 +1610,18 @@ MonoBehaviour:
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 0
transitionDelay: 0.5
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 430
y: 576
x: 200
y: 596
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 430
y: 586
x: 200
y: 606
width: 10
height: 10
selectedTrue: 0
@@ -1645,18 +1646,18 @@ MonoBehaviour:
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 0
transitionDelay: 0.5
parentState: {fileID: 2986668563461644515}
trueRect:
serializedVersion: 2
x: 430
y: 598
x: 200
y: 618
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 430
y: 608
x: 200
y: 628
width: 10
height: 10
selectedTrue: 0
@@ -1702,7 +1703,7 @@ MonoBehaviour:
selectedTrue: 0
selectedFalse: 0
cooldownKey: Meteor
cooldownTime: 100
cooldownTime: 80
availableAtStart: 1
enableDebug: 1
--- !u!114 &4031404829621142413
@@ -1753,14 +1754,14 @@ MonoBehaviour:
canEditName: 1
canEditColor: 1
isOpen: 0
isSelected: 0
isSelected: 1
nodeRect:
serializedVersion: 2
x: 805
y: 425
x: 575
y: 445
width: 150
height: 30
positionRect: {x: 805, y: 425}
positionRect: {x: 575, y: 445}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1775,18 +1776,18 @@ MonoBehaviour:
muteTrue: 0
muteFalse: 0
transitionType: 0
transitionDelay: 1
transitionDelay: 0.5
parentState: {fileID: 4162026404432437805}
trueRect:
serializedVersion: 2
x: 880
y: 440
x: 650
y: 460
width: 0
height: 0
falseRect:
serializedVersion: 2
x: 880
y: 440
x: 650
y: 460
width: 0
height: 0
selectedTrue: 0
@@ -1908,7 +1909,7 @@ MonoBehaviour:
selectedTrue: 0
selectedFalse: 0
cooldownKey: Shield
cooldownTime: 75
cooldownTime: 60
availableAtStart: 1
enableDebug: 1
--- !u!114 &8860036500635384459
@@ -1952,11 +1953,11 @@ MonoBehaviour:
isSelected: 0
nodeRect:
serializedVersion: 2
x: 815
y: 65
x: 580
y: 95
width: 150
height: 62
positionRect: {x: 815, y: 65}
positionRect: {x: 580, y: 95}
rectWidth: 150
editingName: 1
nodeColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1975,14 +1976,14 @@ MonoBehaviour:
parentState: {fileID: 9112689765763526057}
trueRect:
serializedVersion: 2
x: 805
y: 95
x: 570
y: 125
width: 10
height: 10
falseRect:
serializedVersion: 2
x: 965
y: 105
x: 730
y: 135
width: 10
height: 10
selectedTrue: 0

92
Assets/Scenes/Fight_Arena/Fight_Arena.unity
View File

@@ -14533,6 +14533,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
type: 3}
propertyPath: _waypointArea
value:
objectReference: {fileID: 1625180723}
- target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
type: 3}
propertyPath: _maxAttackCount
@@ -14546,7 +14551,7 @@ PrefabInstance:
- target: {fileID: 1481547778589526557, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
type: 3}
propertyPath: selectedToolbar
value: 9
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1564533674011589205, guid: fe3f8cbdaa5d03147a0de1c74712d32b,
type: 3}
@@ -19424,9 +19429,7 @@ MonoBehaviour:
m_sunLight: {fileID: 1976683114}
m_moonLight: {fileID: 0}
WeatherPresent: 0
WeatherSystem: {fileID: 0}
m_sunLightExists: 1
m_moonLightExists: 0
--- !u!4 &1013064392
Transform:
m_ObjectHideFlags: 10
@@ -22490,6 +22493,86 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c699340440c77a7498daa58fdc99bfd3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1625180722
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2994866758308254357, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_Name
value: Waypoints
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalPosition.x
value: -25.29813
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalPosition.y
value: 40.63
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalPosition.z
value: -119.17691
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8440224098297817926, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50edfccd260e3a74daeaf1c0294101fd, type: 3}
--- !u!114 &1625180723 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3880242732711742048, guid: 50edfccd260e3a74daeaf1c0294101fd,
type: 3}
m_PrefabInstance: {fileID: 1625180722}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 38a6efba93686334cbc6b7186c9acee3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1639919903 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4373936794591310672, guid: fbfa4fe7080216843b09436e3f6bacfa,
@@ -22917,8 +23000,6 @@ MonoBehaviour:
x: 250
y: 250
z: 250
m_allFloatingPointFixMembers: []
m_allWorldSpaceParticleSystems: []
m_originTargetTileX: 0
m_originTargetTileZ: 0
m_terrainUnloadMemoryTreshold: 4294967296
@@ -40586,3 +40667,4 @@ SceneRoots:
- {fileID: 289966095}
- {fileID: 861395855}
- {fileID: 1751752836}
- {fileID: 1625180722}