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
57ad37d7
Commit
57ad37d7
authored
Mar 28, 2019
by
Sebastian Frey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WaterAttack Rotation Lock Z
parent
72d47e84
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
40 deletions
+41
-40
Assets/_Game/Data/Player Data/PlayerState.asset
Assets/_Game/Data/Player Data/PlayerState.asset
+9
-8
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
+1
-1
Assets/_Game/Prefabs/HUD.prefab
Assets/_Game/Prefabs/HUD.prefab
+30
-30
Assets/_Game/Scripts/UI/ElementAnzeige.cs
Assets/_Game/Scripts/UI/ElementAnzeige.cs
+1
-1
No files found.
Assets/_Game/Data/Player Data/PlayerState.asset
View file @
57ad37d7
...
...
@@ -14,12 +14,13 @@ MonoBehaviour:
m_EditorClassIdentifier
:
currentInfusedElement
:
2
currentMoveState
:
jumpForce
:
0
smoothing
:
0
airControl
:
0
moveSpeed
:
0
maxJumpCount
:
0
mass
:
0
gravity
:
0
jumpForce
:
10
smoothing
:
0.03
airControl
:
1
canSwim
:
1
moveSpeed
:
20
maxJumpCount
:
1
mass
:
1
gravity
:
3
movementStates
:
{
fileID
:
11400000
,
guid
:
c757aad6925b37a46b916f609fa9012b
,
type
:
2
}
charges
:
4
charges
:
1
Assets/_Game/Prefabs/Elemental Attacks/WaterAttack.prefab
View file @
57ad37d7
...
...
@@ -102,7 +102,7 @@ Rigidbody2D:
m_Interpolate
:
0
m_SleepingMode
:
1
m_CollisionDetection
:
0
m_Constraints
:
0
m_Constraints
:
4
---
!u!61
&6258883857105394474
BoxCollider2D
:
m_ObjectHideFlags
:
0
...
...
Assets/_Game/Prefabs/HUD.prefab
View file @
57ad37d7
...
...
@@ -252,8 +252,8 @@ GameObject:
-
component
:
{
fileID
:
388107566
}
-
component
:
{
fileID
:
388107565
}
-
component
:
{
fileID
:
388107567
}
- component: {fileID: 4204007187986684745}
-
component
:
{
fileID
:
6822927934576439635
}
-
component
:
{
fileID
:
4204007187986684745
}
m_Layer
:
5
m_Name
:
ElementeBox
m_TagString
:
Untagged
...
...
@@ -364,6 +364,35 @@ MonoBehaviour:
-
{
fileID
:
21300000
,
guid
:
6a321761c965cda4aab16c7a7d29139e
,
type
:
3
}
-
{
fileID
:
21300000
,
guid
:
4c54d0605c46ae344821945472d640d5
,
type
:
3
}
availableCount
:
0
---
!u!114
&6822927934576439635
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
388107563
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
cae13dfa42160034cbe0b3a99bd73368
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
gameEvent
:
{
fileID
:
11400000
,
guid
:
6ec6544f645a9d1458383b111fcaf8b6
,
type
:
2
}
response
:
m_PersistentCalls
:
m_Calls
:
-
m_Target
:
{
fileID
:
388107567
}
m_MethodName
:
GetRemainingCharges
m_Mode
:
1
m_Arguments
:
m_ObjectArgument
:
{
fileID
:
0
}
m_ObjectArgumentAssemblyTypeName
:
UnityEngine.Object, UnityEngine
m_IntArgument
:
0
m_FloatArgument
:
0
m_StringArgument
:
m_BoolArgument
:
0
m_CallState
:
2
m_TypeName
:
UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
---
!u!114
&4204007187986684745
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
@@ -446,35 +475,6 @@ MonoBehaviour:
m_Calls
:
[]
m_TypeName
:
UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &6822927934576439635
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 388107563}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cae13dfa42160034cbe0b3a99bd73368, type: 3}
m_Name:
m_EditorClassIdentifier:
gameEvent: {fileID: 11400000, guid: 6ec6544f645a9d1458383b111fcaf8b6, type: 2}
response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 388107567}
m_MethodName: GetRemainingCharges
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
---
!u!1
&435587858
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/_Game/Scripts/UI/ElementAnzeige.cs
View file @
57ad37d7
...
...
@@ -80,7 +80,7 @@ public class ElementAnzeige : MonoBehaviour
public
void
UpdateLuftAnzeige
()
{
Debug
.
Log
(
"
Wasser
"
);
Debug
.
Log
(
"
Luft
"
);
switch
(
availableCount
)
{
case
5
:
Luft
.
GetComponent
<
Image
>().
sprite
=
FeuerSprites
[
4
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment