julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

testCommit

Browse Source
This commit is contained in:
=
2017-11-22 16:00:56 +01:00
parent 9a2353b01c
commit 3324056634
13 changed files with 279 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/frajul/endlessroll/entities/particles/Firework.java
View File

@ -23,8 +23,8 @@ public class Firework {
public void start() {
randomExplosion(0);
randomExplosion(500);
randomExplosion(700);
randomExplosion(100);
randomExplosion(300);
}
private void randomExplosion(float delay) {

3
app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java
View File

@ -16,7 +16,8 @@ public class TestScreenScene extends Scene {
public TestScreenScene(TexturePack texturePack, ParticleSystem particleSystem) {
super(texturePack, particleSystem);
terrain.createEndless(World.ICY_MOUNTAINS, -1.0f);
new ParticleSource(new Vector(0, -0.5f), particleSystem.testFire).start();
background.changeTexture(World.ICY_MOUNTAINS.getBackgroundTexture());
new ParticleSource(new Vector(0, 0.0f), particleSystem.colorChange).start();
}
}

10
app/src/main/java/de/frajul/endlessroll/main/tutorial/ToolShopTutorial.java
View File

@ -12,11 +12,17 @@ import de.frajul.endlessroll.entities.tools.ToolType;
public class ToolShopTutorial extends Tutorial {
public enum ToolShopTutorialState{
NONE, TO_TOOLSHOP, SELECT_SPRING, BUY_SPRING, EQUIP_SPRING;
}
private List<BreakPoint> atStartBreakPoints = new ArrayList<>();
private List<BreakPoint> afterSpringBoughtBreakPoints = new ArrayList<>();
private boolean firstPartShown;
private ToolShopTutorialState state = ToolShopTutorialState.TO_TOOLSHOP;
public ToolShopTutorial() {
super(-1, -1, new BreakPoint(0, R.string.tutorial_toolshop_welcome, -1),
new BreakPoint(0, R.string.tutorial_toolshop_toolbar,
@ -65,4 +71,8 @@ public class ToolShopTutorial extends Tutorial {
public void setFirstPartShown(boolean firstPartShown) {
this.firstPartShown = firstPartShown;
}
public ToolShopTutorialState getState() {
return state;
}
}

18
app/src/main/java/de/frajul/endlessroll/views/GoalMessage.java
View File

@ -1,6 +1,7 @@
package de.frajul.endlessroll.views;
import android.graphics.Typeface;
import android.view.KeyEvent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
@ -39,6 +40,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
topBar = new TopBar(gameActivity, Screen.ScreenType.GAME,
layout.findViewById(R.id.goal_message_topbar));
topBar.setShopsEnabled(true);
TextView title = (TextView) layout.findViewById(R.id.goal_message_title);
title.setTypeface(typeface);
restart = new GoalMessageLevelButton(gameActivity, this,
@ -50,7 +52,7 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
toMenu.setOnClickListener(this);
}
public void fadeIn(LevelPack levelPack, Level level) {
public void fadeInWithDelay(LevelPack levelPack, final Level level) {
this.levelPack = levelPack;
topBar.update();
restart.init(R.string.goal_message_restart_format_d, level);
@ -60,7 +62,12 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
nextLevel
.init(R.string.goal_message_next_level_format_d, levelPack.getNextLevel(level));
layout.startAnimation(fadeIn);
layout.postDelayed(new Runnable() {
@Override
public void run() {
layout.startAnimation(fadeIn);
}
}, 500);
}
private void hide() {
@ -71,8 +78,8 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
@Override
public void onClick(View v) {
if (v.equals(toMenu)) {
hide();
game.toLevelsScreen();
hide();
}
}
@ -81,4 +88,9 @@ public class GoalMessage implements GoalMessageLevelButtonOnClickListener, View.
hide();
gameActivity.startGame(levelPack, goalMessageLevelButton.getLevel());
}
public void onKeyBack(){
game.toLevelsScreen();
hide();
}
}