Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GDW-SS-18
to-the-surface
Commits
cf47262f
Commit
cf47262f
authored
Sep 28, 2018
by
Christopher Benes
Browse files
Merge branch 'master' into feature/Level
parents
c1097a51
56b73fa7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Scripts/GameManager.cs
View file @
cf47262f
...
...
@@ -19,7 +19,7 @@ public class GameManager : SingletonBehaviour<GameManager> {
public
bool
IsChallengerModeEnabled
{
get
;
set
;
}
private
void
Awake
()
{
IsChallengerModeEnabled
=
tru
e
;
IsChallengerModeEnabled
=
fals
e
;
IsInLevel
=
false
;
HighestLevel
=
1
;
...
...
Assets/_Game/Scripts/LevelSelectController.cs
View file @
cf47262f
...
...
@@ -36,8 +36,13 @@ public class LevelSelectController : MonoBehaviour {
button
.
SetActive
(
false
);
// Deactivates NextPageButton because there isnt' a next page
GameObject
nextPage
=
button
.
transform
.
parent
.
Find
(
"ButtonNextPage"
).
gameObject
;
nextPage
.
SetActive
(
false
);
if
(
button
.
transform
.
parent
.
Find
(
"ButtonNextPage"
)
!=
null
)
{
GameObject
nextPage
=
button
.
transform
.
parent
.
Find
(
"ButtonNextPage"
).
gameObject
;
nextPage
.
SetActive
(
false
);
}
// Next page can't be opened so buttons on it don't have to be changed
if
(
i
%
6
==
0
)
...
...
Assets/_Game/Scripts/TimedToggle.cs
View file @
cf47262f
...
...
@@ -38,6 +38,7 @@ public class TimedToggle : MonoBehaviour, IResetable {
public
void
ResetToLevelBegin
()
{
state
=
isActive
;
time
=
0
;
onStateChange
.
Invoke
(
isActive
);
}
}
Assets/_Game/Sprites/Set01/Concave/grundflaeche_konkav_6_level_1.png.meta
View file @
cf47262f
...
...
@@ -50,7 +50,7 @@ TextureImporter:
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail:
-1
spriteTessellationDetail:
0
textureType: 8
textureShape: 1
singleChannelComponent: 0
...
...
@@ -104,7 +104,7 @@ TextureImporter:
- {x: 71, y: 121}
- {x: 110, y: 128}
bones: []
spriteID:
spriteID:
f80149b14f1be55458997e569d2c62f8
vertices: []
indices:
edges: []
...
...
Assets/_Game/Sprites/Set01/Convex/grundflaeche_rund_4_stufe_1.png.meta
View file @
cf47262f
...
...
@@ -83,7 +83,15 @@ TextureImporter:
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
outline:
- - {x: 74, y: 126}
- {x: 2, y: 98}
- {x: -43, y: 67}
- {x: -92, y: 9}
- {x: -120, y: -59}
- {x: -128, y: -128}
- {x: 128, y: -128}
- {x: 128, y: 128}
physicsShape:
- - {x: -85, y: 21}
- {x: -120, y: -52}
...
...
Write
Preview
Supports
Markdown
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