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
09287cb2
Commit
09287cb2
authored
Mar 30, 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
9e758973
f9ebabbd
Changes
103
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
103 changed files
with
20909 additions
and
11026 deletions
+20909
-11026
Assets/_Game/Animations/Player.meta
Assets/_Game/Animations/Player.meta
+8
-0
Assets/_Game/Animations/Player/Player Attacks.meta
Assets/_Game/Animations/Player/Player Attacks.meta
+8
-0
Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller
...me/Animations/Player/Player Attacks/FireAttack.controller
+72
-0
Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller.meta
...imations/Player/Player Attacks/FireAttack.controller.meta
+8
-0
Assets/_Game/Animations/Player/Player Attacks/Player FireAttack.anim
...e/Animations/Player/Player Attacks/Player FireAttack.anim
+11
-8
Assets/_Game/Animations/Player/Player Attacks/Player FireAttack.anim.meta
...mations/Player/Player Attacks/Player FireAttack.anim.meta
+1
-1
Assets/_Game/Animations/Player/Player Attacks/Player WaterAttack.anim
.../Animations/Player/Player Attacks/Player WaterAttack.anim
+11
-8
Assets/_Game/Animations/Player/Player Attacks/Player WaterAttack.anim.meta
...ations/Player/Player Attacks/Player WaterAttack.anim.meta
+1
-1
Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller
...e/Animations/Player/Player Attacks/WaterAttack.controller
+72
-0
Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller.meta
...mations/Player/Player Attacks/WaterAttack.controller.meta
+8
-0
Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
...Game/Data/Player Data/Movement Data/Movement States.asset
+14
-14
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png
...aphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png
+3
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png.meta
...s/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png
...aphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png
+3
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png.meta
...s/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png
...aphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png
+3
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png.meta
...s/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack1.png
...me/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack1.png
+3
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack1.png.meta
...aphics/Sprite/Enemies/Enemy Attacks/Waterattack1.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack2.png
...me/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack2.png
+3
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack2.png.meta
...aphics/Sprite/Enemies/Enemy Attacks/Waterattack2.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack3.png
...me/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack3.png
+3
-0
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/Waterattack3.png.meta
...aphics/Sprite/Enemies/Enemy Attacks/Waterattack3.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Fly.anim
..._Game/Graphics/Sprite/Player Animation/Character_Fly.anim
+53
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Fly.anim.meta
.../Graphics/Sprite/Player Animation/Character_Fly.anim.meta
+8
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Idle.anim
...Game/Graphics/Sprite/Player Animation/Character_Idle.anim
+53
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Idle.anim.meta
...Graphics/Sprite/Player Animation/Character_Idle.anim.meta
+8
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Jump.anim
...Game/Graphics/Sprite/Player Animation/Character_Jump.anim
+53
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Jump.anim.meta
...Graphics/Sprite/Player Animation/Character_Jump.anim.meta
+8
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Run.anim
..._Game/Graphics/Sprite/Player Animation/Character_Run.anim
+53
-0
Assets/_Game/Graphics/Sprite/Player Animation/Character_Run.anim.meta
.../Graphics/Sprite/Player Animation/Character_Run.anim.meta
+8
-0
Assets/_Game/Graphics/Sprite/Player.meta
Assets/_Game/Graphics/Sprite/Player.meta
+8
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Idle_Frame.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Idle_Frame.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Idle_Frame.png.meta
.../_Game/Graphics/Sprite/Player/GameDev_Idle_Frame.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Spitting1.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Spitting1.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Spitting1.png.meta
...s/_Game/Graphics/Sprite/Player/GameDev_Spitting1.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow1.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow1.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow1.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow1.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow2.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow2.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow2.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow2.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow3.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow3.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow3.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow3.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow4.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow4.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow4.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow4.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow5.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow5.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow5.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow5.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow6.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow6.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow6.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow6.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow7.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow7.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow7.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow7.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow8.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow8.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow8.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow8.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow9.png
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow9.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_Swallow9.png.meta
...ts/_Game/Graphics/Sprite/Player/GameDev_Swallow9.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting2.png
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting2.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting2.png.meta
...s/_Game/Graphics/Sprite/Player/GameDev_spitting2.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting3.png
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting3.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting3.png.meta
...s/_Game/Graphics/Sprite/Player/GameDev_spitting3.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting4.png
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting4.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting4.png.meta
...s/_Game/Graphics/Sprite/Player/GameDev_spitting4.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting5.png
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting5.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/GameDev_spitting5.png.meta
...s/_Game/Graphics/Sprite/Player/GameDev_spitting5.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY1.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY1.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY1.png.meta
..._Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY1.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY2.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY2.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY2.png.meta
..._Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY2.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY3.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY3.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY3.png.meta
..._Game/Graphics/Sprite/Player/Gamedev_kirby2_FLY3.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk1.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk1.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk1.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk1.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk2.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk2.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk2.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk2.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk3.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk3.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk3.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk3.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk4.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk4.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk4.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk4.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk5.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk5.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk5.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk5.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk6.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk6.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk6.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk6.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk7.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk7.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk7.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk7.png.meta
+99
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk8.png
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk8.png
+3
-0
Assets/_Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk8.png.meta
...Game/Graphics/Sprite/Player/Gamedev_kirby2_Walk8.png.meta
+99
-0
Assets/_Game/Prefabs/Elemental Attacks/FireAttack.prefab
Assets/_Game/Prefabs/Elemental Attacks/FireAttack.prefab
+24
-4
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
+41
-31
Assets/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab
Assets/_Game/Prefabs/Enemy Attacks/EnemyFireAttack.prefab
+2
-2
Assets/_Game/Prefabs/HUD.prefab
Assets/_Game/Prefabs/HUD.prefab
+979
-383
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
+29
-0
Assets/_Game/Prefabs/Level_Elements/Water.prefab
Assets/_Game/Prefabs/Level_Elements/Water.prefab
+27
-0
Assets/_Game/Scenes/MainLevel.unity
Assets/_Game/Scenes/MainLevel.unity
+3287
-1721
Assets/_Game/Scenes/Max-Level.unity
Assets/_Game/Scenes/Max-Level.unity
+12625
-8798
Assets/_Game/Scenes/Max-Level.unity.meta
Assets/_Game/Scenes/Max-Level.unity.meta
+1
-1
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
Assets/_Game/Scenes/Pick_Up_Test_Scene.unity
+71
-2
Assets/_Game/Scripts/Elements/InteractionObject.cs
Assets/_Game/Scripts/Elements/InteractionObject.cs
+3
-3
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs
+2
-4
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
+6
-4
Assets/_Game/Scripts/Level Hazards/MovingPlattform.cs
Assets/_Game/Scripts/Level Hazards/MovingPlattform.cs
+9
-7
Assets/_Game/Scripts/Level Hazards/SliderObject.cs
Assets/_Game/Scripts/Level Hazards/SliderObject.cs
+2
-2
Assets/_Game/Scripts/Player/MovementController.cs
Assets/_Game/Scripts/Player/MovementController.cs
+2
-0
Assets/_Game/Scripts/Player/PlayerAnimation.cs
Assets/_Game/Scripts/Player/PlayerAnimation.cs
+55
-31
Assets/_Game/Scripts/Player/PlayerAttacks/Fire/Player_FireProjectile.cs
...cripts/Player/PlayerAttacks/Fire/Player_FireProjectile.cs
+13
-1
ProjectSettings/TagManager.asset
ProjectSettings/TagManager.asset
+1
-0
No files found.
Assets/_Game/Animations/Player.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 921db1157e28c3f41af62db986551851
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Animations/Player/Player Attacks.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 6fdbfb79a12729b47a89b47d9b73fa30
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller
0 → 100644
View file @
09287cb2
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
FireAttack
serializedVersion
:
5
m_AnimatorParameters
:
[]
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
1107852839093913212
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1102
&1102194014626289192
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Player FireAttack
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
a33b68292e39fc041a68b9f3e3b47abe
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&1107852839093913212
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102194014626289192
}
m_Position
:
{
x
:
235
,
y
:
65
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102194014626289192
}
Assets/_Game/Animations/Player/Player Attacks/FireAttack.controller.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 1cbe907e97f79644fbed8435ba9c0931
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/
Graphics/Sprite/Player Animation/Player_Fall_Test
.anim
→
Assets/_Game/
Animations/Player/Player Attacks/Player FireAttack
.anim
View file @
09287cb2
...
...
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Player
_Fall_Test
m_Name
:
Player
FireAttack
serializedVersion
:
6
m_Legacy
:
0
m_Compressed
:
0
...
...
@@ -20,14 +20,16 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
21300000
,
guid
:
e2976d09b53264ffbbb9210a1ae1dcc0
,
type
:
3
}
-
time
:
0.5
value
:
{
fileID
:
21300000
,
guid
:
598fb1767626f42e992bb9c2769d86ea
,
type
:
3
}
value
:
{
fileID
:
21300000
,
guid
:
0161ef6db3b4e8e42875f5a25535bd75
,
type
:
3
}
-
time
:
0.1
value
:
{
fileID
:
21300000
,
guid
:
39b655e3ac188eb45b030b7e81d5bd4b
,
type
:
3
}
-
time
:
0.2
value
:
{
fileID
:
21300000
,
guid
:
112f864ed0a24b047840780d00ce5ef1
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
212
script
:
{
fileID
:
0
}
m_SampleRate
:
2
m_SampleRate
:
10
m_WrapMode
:
0
m_Bounds
:
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -42,14 +44,15 @@ AnimationClip:
customType
:
23
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
21300000
,
guid
:
e2976d09b53264ffbbb9210a1ae1dcc0
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
598fb1767626f42e992bb9c2769d86ea
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
0161ef6db3b4e8e42875f5a25535bd75
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
39b655e3ac188eb45b030b7e81d5bd4b
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
112f864ed0a24b047840780d00ce5ef1
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
m_AdditiveReferencePoseTime
:
0
m_StartTime
:
0
m_StopTime
:
1
m_StopTime
:
0.3
m_OrientationOffsetY
:
0
m_Level
:
0
m_CycleOffset
:
0
...
...
Assets/_Game/
Graphics/Sprite/Player Animation/Player_Fall_Test
.anim.meta
→
Assets/_Game/
Animations/Player/Player Attacks/Player FireAttack
.anim.meta
View file @
09287cb2
fileFormatVersion: 2
guid:
b1e6f956e15cf4eeeb1ebc32e9af4879
guid:
a33b68292e39fc041a68b9f3e3b47abe
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
...
...
Assets/_Game/
Graphics/Sprite/Player Animation/Player_Jump_Test
.anim
→
Assets/_Game/
Animations/Player/Player Attacks/Player WaterAttack
.anim
View file @
09287cb2
...
...
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Player
_Jump_Test
m_Name
:
Player
WaterAttack
serializedVersion
:
6
m_Legacy
:
0
m_Compressed
:
0
...
...
@@ -20,14 +20,16 @@ AnimationClip:
m_PPtrCurves
:
-
curve
:
-
time
:
0
value
:
{
fileID
:
21300000
,
guid
:
e2976d09b53264ffbbb9210a1ae1dcc0
,
type
:
3
}
-
time
:
0.5
value
:
{
fileID
:
21300000
,
guid
:
598fb1767626f42e992bb9c2769d86ea
,
type
:
3
}
value
:
{
fileID
:
21300000
,
guid
:
dc92df69ab762f6429dbc7390caa5856
,
type
:
3
}
-
time
:
0.11111111
value
:
{
fileID
:
21300000
,
guid
:
03343fe9c932ad146b875ae02df25c8b
,
type
:
3
}
-
time
:
0.22222222
value
:
{
fileID
:
21300000
,
guid
:
e821c22ca988aef4594235a381c621b3
,
type
:
3
}
attribute
:
m_Sprite
path
:
classID
:
212
script
:
{
fileID
:
0
}
m_SampleRate
:
2
m_SampleRate
:
9
m_WrapMode
:
0
m_Bounds
:
m_Center
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -42,14 +44,15 @@ AnimationClip:
customType
:
23
isPPtrCurve
:
1
pptrCurveMapping
:
-
{
fileID
:
21300000
,
guid
:
e2976d09b53264ffbbb9210a1ae1dcc0
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
598fb1767626f42e992bb9c2769d86ea
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
dc92df69ab762f6429dbc7390caa5856
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
03343fe9c932ad146b875ae02df25c8b
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
e821c22ca988aef4594235a381c621b3
,
type
:
3
}
m_AnimationClipSettings
:
serializedVersion
:
2
m_AdditiveReferencePoseClip
:
{
fileID
:
0
}
m_AdditiveReferencePoseTime
:
0
m_StartTime
:
0
m_StopTime
:
1
m_StopTime
:
0.33333334
m_OrientationOffsetY
:
0
m_Level
:
0
m_CycleOffset
:
0
...
...
Assets/_Game/
Graphics/Sprite/Player Animation/Player_Jump_Test
.anim.meta
→
Assets/_Game/
Animations/Player/Player Attacks/Player WaterAttack
.anim.meta
View file @
09287cb2
fileFormatVersion: 2
guid: 5
c579b168d0eb42c493f5226b501d78c
guid: 5
58c7d11a418f254cb60a3beb85fc3e3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
...
...
Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller
0 → 100644
View file @
09287cb2
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!91
&9100000
AnimatorController
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
WaterAttack
serializedVersion
:
5
m_AnimatorParameters
:
[]
m_AnimatorLayers
:
-
serializedVersion
:
5
m_Name
:
Base Layer
m_StateMachine
:
{
fileID
:
1107446294595744916
}
m_Mask
:
{
fileID
:
0
}
m_Motions
:
[]
m_Behaviours
:
[]
m_BlendingMode
:
0
m_SyncedLayerIndex
:
-1
m_DefaultWeight
:
0
m_IKPass
:
0
m_SyncedLayerAffectsTiming
:
0
m_Controller
:
{
fileID
:
9100000
}
---
!u!1102
&1102565034964050300
AnimatorState
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Player WaterAttack
m_Speed
:
1
m_CycleOffset
:
0
m_Transitions
:
[]
m_StateMachineBehaviours
:
[]
m_Position
:
{
x
:
50
,
y
:
50
,
z
:
0
}
m_IKOnFeet
:
0
m_WriteDefaultValues
:
1
m_Mirror
:
0
m_SpeedParameterActive
:
0
m_MirrorParameterActive
:
0
m_CycleOffsetParameterActive
:
0
m_TimeParameterActive
:
0
m_Motion
:
{
fileID
:
7400000
,
guid
:
558c7d11a418f254cb60a3beb85fc3e3
,
type
:
2
}
m_Tag
:
m_SpeedParameter
:
m_MirrorParameter
:
m_CycleOffsetParameter
:
m_TimeParameter
:
---
!u!1107
&1107446294595744916
AnimatorStateMachine
:
serializedVersion
:
5
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_Name
:
Base Layer
m_ChildStates
:
-
serializedVersion
:
1
m_State
:
{
fileID
:
1102565034964050300
}
m_Position
:
{
x
:
288
,
y
:
108
,
z
:
0
}
m_ChildStateMachines
:
[]
m_AnyStateTransitions
:
[]
m_EntryTransitions
:
[]
m_StateMachineTransitions
:
{}
m_StateMachineBehaviours
:
[]
m_AnyStatePosition
:
{
x
:
50
,
y
:
20
,
z
:
0
}
m_EntryPosition
:
{
x
:
50
,
y
:
120
,
z
:
0
}
m_ExitPosition
:
{
x
:
800
,
y
:
120
,
z
:
0
}
m_ParentStateMachinePosition
:
{
x
:
800
,
y
:
20
,
z
:
0
}
m_DefaultState
:
{
fileID
:
1102565034964050300
}
Assets/_Game/Animations/Player/Player Attacks/WaterAttack.controller.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 58870b5662ee7614dafb40c42a55cdd5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
View file @
09287cb2
...
...
@@ -19,41 +19,41 @@ MonoBehaviour:
canSwim
:
1
moveSpeed
:
30
maxJumpCount
:
5
mass
:
0.
1
gravity
:
0.5
mass
:
1
gravity
:
3
earthMoveState
:
jumpForce
:
10
0
jumpForce
:
10
smoothing
:
0.03
airControl
:
1
canSwim
:
0
moveSpeed
:
15
maxJumpCount
:
1
mass
:
6
0
gravity
:
3
maxJumpCount
:
0
mass
:
1
0
gravity
:
5
fireMoveState
:
jumpForce
:
15
smoothing
:
0.03
airControl
:
1
canSwim
:
1
moveSpeed
:
2
0
maxJumpCount
:
2
moveSpeed
:
3
0
maxJumpCount
:
0
mass
:
1
gravity
:
3
waterMoveState
:
jumpForce
:
1
0
jumpForce
:
1
5
smoothing
:
0.03
airControl
:
1
canSwim
:
1
moveSpeed
:
20
maxJumpCount
:
1
mass
:
1
gravity
:
3
maxJumpCount
:
0
mass
:
1
.5
gravity
:
5
defaultMoveState
:
jumpForce
:
15
smoothing
:
0.03
airControl
:
1
canSwim
:
1
moveSpeed
:
30
maxJumpCount
:
1
maxJumpCount
:
0
mass
:
1
gravity
:
3
gravity
:
5
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png
0 → 100644
LFS
View file @
09287cb2
130 Bytes
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack1.png.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 0161ef6db3b4e8e42875f5a25535bd75
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: 1024
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: fd43232caea90fd4ea2fc6f95b69256f
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png
0 → 100644
LFS
View file @
09287cb2
130 Bytes
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack2.png.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 39b655e3ac188eb45b030b7e81d5bd4b
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: 1024
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: b0f54c007f6ca96419994686f1e42fdf
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png
0 → 100644
LFS
View file @
09287cb2
130 Bytes
Assets/_Game/Graphics/Sprite/Enemies/Enemy Attacks/FireEnemy_attack3.png.meta
0 → 100644
View file @
09287cb2
fileFormatVersion: 2
guid: 112f864ed0a24b047840780d00ce5ef1
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0