Energy Drawable created + animation for Entity -> AnimatedEntity

A Scene will automatically update all AnimatedEntities LevelUpBounties no longer grant EP
2017-02-20 16:07:12 +01:00
parent 0bad3e064c
commit f252bfd4bd
33 changed files with 295 additions and 199 deletions
--- a/app/build/intermediates/blame/res/debug/single/drawable.json
+++ b/app/build/intermediates/blame/res/debug/single/drawable.json
@@ -67,6 +67,10 @@
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_unlocked.png",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_unlocked.png"
    },
+    {
+        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy_atlas.png",
+        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy_atlas.png"
+    },
    {
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_springbutton.png",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_springbutton.png"
@@ -135,10 +139,6 @@
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_default_mtrl_shape.xml",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_btn_default_mtrl_shape.xml"
    },
-    {
-        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\star.png",
-        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\star.png"
-    },
    {
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_grass.png",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_grass.png"
@@ -223,10 +223,18 @@
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_sound_off.png",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_sound_off.png"
    },
+    {
+        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy.png",
+        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy.png"
+    },
    {
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_magnetbutton.png",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnetbutton.png"
    },
+    {
+        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star.png",
+        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star.png"
+    },
    {
        "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
        "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_seekbar_track_material.xml"
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
--- a/app/build/intermediates/res/merged/debug/drawable/star.png
+++ b/app/build/intermediates/res/merged/debug/drawable/star.png
--- a/app/build/intermediates/res/merged/debug/layout/topbar.xml
+++ b/app/build/intermediates/res/merged/debug/layout/topbar.xml
@@ -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>
--- a/app/build/intermediates/res/merged/debug/layout/world_button.xml
+++ b/app/build/intermediates/res/merged/debug/layout/world_button.xml
@@ -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
--- a/app/build/intermediates/res/resources-debug.ap_
+++ b/app/build/intermediates/res/resources-debug.ap_
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -469,44 +469,46 @@ int drawable backgrounds_game_mountains 0x7f020047
 int drawable backgrounds_menu_grass 0x7f020048
 int drawable backgrounds_menu_levelup 0x7f020049
 int drawable backgrounds_menu_shortmenu 0x7f02004a
-int drawable goal 0x7f02004b
-int drawable guis_pausebutton 0x7f02004c
-int drawable guis_playerarrow 0x7f02004d
-int drawable guis_sound_off 0x7f02004e
-int drawable guis_sound_on 0x7f02004f
-int drawable lock_locked 0x7f020050
-int drawable lock_unlocked 0x7f020051
-int drawable notification_template_icon_bg 0x7f020070
-int drawable obstacles_cave 0x7f020052
-int drawable obstacles_grass 0x7f020053
-int drawable obstacles_mountains 0x7f020054
-int drawable playershapes_ball 0x7f020055
-int drawable previews_grass 0x7f020056
-int drawable purple 0x7f020057
-int drawable ramp 0x7f020058
-int drawable rampbutton 0x7f020059
-int drawable splitter 0x7f02005a
-int drawable star 0x7f02005b
-int drawable star_empty 0x7f02005c
-int drawable star_icon 0x7f02005d
-int drawable terrain_c_grass 0x7f02005e
-int drawable terrain_t_grass 0x7f02005f
-int drawable tools_bomb 0x7f020060
-int drawable tools_bombbutton 0x7f020061
-int drawable tools_emptybutton 0x7f020062
-int drawable tools_lockedbutton 0x7f020063
-int drawable tools_magnet 0x7f020064
-int drawable tools_magnetbutton 0x7f020065
-int drawable tools_spring 0x7f020066
-int drawable tools_springbutton 0x7f020067
-int drawable tools_unlockedbutton 0x7f020068
-int drawable xml_custom_button 0x7f020069
-int drawable xml_levelbutton_background 0x7f02006a
-int drawable xml_sound_toggle 0x7f02006b
-int drawable xml_tool_slot_background 0x7f02006c
-int drawable xml_toolprogressbarlayers 0x7f02006d
-int drawable xml_unlock_message_background 0x7f02006e
-int drawable xml_worldbutton_background 0x7f02006f
+int drawable currency_energy 0x7f02004b
+int drawable currency_energy_atlas 0x7f02004c
+int drawable currency_star 0x7f02004d
+int drawable goal 0x7f02004e
+int drawable guis_pausebutton 0x7f02004f
+int drawable guis_playerarrow 0x7f020050
+int drawable guis_sound_off 0x7f020051
+int drawable guis_sound_on 0x7f020052
+int drawable lock_locked 0x7f020053
+int drawable lock_unlocked 0x7f020054
+int drawable notification_template_icon_bg 0x7f020072
+int drawable obstacles_cave 0x7f020055
+int drawable obstacles_grass 0x7f020056
+int drawable obstacles_mountains 0x7f020057
+int drawable playershapes_ball 0x7f020058
+int drawable previews_grass 0x7f020059
+int drawable purple 0x7f02005a
+int drawable ramp 0x7f02005b
+int drawable rampbutton 0x7f02005c
+int drawable splitter 0x7f02005d
+int drawable star_empty 0x7f02005e
+int drawable star_icon 0x7f02005f
+int drawable terrain_c_grass 0x7f020060
+int drawable terrain_t_grass 0x7f020061
+int drawable tools_bomb 0x7f020062
+int drawable tools_bombbutton 0x7f020063
+int drawable tools_emptybutton 0x7f020064
+int drawable tools_lockedbutton 0x7f020065
+int drawable tools_magnet 0x7f020066
+int drawable tools_magnetbutton 0x7f020067
+int drawable tools_spring 0x7f020068
+int drawable tools_springbutton 0x7f020069
+int drawable tools_unlockedbutton 0x7f02006a
+int drawable xml_custom_button 0x7f02006b
+int drawable xml_levelbutton_background 0x7f02006c
+int drawable xml_sound_toggle 0x7f02006d
+int drawable xml_tool_slot_background 0x7f02006e
+int drawable xml_toolprogressbarlayers 0x7f02006f
+int drawable xml_unlock_message_background 0x7f020070
+int drawable xml_worldbutton_background 0x7f020071
 int id action0 0x7f0d006a
 int id action_bar 0x7f0d0041
 int id action_bar_activity_content 0x7f0d0000
@@ -558,8 +560,8 @@ int id icon 0x7f0d0029
 int id ifRoom 0x7f0d001d
 int id image 0x7f0d0026
 int id imageView 0x7f0d0064
-int id imageView2 0x7f0d00a4
-int id imageView3 0x7f0d00a2
+int id imageView2 0x7f0d00a6
+int id imageView3 0x7f0d00a4
 int id info 0x7f0d0075
 int id levelbutton_lock 0x7f0d005c
 int id levelbutton_star1 0x7f0d0059
@@ -651,28 +653,30 @@ int id toolshop_tool_offer_layout 0x7f0d0090
 int id toolshop_topbar 0x7f0d008a
 int id toolslot_image 0x7f0d0082
 int id topPanel 0x7f0d002e
+int id topbar_energycount 0x7f0d0099
+int id topbar_energyview 0x7f0d0098
 int id topbar_layout 0x7f0d0092
 int id topbar_leveldisplay 0x7f0d0094
 int id topbar_levellayout 0x7f0d0093
 int id topbar_levelprogress 0x7f0d0095
-int id topbar_resetButton 0x7f0d009a
-int id topbar_soundtoggle 0x7f0d0098
+int id topbar_resetButton 0x7f0d009d
+int id topbar_soundtoggle 0x7f0d009a
 int id topbar_starcount 0x7f0d0097
-int id topbar_starcount_decrease 0x7f0d009b
+int id topbar_starcount_decrease 0x7f0d009c
 int id topbar_starview 0x7f0d0096
-int id topbar_toolshop 0x7f0d0099
-int id unlockmessage_message 0x7f0d009d
-int id unlockmessage_toolimage 0x7f0d009c
+int id topbar_toolshop 0x7f0d009b
+int id unlockmessage_message 0x7f0d009f
+int id unlockmessage_toolimage 0x7f0d009e
 int id up 0x7f0d0008
 int id useLogo 0x7f0d0012
 int id withText 0x7f0d001f
-int id worldbutton_levelcount 0x7f0d00a1
-int id worldbutton_lock 0x7f0d00a0
-int id worldbutton_preview 0x7f0d009f
-int id worldbutton_starcount 0x7f0d00a3
-int id worldbutton_title 0x7f0d009e
-int id worlds_layout 0x7f0d00a6
-int id worlds_topbar 0x7f0d00a5
+int id worldbutton_levelcount 0x7f0d00a3
+int id worldbutton_lock 0x7f0d00a2
+int id worldbutton_preview 0x7f0d00a1
+int id worldbutton_starcount 0x7f0d00a5
+int id worldbutton_title 0x7f0d00a0
+int id worlds_layout 0x7f0d00a8
+int id worlds_topbar 0x7f0d00a7
 int id wrap_content 0x7f0d0020
 int integer abc_config_activityDefaultDur 0x7f0b0001
 int integer abc_config_activityShortDur 0x7f0b0002