Skip to content

Commit

Permalink
Merge pull request #5 from Potestas06/NewVersion/V1.2
Browse files Browse the repository at this point in the history
New version/v1.2
  • Loading branch information
Potestas06 authored May 5, 2023
2 parents d467fca + eb8dadc commit d6579d8
Show file tree
Hide file tree
Showing 42 changed files with 20,437 additions and 799 deletions.
2 changes: 2 additions & 0 deletions Planung/credits.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ Map:
<https://luissn0w.itch.io/your-1st-dungeon?download>
Death boss:
<https://darkpixel-kronovi.itch.io/undead-executioner>
Stone boss
<https://darkpixel-kronovi.itch.io/mecha-golem-free>
68 changes: 34 additions & 34 deletions Primesoft-game/Assets/Scenes/levels/Level8.unity
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 27
value: 28
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -421,7 +421,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 29
value: 30
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -531,7 +531,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_RootOrder
value: 21
value: 22
objectReference: {fileID: 0}
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -654,7 +654,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -707,7 +707,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 16
value: 17
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -996,7 +996,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 1
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -46598,7 +46598,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 15
value: 16
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -46883,7 +46883,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -46997,7 +46997,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -47172,7 +47172,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -47225,7 +47225,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -47344,7 +47344,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8034445489601909682, guid: c2ea995fe5433b24c8443941a0ba2746, type: 3}
propertyPath: m_RootOrder
value: 26
value: 27
objectReference: {fileID: 0}
- target: {fileID: 8034445489601909682, guid: c2ea995fe5433b24c8443941a0ba2746, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -47519,7 +47519,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_RootOrder
value: 19
value: 20
objectReference: {fileID: 0}
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -47581,7 +47581,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -47638,7 +47638,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48208,7 +48208,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 8139342732537972181, guid: 38f09ecf13e055b43b89113d668c7917, type: 3}
propertyPath: m_RootOrder
value: 23
value: 24
objectReference: {fileID: 0}
- target: {fileID: 8139342732537972181, guid: 38f09ecf13e055b43b89113d668c7917, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48269,7 +48269,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 834848544157909723, guid: ec88f29ebbd86414f88b56b81c300558, type: 3}
propertyPath: m_RootOrder
value: 18
value: 19
objectReference: {fileID: 0}
- target: {fileID: 834848544157909723, guid: ec88f29ebbd86414f88b56b81c300558, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48326,7 +48326,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 34
value: 35
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48839,7 +48839,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 32
value: 33
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48896,7 +48896,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 30
value: 31
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48953,7 +48953,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -49063,7 +49063,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_RootOrder
value: 20
value: 21
objectReference: {fileID: 0}
- target: {fileID: 7680439667854826880, guid: 8e7d62ae8eb54594aa9c06c58a1c84e8, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -49137,7 +49137,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7506290857735253628, guid: 2bd691c575acded48a6c5d385db7cc89, type: 3}
propertyPath: m_RootOrder
value: 25
value: 26
objectReference: {fileID: 0}
- target: {fileID: 7506290857735253628, guid: 2bd691c575acded48a6c5d385db7cc89, type: 3}
propertyPath: m_AnchorMax.x
Expand Down Expand Up @@ -49222,7 +49222,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1299619325239721633, guid: 2e6a70102684d8346bfaa9c8dfc44369, type: 3}
propertyPath: m_RootOrder
value: 22
value: 23
objectReference: {fileID: 0}
- target: {fileID: 1299619325239721633, guid: 2e6a70102684d8346bfaa9c8dfc44369, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -49397,7 +49397,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 33
value: 34
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -49450,7 +49450,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -49682,7 +49682,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 31
value: 32
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -49735,7 +49735,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1418629944393793081, guid: 272f5869cf5745e4794c346f87b538c2, type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1418629944393793081, guid: 272f5869cf5745e4794c346f87b538c2, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -50196,7 +50196,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_RootOrder
value: 11
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6376285155966636196, guid: 3eec68705e93c8c40b0cbb7e27052733, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -50257,7 +50257,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 28
value: 29
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -50371,7 +50371,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4722306673088019742, guid: 1d001e4753bd07349957815518431e90, type: 3}
propertyPath: m_RootOrder
value: 17
value: 18
objectReference: {fileID: 0}
- target: {fileID: 4722306673088019742, guid: 1d001e4753bd07349957815518431e90, type: 3}
propertyPath: m_LocalPosition.x
Expand All @@ -50383,7 +50383,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4722306673088019742, guid: 1d001e4753bd07349957815518431e90, type: 3}
propertyPath: m_LocalPosition.z
value: -0.35385126
value: 0.09460057
objectReference: {fileID: 0}
- target: {fileID: 4722306673088019742, guid: 1d001e4753bd07349957815518431e90, type: 3}
propertyPath: m_LocalRotation.w
Expand Down Expand Up @@ -50428,7 +50428,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 35
value: 36
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -50485,7 +50485,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_RootOrder
value: 8
value: 9
objectReference: {fileID: 0}
- target: {fileID: 7132636197179308124, guid: 4225db7d8f0f36a48b03ba6442c18f8d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down
Loading

0 comments on commit d6579d8

Please sign in to comment.