Skip to content

Attacks #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qobz1e merged 5 commits into from
Jul 20, 2025
Merged

Attacks #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a797e6
spell cast set up
qobz1e Jul 20, 2025
b137197
bug fix
qobz1e Jul 20, 2025
4a566eb
Spellbook rework
qobz1e Jul 20, 2025
c44228a
Merge remote-tracking branch 'origin/Development' into Attacks
qobz1e Jul 20, 2025
39eef52
fix
qobz1e Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/AirWave.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 307561283863307473}
- component: {fileID: 644934148596909802}
- component: {fileID: 4480075318580160480}
m_Layer: 0
m_Layer: 1
m_Name: AirWave
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/AoePrefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: AoePrefab
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/DamagerAoE.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: DamagerAoE
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/FindNearestPrefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: FindNearestPrefab
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/FireShootPrefab.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: FireShootPrefab
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
22 changes: 19 additions & 3 deletions Assets/Prefabs/Spell Prefabs/Fireball.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 5216078958278152330}
- component: {fileID: 3005419789388633945}
- component: {fileID: 2087480039090388560}
m_Layer: 0
m_Layer: 1
m_Name: Fireball
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -108,7 +108,7 @@ GameObject:
- component: {fileID: 3906005221500195519}
- component: {fileID: 706080531671179681}
- component: {fileID: 4311640980432494145}
m_Layer: 0
m_Layer: 1
m_Name: Particles
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -4941,7 +4941,7 @@ GameObject:
- component: {fileID: 7769202348231302464}
- component: {fileID: 6020114961009783951}
- component: {fileID: 6572537635442245907}
m_Layer: 0
m_Layer: 1
m_Name: Particles (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down Expand Up @@ -9771,6 +9771,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 5216078958278152330}
m_Modifications:
- target: {fileID: 3199283261846579216, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_Layer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4893118513826488098, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: moveWithTransform
value: 1
Expand Down Expand Up @@ -9819,6 +9823,10 @@ PrefabInstance:
propertyPath: m_SortingLayerID
value: -378843305
objectReference: {fileID: 0}
- target: {fileID: 4893118513826488103, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_Layer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6294508012652817957, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_SortingLayer
value: 3
Expand All @@ -9831,6 +9839,10 @@ PrefabInstance:
propertyPath: m_SortingLayerID
value: -378843305
objectReference: {fileID: 0}
- target: {fileID: 6294508012652817959, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_Layer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6294508012652817959, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_IsActive
value: 1
Expand Down Expand Up @@ -9911,6 +9923,10 @@ PrefabInstance:
propertyPath: m_Name
value: CFXR Fire (1)
objectReference: {fileID: 0}
- target: {fileID: 6294508013172393196, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_Layer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7539286505454239565, guid: 043176b6a68be2b43b073aaaa4782c7d, type: 3}
propertyPath: m_Range
value: 8.054173
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/PlayerIllusion.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: PlayerIllusion
m_TagString: Player
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/ProjectilesDestroyingAoE.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
- component: {fileID: 2572317346796893819}
m_Layer: 0
m_Layer: 1
m_Name: ProjectilesDestroyingAoE
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/RoomBurn.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: RoomBurn
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/RoomSlowness.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: RoomSlowness
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/RoomStun.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: RoomStun
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Spell Prefabs/Slowness Cloud.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 43420784170986337}
- component: {fileID: 307561283863307473}
- component: {fileID: 4935320799174898690}
m_Layer: 0
m_Layer: 1
m_Name: Slowness Cloud
m_TagString: Untagged
m_Icon: {fileID: 0}
Expand Down
Loading
Loading