Energy Drawable created + animation for Entity -> AnimatedEntity

A Scene will automatically update all AnimatedEntities
LevelUpBounties no longer grant EP
This commit is contained in:
=
2017-02-20 16:07:12 +01:00
parent 0bad3e064c
commit f252bfd4bd
33 changed files with 295 additions and 199 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/topbar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -40,14 +41,35 @@
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/topbar_levellayout"
android:background="@drawable/star" />
android:background="@drawable/currency_star" />
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:background="@drawable/currency_energy"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/topbar_starcount"
android:layout_toEndOf="@+id/topbar_starcount"
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:id="@+id/topbar_energyview" />
<TextView
android:id="@+id/topbar_starcount"
android:id="@+id/topbar_starcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/topbar_starview"
android:text="100"
android:textColor="#000000"
android:textSize="25sp" />
<TextView
android:id="@+id/topbar_energycount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/topbar_starview"
android:layout_toEndOf="@+id/topbar_energyview"
android:text="100"
android:textColor="#000000"
android:textSize="25sp" />
@ -74,15 +96,6 @@
android:layout_marginRight="5dp"
android:text="Tool-Shop" />
<Button
android:id="@+id/topbar_resetButton"
style="@style/customButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="Reset" />
<TextView
android:id="@+id/topbar_starcount_decrease"
android:layout_width="wrap_content"
@ -94,5 +107,18 @@
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/topbar_starcount" />
<Button
android:id="@+id/topbar_resetButton"
style="@style/customButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Reset"
android:layout_marginLeft="64dp"
android:layout_marginStart="64dp"
android:layout_alignBaseline="@+id/topbar_soundtoggle"
android:layout_alignBottom="@+id/topbar_soundtoggle"
android:layout_toRightOf="@+id/topbar_energycount"
android:layout_toEndOf="@+id/topbar_energycount" />
</RelativeLayout>

View File

@ -76,7 +76,7 @@
android:layout_marginRight="4dp"
android:layout_toLeftOf="@+id/worldbutton_starcount"
android:layout_toStartOf="@+id/worldbutton_starcount"
android:src="@drawable/star"
android:src="@drawable/currency_star"
android:id="@+id/imageView2" />
<ImageView