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
73353aa7
Commit
73353aa7
authored
Mar 30, 2019
by
Christopher Benes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Movement Balancing
parent
78a2e214
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
924 additions
and
557 deletions
+924
-557
Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
...Game/Data/Player Data/Movement Data/Movement States.asset
+10
-10
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
+29
-0
Assets/_Game/Scenes/MainLevel.unity
Assets/_Game/Scenes/MainLevel.unity
+884
-546
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
+1
-1
No files found.
Assets/_Game/Data/Player Data/Movement Data/Movement States.asset
View file @
73353aa7
...
...
@@ -19,35 +19,35 @@ MonoBehaviour:
canSwim
:
1
moveSpeed
:
30
maxJumpCount
:
5
mass
:
0.
1
gravity
:
0.5
mass
:
1
gravity
:
3
earthMoveState
:
jumpForce
:
100
jumpForce
:
5
smoothing
:
0.03
airControl
:
1
canSwim
:
0
moveSpeed
:
15
maxJumpCount
:
1
mass
:
6
0
gravity
:
3
mass
:
1
0
gravity
:
5
fireMoveState
:
jumpForce
:
15
smoothing
:
0.03
airControl
:
1
canSwim
:
1
moveSpeed
:
2
0
moveSpeed
:
3
0
maxJumpCount
:
2
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
mass
:
1
.5
gravity
:
5
defaultMoveState
:
jumpForce
:
15
smoothing
:
0.03
...
...
@@ -56,4 +56,4 @@ MonoBehaviour:
moveSpeed
:
30
maxJumpCount
:
1
mass
:
1
gravity
:
3
gravity
:
5
Assets/_Game/Prefabs/Level_Elements/Movable_Thing.prefab
View file @
73353aa7
...
...
@@ -11,6 +11,7 @@ GameObject:
-
component
:
{
fileID
:
8257885254229348828
}
-
component
:
{
fileID
:
3590286897431027205
}
-
component
:
{
fileID
:
4292658995770755931
}
-
component
:
{
fileID
:
1430085425933635565
}
m_Layer
:
0
m_Name
:
GameObject
m_TagString
:
Untagged
...
...
@@ -70,6 +71,34 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
d5c135c3fe901cf4696abeebd2ac1f28
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
---
!u!68
&1430085425933635565
EdgeCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6184296985288555399
}
m_Enabled
:
0
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
1
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
0
}
m_EdgeRadius
:
0.06
m_Points
:
-
{
x
:
-2.1161957
,
y
:
0.3099022
}
-
{
x
:
-0.7733307
,
y
:
2.4853706
}
-
{
x
:
-0.29605103
,
y
:
2.370411
}
-
{
x
:
0.51786804
,
y
:
0.80316544
}
-
{
x
:
1.3764496
,
y
:
1.4242592
}
-
{
x
:
2.2376404
,
y
:
0.024814606
}
-
{
x
:
2.4914093
,
y
:
-1.712017
}
-
{
x
:
0.7708435
,
y
:
-2.3272972
}
-
{
x
:
-2.151291
,
y
:
-2.0854607
}
-
{
x
:
-2.7048187
,
y
:
-1.6505699
}
-
{
x
:
-2.4703522
,
y
:
-0.20281982
}
-
{
x
:
-2.0320587
,
y
:
0.4176941
}
---
!u!1
&6240296448730384320
GameObject
:
m_ObjectHideFlags
:
0
...
...
Assets/_Game/Scenes/MainLevel.unity
View file @
73353aa7
This diff is collapsed.
Click to expand it.
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
View file @
73353aa7
...
...
@@ -30,7 +30,7 @@ public class AI_WaterAttack : WeightedAction
RaycastHit2D
groundInfo
=
Physics2D
.
Raycast
(
groundDetection
.
position
,
Vector3
.
down
,
distance
,
1
<<
LayerMask
.
NameToLayer
(
"Ground"
));
Debug
.
Log
(
groundInfo
.
collider
);
//
Debug.Log(groundInfo.collider);
if
(
groundInfo
.
collider
==
false
)
{
turn
();
...
...
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