fixed issue, that message vanished after going to toolshop when a level was finished
This commit is contained in:
=
parent
c71d1a767e
commit
4d07863563
@ -90,6 +90,7 @@
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
|
||||
|
||||
@ -161,14 +161,14 @@
|
||||
</level>
|
||||
<level packId="1" id="5" goalX="25.756561" startSpeed="0.4" endSpeed="0.4" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<terrainTiles class="java.util.ArrayList">
|
||||
<tileData x="-0.3149171" width="5.370166"/>
|
||||
<tileData x="5.247172" width="3.9280117"/>
|
||||
<tileData x="-0.22666693" width="5.546666"/>
|
||||
<tileData x="5.158922" width="4.104512"/>
|
||||
<tileData x="8.653435" width="0.0625"/>
|
||||
<tileData x="9.939764" width="0.062160492"/>
|
||||
<tileData x="12.285448" width="3.8192024"/>
|
||||
<tileData x="16.539871" width="3.5896454"/>
|
||||
<tileData x="21.039742" width="2.40209"/>
|
||||
<tileData x="26.437824" width="7.5440884"/>
|
||||
<tileData x="12.282529" width="3.813364"/>
|
||||
<tileData x="16.469452" width="3.730482"/>
|
||||
<tileData x="21.039742" width="2.402092"/>
|
||||
<tileData x="26.437824" width="7.5440903"/>
|
||||
</terrainTiles>
|
||||
<ceilingTiles class="java.util.ArrayList">
|
||||
<tileData x="11.378281" width="28.756561"/>
|
||||
@ -239,27 +239,7 @@
|
||||
</stars>
|
||||
<energy x="13.326665" y="-0.40666687"/>
|
||||
</level>
|
||||
<level packId="1" id="7" goalX="10.643346" startSpeed="0.2" endSpeed="0.2" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<terrainTiles class="java.util.ArrayList">
|
||||
<tileData x="3.821673" width="13.643346"/>
|
||||
</terrainTiles>
|
||||
<ceilingTiles class="java.util.ArrayList">
|
||||
<tileData x="3.821673" width="13.643346"/>
|
||||
</ceilingTiles>
|
||||
<obstacles class="java.util.ArrayList">
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="0.5466671" rightEdge="3.546667" height="0.917" y="-0.14150003">
|
||||
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="3.6133304" rightEdge="6.6133304" height="1.414" y="0.10699999">
|
||||
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="6.633338" rightEdge="9.633338" height="1.057" y="-0.0715">
|
||||
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
|
||||
</obstacleData>
|
||||
</obstacles>
|
||||
<stars class="java.util.ArrayList"/>
|
||||
</level>
|
||||
<level packId="1" id="8" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<level packId="1" id="7" goalX="1.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<terrainTiles class="java.util.ArrayList">
|
||||
<tileData x="0.0" width="6.0"/>
|
||||
</terrainTiles>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,22 +3,22 @@
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml"
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml",
|
||||
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml",
|
||||
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml"
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -32,7 +32,7 @@
|
||||
android:textSize="26sp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_comingsoon"
|
||||
android:id="@+id/startscreen_unlock_levels"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@ -40,11 +40,11 @@
|
||||
android:layout_alignEnd="@+id/startscreen_sound"
|
||||
android:layout_alignRight="@+id/startscreen_sound"
|
||||
android:layout_marginBottom="26dp"
|
||||
android:text="Level Up"
|
||||
android:visibility="visible"/>
|
||||
android:text="Unlock all levels"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_maxcheat"
|
||||
android:id="@+id/startscreen_gain_90_ep"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@ -53,7 +53,7 @@
|
||||
android:layout_below="@+id/startscreen_play"
|
||||
android:layout_marginLeft="48dp"
|
||||
android:layout_marginStart="48dp"
|
||||
android:text="Lv to 100"
|
||||
android:visibility="visible"/>
|
||||
android:text="Gain 90 ep"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
</RelativeLayout>
|
||||
@ -230,7 +230,7 @@
|
||||
<string name="tutorial_place_ramp_gap">Now place your ramp in front of the gap!</string>
|
||||
<string name="tutorial_place_ramp_obstacle">Now place it in front of the obstacle!</string>
|
||||
<string name="tutorial_place_tools">You can use the selected tool by clicking on the wanted position on the screen.</string>
|
||||
<string name="tutorial_to_toolshop">Now go to the toolshop by either clicking on the \'unlocked\' spring button or by clicking on the toolshop button!</string>
|
||||
<string name="tutorial_to_toolshop">Now go to the toolshop by either clicking on the \'Spring unlocked\' or the toolshop button!</string>
|
||||
<string name="tutorial_toolbar">This is the toolbar. Here you can select the tool you currently want to use.</string>
|
||||
<string name="tutorial_toolshop_all_tools">Here you can see all the tools you will be able to buy and use.</string>
|
||||
<string name="tutorial_toolshop_equip_spring">Now tip on an unlocked slot of your toolbar to equip the spring!\n(It is the same where the ramp is attached at the moment)\nAfter that you will be able to complete the next level.</string>
|
||||
|
||||
Binary file not shown.
@ -646,10 +646,10 @@ int id split_action_bar 0x7f0d0007
|
||||
int id src_atop 0x7f0d0015
|
||||
int id src_in 0x7f0d0016
|
||||
int id src_over 0x7f0d0017
|
||||
int id startscreen_comingsoon 0x7f0d0083
|
||||
int id startscreen_maxcheat 0x7f0d0084
|
||||
int id startscreen_gain_90_ep 0x7f0d0084
|
||||
int id startscreen_play 0x7f0d0082
|
||||
int id startscreen_sound 0x7f0d0081
|
||||
int id startscreen_unlock_levels 0x7f0d0083
|
||||
int id status_bar_latest_event_content 0x7f0d006e
|
||||
int id submit_area 0x7f0d004c
|
||||
int id tabMode 0x7f0d000b
|
||||
|
||||
@ -239,27 +239,7 @@
|
||||
</stars>
|
||||
<energy x="13.326665" y="-0.40666687"/>
|
||||
</level>
|
||||
<level packId="1" id="7" goalX="10.643346" startSpeed="0.2" endSpeed="0.2" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<terrainTiles class="java.util.ArrayList">
|
||||
<tileData x="3.821673" width="13.643346"/>
|
||||
</terrainTiles>
|
||||
<ceilingTiles class="java.util.ArrayList">
|
||||
<tileData x="3.821673" width="13.643346"/>
|
||||
</ceilingTiles>
|
||||
<obstacles class="java.util.ArrayList">
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="0.5466671" rightEdge="3.546667" height="0.917" y="-0.14150003">
|
||||
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="3.6133304" rightEdge="6.6133304" height="1.414" y="0.10699999">
|
||||
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
|
||||
</obstacleData>
|
||||
<obstacleData floating="false" moving="false" deadly="false" leftEdge="6.633338" rightEdge="9.633338" height="1.057" y="-0.0715">
|
||||
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
|
||||
</obstacleData>
|
||||
</obstacles>
|
||||
<stars class="java.util.ArrayList"/>
|
||||
</level>
|
||||
<level packId="1" id="8" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<level packId="1" id="7" goalX="1.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
|
||||
<terrainTiles class="java.util.ArrayList">
|
||||
<tileData x="0.0" width="6.0"/>
|
||||
</terrainTiles>
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
android:textSize="26sp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_comingsoon"
|
||||
android:id="@+id/startscreen_unlock_levels"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@ -40,11 +40,11 @@
|
||||
android:layout_alignEnd="@+id/startscreen_sound"
|
||||
android:layout_alignRight="@+id/startscreen_sound"
|
||||
android:layout_marginBottom="26dp"
|
||||
android:text="Level Up"
|
||||
android:visibility="visible"/>
|
||||
android:text="Unlock all levels"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_maxcheat"
|
||||
android:id="@+id/startscreen_gain_90_ep"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@ -53,7 +53,7 @@
|
||||
android:layout_below="@+id/startscreen_play"
|
||||
android:layout_marginLeft="48dp"
|
||||
android:layout_marginStart="48dp"
|
||||
android:text="Lv to 100"
|
||||
android:visibility="visible"/>
|
||||
android:text="Gain 90 ep"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
</RelativeLayout>
|
||||
Loading…
x
Reference in New Issue
Block a user