Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
Suck It
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
W
Wintersemester 2018-2019
Unity
Suck It
Commits
5f3e7439
Commit
5f3e7439
authored
Mar 28, 2019
by
Isa
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it
parents
6929daa0
14f055cd
Changes
146
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
146 changed files
with
6685 additions
and
3262 deletions
+6685
-3262
Assets/Prefabs/.gitkeep
Assets/Prefabs/.gitkeep
+0
-0
Assets/_Game/Data/Game Events/Element Game Events/ChargeGameEvent.asset
...ata/Game Events/Element Game Events/ChargeGameEvent.asset
+14
-0
Assets/_Game/Data/Game Events/Element Game Events/ChargeGameEvent.asset.meta
...ame Events/Element Game Events/ChargeGameEvent.asset.meta
+8
-0
Assets/_Game/Data/Player Data/PlayerState.asset
Assets/_Game/Data/Player Data/PlayerState.asset
+2
-7
Assets/_Game/Data/SpriteShapes/GroundProfile.asset
Assets/_Game/Data/SpriteShapes/GroundProfile.asset
+3
-3
Assets/_Game/Graphics/Sprite/GameDev_Background.png
Assets/_Game/Graphics/Sprite/GameDev_Background.png
+3
-0
Assets/_Game/Graphics/Sprite/GameDev_Background.png.meta
Assets/_Game/Graphics/Sprite/GameDev_Background.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Materials.meta
Assets/_Game/Graphics/Sprite/Materials.meta
+8
-0
Assets/_Game/Graphics/Sprite/Materials/GameDev_Background.mat
...ts/_Game/Graphics/Sprite/Materials/GameDev_Background.mat
+36
-0
Assets/_Game/Graphics/Sprite/Materials/GameDev_Background.mat.meta
...ame/Graphics/Sprite/Materials/GameDev_Background.mat.meta
+8
-0
Assets/_Game/Graphics/Sprite/WaterTile3.png
Assets/_Game/Graphics/Sprite/WaterTile3.png
+3
-0
Assets/_Game/Graphics/Sprite/WaterTile3.png.meta
Assets/_Game/Graphics/Sprite/WaterTile3.png.meta
+99
-0
Assets/_Game/Graphics/Tileset/Background.meta
Assets/_Game/Graphics/Tileset/Background.meta
+8
-0
Assets/_Game/Graphics/Tileset/Background/Background.prefab
Assets/_Game/Graphics/Tileset/Background/Background.prefab
+206
-0
Assets/_Game/Graphics/Tileset/Background/Background.prefab.meta
.../_Game/Graphics/Tileset/Background/Background.prefab.meta
+7
-0
Assets/_Game/Graphics/Tileset/Background/GameDev_Background.asset
...Game/Graphics/Tileset/Background/GameDev_Background.asset
+36
-0
Assets/_Game/Graphics/Tileset/Background/GameDev_Background.asset.meta
...Graphics/Tileset/Background/GameDev_Background.asset.meta
+8
-0
Assets/_Game/Prefabs/Elemental Attacks.meta
Assets/_Game/Prefabs/Elemental Attacks.meta
+0
-0
Assets/_Game/Prefabs/Elemental Attacks/FireAttack.prefab
Assets/_Game/Prefabs/Elemental Attacks/FireAttack.prefab
+1
-1
Assets/_Game/Prefabs/Elemental Attacks/FireAttack.prefab.meta
...ts/_Game/Prefabs/Elemental Attacks/FireAttack.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
+1
-1
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab.meta
...s/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elements.meta
Assets/_Game/Prefabs/Elements.meta
+0
-0
Assets/_Game/Prefabs/Elements/AirElement.prefab
Assets/_Game/Prefabs/Elements/AirElement.prefab
+0
-0
Assets/_Game/Prefabs/Elements/AirElement.prefab.meta
Assets/_Game/Prefabs/Elements/AirElement.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elements/Default.prefab
Assets/_Game/Prefabs/Elements/Default.prefab
+0
-0
Assets/_Game/Prefabs/Elements/Default.prefab.meta
Assets/_Game/Prefabs/Elements/Default.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elements/EarthElement.prefab
Assets/_Game/Prefabs/Elements/EarthElement.prefab
+0
-0
Assets/_Game/Prefabs/Elements/EarthElement.prefab.meta
Assets/_Game/Prefabs/Elements/EarthElement.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elements/Element.prefab
Assets/_Game/Prefabs/Elements/Element.prefab
+0
-0
Assets/_Game/Prefabs/Elements/Element.prefab.meta
Assets/_Game/Prefabs/Elements/Element.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elements/FireElement.prefab
Assets/_Game/Prefabs/Elements/FireElement.prefab
+0
-0
Assets/_Game/Prefabs/Elements/FireElement.prefab.meta
Assets/_Game/Prefabs/Elements/FireElement.prefab.meta
+0
-0
Assets/_Game/Prefabs/Elements/WaterElement.prefab
Assets/_Game/Prefabs/Elements/WaterElement.prefab
+0
-0
Assets/_Game/Prefabs/Elements/WaterElement.prefab.meta
Assets/_Game/Prefabs/Elements/WaterElement.prefab.meta
+0
-0
Assets/_Game/Prefabs/Enemies.meta
Assets/_Game/Prefabs/Enemies.meta
+0
-0
Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab
Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab
+0
-0
Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab.meta
Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab.meta
+0
-0
Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab
Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab
+0
-0
Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab.meta
Assets/_Game/Prefabs/Enemies/Feuer-Gegner.prefab.meta
+0
-0
Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab
Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab
+0
-0
Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab.meta
Assets/_Game/Prefabs/Enemies/Wasser-Gegner.prefab.meta
+0
-0
Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab
Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab
+6
-44
Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab.meta
Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab.meta
+0
-0
Assets/_Game/Prefabs/Enemy Attacks.meta
Assets/_Game/Prefabs/Enemy Attacks.meta
+0
-0
Assets/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab
Assets/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab
+0
-0
Assets/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab.meta
...s/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab.meta
+0
-0
Assets/_Game/Prefabs/Enemy Attacks/EnemyWindAttack.prefab
Assets/_Game/Prefabs/Enemy Attacks/EnemyWindAttack.prefab
+0
-0
Assets/_Game/Prefabs/Enemy Attacks/EnemyWindAttack.prefab.meta
...s/_Game/Prefabs/Enemy Attacks/EnemyWindAttack.prefab.meta
+0
-0
Assets/_Game/Prefabs/Level_Elements.meta
Assets/_Game/Prefabs/Level_Elements.meta
+0
-0
Assets/_Game/Prefabs/Level_Elements/Destroyable_Thing.prefab
Assets/_Game/Prefabs/Level_Elements/Destroyable_Thing.prefab
+3
-3
Assets/_Game/Prefabs/Level_Elements/Destroyable_Thing.prefab.meta
...Game/Prefabs/Level_Elements/Destroyable_Thing.prefab.meta
+0
-0
Assets/_Game/Prefabs/Level_Elements/Plattform.prefab
Assets/_Game/Prefabs/Level_Elements/Plattform.prefab
+0
-0
Assets/_Game/Prefabs/Level_Elements/Plattform.prefab.meta
Assets/_Game/Prefabs/Level_Elements/Plattform.prefab.meta
+0
-0
Assets/_Game/Prefabs/Level_Elements/Spikes.prefab
Assets/_Game/Prefabs/Level_Elements/Spikes.prefab
+0
-0
Assets/_Game/Prefabs/Level_Elements/Spikes.prefab.meta
Assets/_Game/Prefabs/Level_Elements/Spikes.prefab.meta
+0
-0
Assets/_Game/Prefabs/Level_Elements/Water.prefab
Assets/_Game/Prefabs/Level_Elements/Water.prefab
+0
-0
Assets/_Game/Prefabs/Level_Elements/Water.prefab.meta
Assets/_Game/Prefabs/Level_Elements/Water.prefab.meta
+0
-0
Assets/_Game/Prefabs/Materials.meta
Assets/_Game/Prefabs/Materials.meta
+8
-0
Assets/_Game/Prefabs/Materials/Bouncy.physicsMaterial2D
Assets/_Game/Prefabs/Materials/Bouncy.physicsMaterial2D
+1
-1
Assets/_Game/Prefabs/Materials/Bouncy.physicsMaterial2D.meta
Assets/_Game/Prefabs/Materials/Bouncy.physicsMaterial2D.meta
+0
-0
Assets/_Game/Prefabs/Materials/Slippery.physicsMaterial2D
Assets/_Game/Prefabs/Materials/Slippery.physicsMaterial2D
+0
-0
Assets/_Game/Prefabs/Materials/Slippery.physicsMaterial2D.meta
...s/_Game/Prefabs/Materials/Slippery.physicsMaterial2D.meta
+0
-0
Assets/_Game/Prefabs/Minimap.prefab
Assets/_Game/Prefabs/Minimap.prefab
+0
-0
Assets/_Game/Prefabs/Minimap.prefab.meta
Assets/_Game/Prefabs/Minimap.prefab.meta
+0
-0
Assets/_Game/Prefabs/PauseMenu.prefab
Assets/_Game/Prefabs/PauseMenu.prefab
+0
-0
Assets/_Game/Prefabs/PauseMenu.prefab.meta
Assets/_Game/Prefabs/PauseMenu.prefab.meta
+0
-0
Assets/_Game/Prefabs/Player Max.meta
Assets/_Game/Prefabs/Player Max.meta
+0
-0
Assets/_Game/Prefabs/Player Max/Player.prefab
Assets/_Game/Prefabs/Player Max/Player.prefab
+0
-0
Assets/_Game/Prefabs/Player Max/Player.prefab.meta
Assets/_Game/Prefabs/Player Max/Player.prefab.meta
+0
-0
Assets/_Game/Prefabs/Player.meta
Assets/_Game/Prefabs/Player.meta
+0
-0
Assets/_Game/Prefabs/Player/Player.prefab
Assets/_Game/Prefabs/Player/Player.prefab
+109
-23
Assets/_Game/Prefabs/Player/Player.prefab.meta
Assets/_Game/Prefabs/Player/Player.prefab.meta
+0
-0
Assets/_Game/Prefabs/SavePoint.meta
Assets/_Game/Prefabs/SavePoint.meta
+0
-0
Assets/_Game/Prefabs/SavePoint/SavePoint.prefab
Assets/_Game/Prefabs/SavePoint/SavePoint.prefab
+0
-0
Assets/_Game/Prefabs/SavePoint/SavePoint.prefab.meta
Assets/_Game/Prefabs/SavePoint/SavePoint.prefab.meta
+0
-0
Assets/_Game/Prefabs/SavePoint/StartPoint.prefab
Assets/_Game/Prefabs/SavePoint/StartPoint.prefab
+0
-0
Assets/_Game/Prefabs/SavePoint/StartPoint.prefab.meta
Assets/_Game/Prefabs/SavePoint/StartPoint.prefab.meta
+0
-0
Assets/_Game/Scenes/MainLevel-Max.unity
Assets/_Game/Scenes/MainLevel-Max.unity
+5
-77
Assets/_Game/Scenes/MainLevel.unity
Assets/_Game/Scenes/MainLevel.unity
+5461
-2962
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
+144
-1
Assets/_Game/Scripts/AI/Fernkämpfer.meta
Assets/_Game/Scripts/AI/Fernkämpfer.meta
+0
-8
Assets/_Game/Scripts/AI/Fernkämpfer/AI_FireProjectile.cs
Assets/_Game/Scripts/AI/Fernkämpfer/AI_FireProjectile.cs
+0
-49
Assets/_Game/Scripts/AI/Nahkämpfer.meta
Assets/_Game/Scripts/AI/Nahkämpfer.meta
+0
-8
Assets/_Game/Scripts/CameraController.cs
Assets/_Game/Scripts/CameraController.cs
+19
-5
Assets/_Game/Scripts/Enemy AI.meta
Assets/_Game/Scripts/Enemy AI.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Air.meta
Assets/_Game/Scripts/Enemy AI/Air.meta
+8
-0
Assets/_Game/Scripts/Enemy AI/Air/AI_WindAttack.cs
Assets/_Game/Scripts/Enemy AI/Air/AI_WindAttack.cs
+3
-9
Assets/_Game/Scripts/Enemy AI/Air/AI_WindAttack.cs.meta
Assets/_Game/Scripts/Enemy AI/Air/AI_WindAttack.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Air/AI_WindProjectile.cs
Assets/_Game/Scripts/Enemy AI/Air/AI_WindProjectile.cs
+12
-5
Assets/_Game/Scripts/Enemy AI/Air/AI_WindProjectile.cs.meta
Assets/_Game/Scripts/Enemy AI/Air/AI_WindProjectile.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Earth.meta
Assets/_Game/Scripts/Enemy AI/Earth.meta
+8
-0
Assets/_Game/Scripts/Enemy AI/Earth/RockAttack.cs
Assets/_Game/Scripts/Enemy AI/Earth/RockAttack.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Earth/RockAttack.cs.meta
Assets/_Game/Scripts/Enemy AI/Earth/RockAttack.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Earth/rockCollider.cs
Assets/_Game/Scripts/Enemy AI/Earth/rockCollider.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Earth/rockCollider.cs.meta
Assets/_Game/Scripts/Enemy AI/Earth/rockCollider.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Fire.meta
Assets/_Game/Scripts/Enemy AI/Fire.meta
+8
-0
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireAttack.cs
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireAttack.cs
+4
-3
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireAttack.cs.meta
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireAttack.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireProjectile.cs
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireProjectile.cs
+34
-0
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireProjectile.cs.meta
Assets/_Game/Scripts/Enemy AI/Fire/AI_FireProjectile.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell.meta
Assets/_Game/Scripts/Enemy AI/Generell.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Core.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_Core.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Core.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_Core.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_DashAttack.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_DashAttack.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_DashAttack.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_DashAttack.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Follows.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_Follows.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Follows.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_Follows.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Patrol.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_Patrol.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Patrol.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_Patrol.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Staggers.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_Staggers.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Staggers.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_Staggers.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Wanders.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_Wanders.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_Wanders.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_Wanders.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/AI_WandersV2.cs
Assets/_Game/Scripts/Enemy AI/Generell/AI_WandersV2.cs
+0
-1
Assets/_Game/Scripts/Enemy AI/Generell/AI_WandersV2.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/AI_WandersV2.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/WeightedAction.cs
Assets/_Game/Scripts/Enemy AI/Generell/WeightedAction.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/WeightedAction.cs.meta
...ts/_Game/Scripts/Enemy AI/Generell/WeightedAction.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs.meta
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs.meta
+0
-0
Assets/_Game/Scripts/Enemy AI/Water.meta
Assets/_Game/Scripts/Enemy AI/Water.meta
+8
-0
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
+0
-0
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs.meta
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs.meta
+0
-0
Assets/_Game/Scripts/Level Hazards.meta
Assets/_Game/Scripts/Level Hazards.meta
+8
-0
Assets/_Game/Scripts/Level Hazards/DestroyObject.cs
Assets/_Game/Scripts/Level Hazards/DestroyObject.cs
+0
-2
Assets/_Game/Scripts/Level Hazards/DestroyObject.cs.meta
Assets/_Game/Scripts/Level Hazards/DestroyObject.cs.meta
+0
-0
Assets/_Game/Scripts/Level Hazards/MovingPlattform.cs
Assets/_Game/Scripts/Level Hazards/MovingPlattform.cs
+0
-0
Assets/_Game/Scripts/Level Hazards/MovingPlattform.cs.meta
Assets/_Game/Scripts/Level Hazards/MovingPlattform.cs.meta
+0
-0
Assets/_Game/Scripts/Level Hazards/SliderObject.cs
Assets/_Game/Scripts/Level Hazards/SliderObject.cs
+4
-4
Assets/_Game/Scripts/Level Hazards/SliderObject.cs.meta
Assets/_Game/Scripts/Level Hazards/SliderObject.cs.meta
+0
-0
Assets/_Game/Scripts/Level Hazards/Spikes.cs
Assets/_Game/Scripts/Level Hazards/Spikes.cs
+0
-0
Assets/_Game/Scripts/Level Hazards/Spikes.cs.meta
Assets/_Game/Scripts/Level Hazards/Spikes.cs.meta
+0
-0
Assets/_Game/Scripts/Player/MovementController.cs
Assets/_Game/Scripts/Player/MovementController.cs
+59
-20
Assets/_Game/Scripts/Player/PlayerAttacks/Fire/PlayerFireAttack.cs
...ame/Scripts/Player/PlayerAttacks/Fire/PlayerFireAttack.cs
+1
-1
Assets/_Game/Scripts/Player/PlayerAttacks/Player_FireAttack.cs
...s/_Game/Scripts/Player/PlayerAttacks/Player_FireAttack.cs
+1
-1
Assets/_Game/Scripts/Player/PlayerAttacks/Player_FireProjectile.cs
...ame/Scripts/Player/PlayerAttacks/Player_FireProjectile.cs
+4
-0
Assets/_Game/Scripts/Player/PlayerAttacks/Water/PlayerWaterAttack.cs
...e/Scripts/Player/PlayerAttacks/Water/PlayerWaterAttack.cs
+22
-3
Assets/_Game/Scripts/Player/PlayerAttacks/Water/PlayerWaterProjectile.cs
...ripts/Player/PlayerAttacks/Water/PlayerWaterProjectile.cs
+9
-5
Assets/_Game/Scripts/Player/PlayerInteract.cs
Assets/_Game/Scripts/Player/PlayerInteract.cs
+64
-4
Assets/_Game/Scripts/Scriptable Object/ChargeGameEvent.cs
Assets/_Game/Scripts/Scriptable Object/ChargeGameEvent.cs
+29
-0
Assets/_Game/Scripts/Scriptable Object/ChargeGameEvent.cs.meta
...s/_Game/Scripts/Scriptable Object/ChargeGameEvent.cs.meta
+11
-0
Assets/_Game/Scripts/Scriptable Object/ChargeGameEventListener.cs
...Game/Scripts/Scriptable Object/ChargeGameEventListener.cs
+27
-0
Assets/_Game/Scripts/Scriptable Object/ChargeGameEventListener.cs.meta
...Scripts/Scriptable Object/ChargeGameEventListener.cs.meta
+11
-0
Assets/_Game/Scripts/Scriptable Object/MovementStates.cs
Assets/_Game/Scripts/Scriptable Object/MovementStates.cs
+5
-2
Assets/_Game/Scripts/Scriptable Object/PlayerState.cs
Assets/_Game/Scripts/Scriptable Object/PlayerState.cs
+38
-9
ProjectSettings/TagManager.asset
ProjectSettings/TagManager.asset
+1
-0
No files found.
Assets/Prefabs/.gitkeep
deleted
100644 → 0
View file @
6929daa0
Assets/_Game/Data/Game Events/Element Game Events/ChargeGameEvent.asset
0 → 100644
View file @
5f3e7439
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
e69f8fd89dc139a49b0d4d154f5497dd
,
type
:
3
}
m_Name
:
ChargeGameEvent
m_EditorClassIdentifier
:
Assets/_Game/Data/Game Events/Element Game Events/ChargeGameEvent.asset.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: 6ec6544f645a9d1458383b111fcaf8b6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Data/Player Data/PlayerState.asset
View file @
5f3e7439
...
...
@@ -12,6 +12,7 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
353b156b7c59b1c45a8767d7500b31fb
,
type
:
3
}
m_Name
:
PlayerState
m_EditorClassIdentifier
:
currentInfusedElement
:
2
currentMoveState
:
jumpForce
:
0
smoothing
:
0
...
...
@@ -21,10 +22,4 @@ MonoBehaviour:
mass
:
0
gravity
:
0
movementStates
:
{
fileID
:
11400000
,
guid
:
c757aad6925b37a46b916f609fa9012b
,
type
:
2
}
currentJumpForce
:
0
currentSmoothing
:
0
currentAirControl
:
0
currentMoveSpeed
:
0
currentMaxJumpCount
:
0
currentMass
:
0
currentGravity
:
0
charges
:
4
Assets/_Game/Data/SpriteShapes/GroundProfile.asset
View file @
5f3e7439
...
...
@@ -22,17 +22,17 @@ MonoBehaviour:
m_End
:
135
m_Order
:
0
m_Sprites
:
-
{
fileID
:
21300000
,
guid
:
e876b7a7d77efce479e91dd5bdd9c80
1
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
ba99f04fad336dc4cae4bc02a82688c
1
,
type
:
3
}
-
m_Start
:
-225
m_End
:
-135
m_Order
:
0
m_Sprites
:
-
{
fileID
:
21300000
,
guid
:
8e00a1a482dd4b246b7304f2b325dc1f
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
ba99f04fad336dc4cae4bc02a82688c1
,
type
:
3
}
-
m_Start
:
-135
m_End
:
-45
m_Order
:
0
m_Sprites
:
-
{
fileID
:
21300000
,
guid
:
7a6e3bcd9bf346243afec76782b04456
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
ba99f04fad336dc4cae4bc02a82688c1
,
type
:
3
}
m_FillTexture
:
{
fileID
:
2800000
,
guid
:
ba99f04fad336dc4cae4bc02a82688c1
,
type
:
3
}
m_CornerSprites
:
-
m_CornerType
:
0
...
...
Assets/_Game/Graphics/Sprite/GameDev_Background.png
0 → 100644
LFS
View file @
5f3e7439
132 Bytes
Assets/_Game/Graphics/Sprite/GameDev_Background.png.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: 837e782eb240f4a41830fe44dbfa7110
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: e3d13a1ddd2f80b41a83c33c0727b153
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/Materials.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: a326ff33c98eb8343ad3df6da46731a5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/Materials/GameDev_Background.mat
0 → 100644
View file @
5f3e7439
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!21
&2100000
Material
:
serializedVersion
:
6
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
GameDev_Background
m_Shader
:
{
fileID
:
10753
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_ShaderKeywords
:
m_LightmapFlags
:
4
m_EnableInstancingVariants
:
0
m_DoubleSidedGI
:
0
m_CustomRenderQueue
:
-1
stringTagMap
:
{}
disabledShaderPasses
:
[]
m_SavedProperties
:
serializedVersion
:
3
m_TexEnvs
:
-
_AlphaTex
:
m_Texture
:
{
fileID
:
0
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
-
_MainTex
:
m_Texture
:
{
fileID
:
2800000
,
guid
:
837e782eb240f4a41830fe44dbfa7110
,
type
:
3
}
m_Scale
:
{
x
:
1
,
y
:
1
}
m_Offset
:
{
x
:
0
,
y
:
0
}
m_Floats
:
-
PixelSnap
:
0
-
_EnableExternalAlpha
:
0
m_Colors
:
-
_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_Flip
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
-
_RendererColor
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
Assets/_Game/Graphics/Sprite/Materials/GameDev_Background.mat.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: aedee42209432d64faee9327aedf3e50
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/WaterTile3.png
0 → 100644
LFS
View file @
5f3e7439
129 Bytes
Assets/_Game/Graphics/Sprite/WaterTile3.png.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: d278cf8078a6f5a488b70072d5d64a25
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Tileset/Background.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: 480e575498b5a174e82f3e0db27b6964
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Tileset/Background/Background.prefab
0 → 100644
View file @
5f3e7439
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1
&2891360567255041165
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
5136541503707554581
}
-
component
:
{
fileID
:
6875765299557186576
}
m_Layer
:
31
m_Name
:
Background
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&5136541503707554581
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2891360567255041165
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
7551666207073675730
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!156049354
&6875765299557186576
Grid
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2891360567255041165
}
m_Enabled
:
1
m_CellSize
:
{
x
:
1
,
y
:
1
,
z
:
0
}
m_CellGap
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_CellLayout
:
0
m_CellSwizzle
:
0
---
!u!1
&5589211589558787711
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
7551666207073675730
}
-
component
:
{
fileID
:
7916089103388079355
}
-
component
:
{
fileID
:
2758787327152533335
}
m_Layer
:
31
m_Name
:
Layer1
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&7551666207073675730
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5589211589558787711
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
5136541503707554581
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!1839735485
&7916089103388079355
Tilemap
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5589211589558787711
}
m_Enabled
:
1
m_Tiles
:
-
first
:
{
x
:
-1
,
y
:
0
,
z
:
0
}
second
:
m_TileIndex
:
0
m_TileSpriteIndex
:
0
m_TileMatrixIndex
:
0
m_TileColorIndex
:
0
m_ObjectToInstantiate
:
{
fileID
:
0
}
m_TileFlags
:
1
m_ColliderType
:
1
m_AnimatedTiles
:
{}
m_TileAssetArray
:
-
m_RefCount
:
1
m_Data
:
{
fileID
:
11400000
,
guid
:
fdd0c2a3d34d7d04086cb3c52fef2ef5
,
type
:
2
}
m_TileSpriteArray
:
-
m_RefCount
:
1
m_Data
:
{
fileID
:
21300000
,
guid
:
837e782eb240f4a41830fe44dbfa7110
,
type
:
3
}
m_TileMatrixArray
:
-
m_RefCount
:
1
m_Data
:
e00
:
1
e01
:
0
e02
:
0
e03
:
0
e10
:
0
e11
:
1
e12
:
0
e13
:
0
e20
:
0
e21
:
0
e22
:
1
e23
:
0
e30
:
0
e31
:
0
e32
:
0
e33
:
1
m_TileColorArray
:
-
m_RefCount
:
1
m_Data
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_AnimationFrameRate
:
1
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_Origin
:
{
x
:
-1
,
y
:
0
,
z
:
0
}
m_Size
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_TileAnchor
:
{
x
:
0.5
,
y
:
0.5
,
z
:
0
}
m_TileOrientation
:
0
m_TileOrientationMatrix
:
e00
:
1
e01
:
0
e02
:
0
e03
:
0
e10
:
0
e11
:
1
e12
:
0
e13
:
0
e20
:
0
e21
:
0
e22
:
1
e23
:
0
e30
:
0
e31
:
0
e32
:
0
e33
:
1
---
!u!483693784
&2758787327152533335
TilemapRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
5589211589558787711
}
m_Enabled
:
0
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
0
m_MotionVectors
:
1
m_LightProbeUsage
:
0
m_ReflectionProbeUsage
:
0
m_RenderingLayerMask
:
1
m_RendererPriority
:
0
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingOrder
:
0
m_ChunkSize
:
{
x
:
32
,
y
:
32
,
z
:
32
}
m_ChunkCullingBounds
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_MaxChunkCount
:
16
m_MaxFrameAge
:
16
m_SortOrder
:
0
m_Mode
:
0
m_DetectChunkCullingBounds
:
0
m_MaskInteraction
:
0
---
!u!114
&114051873986329976
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
12395
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_Name
:
Palette Settings
m_EditorClassIdentifier
:
cellSizing
:
0
Assets/_Game/Graphics/Tileset/Background/Background.prefab.meta
0 → 100644
View file @
5f3e7439
fileFormatVersion: 2
guid: babaf38616658cd40aced5838d755ba7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Tileset/Background/GameDev_Background.asset
0 → 100644
View file @
5f3e7439
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!114
&11400000
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
0
}